EP调用销售订单查询用户的BUG

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

@@ -8,7 +8,10 @@ $(document).ready(function () {
 function initialize(){
     var orderTypeName = $("#orderTypeName").val();
     $('#jobBizBillBody .subject').html(orderTypeName);
-    UICtrl.setDisable($("#submitForm"));
+    if  ($('#statusId').val()=="0") {
+    } else {
+       UICtrl.setDisable($("#submitForm"));
+    }
     UICtrl.layout("#layout", {leftWidth: 3});
 }
 

topsun/src/main/java/com/huigou/topsun/ep/order/application/EpSaleOrderCancelApplication.java

@@ -15,6 +15,7 @@ import java.util.Map;
  */
 public interface EpSaleOrderCancelApplication {
     public static final String QUERY_XML_FILE_PATH = "config/topsun/ep/epSaleOrder/epSaleOrderCancel.xml";
+    public static final String QUERY_XML_FILE_PATH2 = "config/topsun/ep/epSaleOrder/epSaleOrder.xml";
 
     String PROCESS_DEFINITION_KEY = "epSaleOrderCancelProc";
 

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

@@ -225,7 +225,8 @@ public class EpSaleOrderApplicationImpl extends FlowBroker implements EpSaleOrde
             Map<String, Object> formData = BeanUtil.beanToMap(epSaleOrder);
             String bizId = this.startProcessInstance(EpSaleOrderApplication.PROCESS_DEFINITION_KEY, formData, localSdo);
             epSaleOrder.setId(bizId);
-            epSaleOrder.setStatusId(BizBillStatus.APPROVING.getId());
+           // epSaleOrder.setStatusId(BizBillStatus.APPROVING.getId()); //lxh
+            epSaleOrder.setStatusId(BizBillStatus.APPLYING.getId());
             epSaleOrder = epSaleOrderRepository.save(epSaleOrder);
 
             List<EpSaleOrderItemVo> epSaleOrderItemVos = epSaleOrderVo.getEpSaleOrderItemVos();

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

@@ -13,6 +13,7 @@ import com.huigou.data.query.model.QueryDescriptor;
 import com.huigou.data.query.model.QueryModel;
 import com.huigou.topsun.ep.order.application.EpSaleOrderCancelApplication;
 import com.huigou.topsun.ep.order.application.EpSaleOrderCancelItemApplication;
+import com.huigou.topsun.ep.order.application.EpSaleOrderItemApplication;
 import com.huigou.topsun.ep.order.domain.EpSaleOrderCancel;
 import com.huigou.topsun.ep.order.domain.EpSaleOrderCancelItem;
 import com.huigou.topsun.ep.order.domain.query.EpSaleOrderCancelQueryRequest;
@@ -58,6 +59,8 @@ public class EpSaleOrderCancelApplicationImpl extends FlowBroker implements EpSa
     @Autowired
     private EpSaleOrderCancelItemApplication epSaleOrderCancelItemApplication;
     @Autowired
+    private EpSaleOrderItemApplication epSaleOrderItemApplication;
+    @Autowired
     private HttpClient httpClient;
     @Resource
     private WorkflowApplication workflowApplication;
@@ -122,7 +125,7 @@ public class EpSaleOrderCancelApplicationImpl extends FlowBroker implements EpSa
     }
 
     @Transactional
-    private void updateStatus(String bizId, BizBillStatus status) {
+    protected void updateStatus(String bizId, BizBillStatus status) {
         Assert.hasText(bizId, CommonDomainConstants.ID_NOT_BLANK);
         this.commonDomainService.updateStatus(EpSaleOrderCancel.class, bizId, status.getId());
     }
@@ -204,35 +207,35 @@ public class EpSaleOrderCancelApplicationImpl extends FlowBroker implements EpSa
     public void saveEpSaleOrderCancelVo(List<EpSaleOrderCancelVo> epSaleOrderCancelVos) {
         for (EpSaleOrderCancelVo epSaleOrderCancelVo : epSaleOrderCancelVos) {
             EpSaleOrderCancel epSaleOrderCancel = new EpSaleOrderCancel();
-            BeanUtil.copyProperties(epSaleOrderCancelVo,epSaleOrderCancel);
+            BeanUtil.copyProperties(epSaleOrderCancelVo, epSaleOrderCancel);
+                //初始化用户信息
+                String personCode = epSaleOrderCancelVos.get(0).getPersonCode();
+                QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH2, "loadPersonMemberId");
+                String personMemberId = this.sqlExecutorDao.queryToString(queryDescriptor.getSql(), personCode);
+                if (StringUtil.isBlank(personMemberId)) {
+                    throw new RuntimeException("未找到编码为：" + personCode + " 的人员");
+                }
+                //String createdById = SystemCache.getParameter("adminPersonId", String.class);
+                Operator operator = operatorApplication.createOperatorByPersonMemberId(personMemberId);
+                epSaleOrderCancel.setDefaultValues(new OrgUnit(operator.getFullId(), operator.getFullName()));
+                SDO localSdo = new SDO();
+                localSdo.setOperator(operator);
+                Map<String, Object> formData = BeanUtil.beanToMap(epSaleOrderCancel);
+                String bizId = this.startProcessInstance(EpSaleOrderCancelApplication.PROCESS_DEFINITION_KEY, formData, localSdo);
+                epSaleOrderCancel.setId(bizId);
+                epSaleOrderCancel.setStatusId(BizBillStatus.APPLYING.getId());  //LXH 改为申请状态
+                epSaleOrderCancel = epSaleOrderCancelRepository.save(epSaleOrderCancel);
 
-            //初始化用户信息
-            String personCode = epSaleOrderCancelVos.get(0).getPersonCode();
-            QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, "loadPersonMemberId");
-            String personMemberId = this.sqlExecutorDao.queryToString(queryDescriptor.getSql(), personCode);
-            if (StringUtil.isBlank(personMemberId)){
-                throw new RuntimeException("未找到编码为：" + personCode + " 的人员");
-            }
-            //String createdById = SystemCache.getParameter("adminPersonId", String.class);
-            Operator operator = operatorApplication.createOperatorByPersonMemberId(personMemberId);
-            epSaleOrderCancel.setDefaultValues(new OrgUnit(operator.getFullId(), operator.getFullName()));
-            SDO localSdo = new SDO();
-            localSdo.setOperator(operator);
-            Map<String, Object> formData = BeanUtil.beanToMap(epSaleOrderCancel);
-            String bizId = this.startProcessInstance(EpSaleOrderCancelApplication.PROCESS_DEFINITION_KEY, formData, localSdo);
-            epSaleOrderCancel.setId(bizId);
-            epSaleOrderCancel.setStatusId(BizBillStatus.APPROVING.getId());
-            epSaleOrderCancel = epSaleOrderCancelRepository.save(epSaleOrderCancel);
+                List<EpSaleOrderCancelItemVo> epSaleOrderCancelItemVos = epSaleOrderCancelVo.getEpSaleOrderCancelItemVos();
+                List<EpSaleOrderCancelItem> epSaleOrderCancelItems = new ArrayList<>();
+                epSaleOrderCancelItemVos.forEach(epSaleOrderCancelItemVo -> {
+                    EpSaleOrderCancelItem epSaleOrderCancelItem = new EpSaleOrderCancelItem();
+                    BeanUtil.copyProperties(epSaleOrderCancelItemVo, epSaleOrderCancelItem);
+                    epSaleOrderCancelItems.add(epSaleOrderCancelItem);
+                });
+                this.epSaleOrderCancelItemApplication.saveEpSaleOrderCancelItems(epSaleOrderCancel.getId(), epSaleOrderCancelItems);
 
-            List<EpSaleOrderCancelItemVo> epSaleOrderCancelItemVos = epSaleOrderCancelVo.getEpSaleOrderCancelItemVos();
-            List<EpSaleOrderCancelItem> epSaleOrderCancelItems = new ArrayList<>();
-            epSaleOrderCancelItemVos.forEach(epSaleOrderCancelItemVo -> {
-                EpSaleOrderCancelItem epSaleOrderCancelItem = new EpSaleOrderCancelItem();
-                BeanUtil.copyProperties(epSaleOrderCancelItemVo,epSaleOrderCancelItem);
-                epSaleOrderCancelItems.add(epSaleOrderCancelItem);
-            });
-            this.epSaleOrderCancelItemApplication.saveEpSaleOrderCancelItems(epSaleOrderCancel.getId(),epSaleOrderCancelItems);
-            }
+        }
         }
 
     public String startProcessInstance(String processDefinitionKey,Map<String, Object> formData, SDO localSdo){