客户订单取消变更补充

topsun-xt/src/main/webapp/biz/topsun/ep/epSaleOrder/epSaleOrderDetail.jsp

@@ -23,7 +23,7 @@
     <x:hidden name="personMemberName"/>
     <x:hidden name="orderType"/>
     <x:hidden name="orderTypeName"/>
-    <x:hidden name="status"/>
+    <x:hidden name="statusId"/>
     <div class="hg-form-cols">
         <div class="hg-form-row">
             <x:inputC name="telPhoneLong" required="true" label="联系电话长号" labelCol="2" maxLength="64" fieldCol="2"/>

topsun-xt/src/main/webapp/biz/topsun/ep/epSaleOrder/epSaleOrderList.js

@@ -21,6 +21,7 @@ function loadGrid() {
             {display: "联系电话长号", name: "telPhoneLong", width: 200, minWidth: 60, type: "string", align: "left"},
             {display: "联系电话短号", name: "telPhoneShort", width: 200, minWidth: 60, type: "string", align: "left"},
             {display: "售达方", name: "kunnr", width: 200, minWidth: 60, type: "string", align: "left"},
+            {display: "审批状态", name: "statusTextView", width: 100, minWidth: 60, type: "string", align: "left"},
             {display: "状态码", name: "code", width: 100, minWidth: 60, type: "string", align: "left"},
             {display: "消息", name: "msg", width: 200, minWidth: 60, type: "string", align: "left"},
         ],

topsun/src/main/java/com/huigou/topsun/ep/order/application/impl/EpSaleOrderApplicationImpl.java

@@ -88,7 +88,7 @@ public class EpSaleOrderApplicationImpl extends FlowBroker implements EpSaleOrde
         EpSaleOrder epSaleOrder = epSaleOrderRepository.findOne(bizId);
         epSaleOrder.setStatusId(status.getId());
         epSaleOrderRepository.save(epSaleOrder);
-        this.feedBackSaleOrder(epSaleOrder);
+        this.feedBackSaleOrder(epSaleOrder,"1");
     }
 
     @Override
@@ -106,12 +106,16 @@ public class EpSaleOrderApplicationImpl extends FlowBroker implements EpSaleOrde
      */
     @Override
     protected void onBack(DelegateTask delegateTask, String destActivityId) {
-        super.onBack(delegateTask, destActivityId);
+        //super.onBack(delegateTask, destActivityId);
         if ("Apply".equalsIgnoreCase(destActivityId)) {
             String bizId = delegateTask.getExecution().getProcessBusinessKey();
             EpSaleOrder epSaleOrder = epSaleOrderRepository.findOne(bizId);
             epSaleOrder.setStatusId(BizBillStatus.APPLYING.getId());
             epSaleOrderRepository.save(epSaleOrder);
+            //回退后终止流程
+            DelegateExecution execution = delegateTask.getExecution();
+            this.onAbortProcessInstance(execution);
+            this.feedBackSaleOrder(epSaleOrder,"0");
         }
     }
     
@@ -142,6 +146,7 @@ public class EpSaleOrderApplicationImpl extends FlowBroker implements EpSaleOrde
     public Map<String, Object> slicedEpSaleOrderList(EpSaleOrderQueryRequest queryRequest) {
         QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, "epSaleOrder");
         QueryModel queryModel = this.sqlExecutorDao.getQueryModel(queryDescriptor, queryRequest);
+        queryModel.putDictionary("status",BizBillStatus.getMap());
         Map<String, Object> map = this.sqlExecutorDao.executeSlicedQuery(queryModel);
         return map;
     }
@@ -204,10 +209,10 @@ public class EpSaleOrderApplicationImpl extends FlowBroker implements EpSaleOrde
         return localSdo;
     }
 
-    public void feedBackSaleOrder(EpSaleOrder epSaleOrder){
+    public void feedBackSaleOrder(EpSaleOrder epSaleOrder,String state){
         List<EpSaleOrderItem> orderItemList = epSaleOrderItemApplication.findByEpSaleOrderId(epSaleOrder.getId());
         Map<String,Object> map = new HashMap<>();
-        map.put("state",1);
+        map.put("state",state);
         Set<String> saleOrderNos = new HashSet<>();
         for (EpSaleOrderItem epSaleOrderItem : orderItemList) {
             saleOrderNos.add(epSaleOrderItem.getVbeln());