MES异常单自动提交

topsun-xt/src/main/webapp/biz/topsun/mes/produceException/produceExceptionDetail.js

@@ -4,6 +4,7 @@ $(document).ready(function () {
 });
 function initialize(){
     UICtrl.layout("#layout", {leftWidth: 3});
+    $("#back").hide()
 }
 
 function bindEvent(){

topsun-xt/src/main/webapp/biz/topsun/mes/unqualifiedMaterials/unqualifiedMaterialsList.js

@@ -10,7 +10,7 @@ function initUI() {
 
 function loadGrid() {
     var toolbarOptions = UICtrl.getDefaultToolbarOptions({
-        addHandler: addHandler,
+        //addHandler: addHandler,
         uploadFileHandler: {
             id: 'uploadFileHandler', text: '上传附件', img:'fa-clipboard', click: function(){
                 uploadFile();
@@ -28,8 +28,19 @@ function loadGrid() {
             {display: "创建日期", name: "fillinDate", width: 120, minWidth: 60, type: "date", align: "left"},
             {display: "申请人", name: "personMemberName", width: 120, minWidth: 60, type: "string", align: "left"},
             {display: "申请部门", name: "deptName", width: 120, minWidth: 60, type: "string", align: "left"},
-            {display: "产品代号", name: "pd", width: 200, minWidth: 60, type: "string", align: "left"},
+            {display: "物料凭证号", name: "mblnr", width: 200, minWidth: 60, type: "string", align: "left"},
+            {display: "凭证项次", name: "zeile", width: 200, minWidth: 60, type: "string", align: "left"},
+            {display: "凭证年份", name: "mjahr", width: 200, minWidth: 60, type: "string", align: "left"},
             {display: "产品名称", name: "productName", width: 200, minWidth: 60, type: "string", align: "left"},
+            {display: "类别", name: "type", width: 200, minWidth: 60, type: "string", align: "left"},
+            {display: "生产批次", name: "batchNo", width: 200, minWidth: 60, type: "string", align: "left"},
+            {display: "PD/YL编码", name: "pd", width: 200, minWidth: 60, type: "string", align: "left"},
+            {display: "部门/工序", name: "process", width: 200, minWidth: 60, type: "string", align: "left"},
+            {display: "异常数量", name: "exceptionNum", width: 200, minWidth: 60, type: "string", align: "left"},
+            {display: "异常描述", name: "exceptionDesc", width: 200, minWidth: 60, type: "string", align: "left"},
+            {display: "责任部门", name: "dutyDeptName", width: 200, minWidth: 60, type: "string", align: "left"},
+            {display: "提报人", name: "submitterName", width: 200, minWidth: 60, type: "string", align: "left"},
+            {display: "评审结果", name: "resultTextView", 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: 300, minWidth: 60, type: "string", align: "left"},

topsun/src/main/java/com/huigou/topsun/mes/produceException/application/impl/ProduceExceptionApplicationImpl.java

@@ -10,6 +10,7 @@ import com.huigou.context.ThreadLocalUtil;
 import com.huigou.data.domain.model.CommonDomainConstants;
 import com.huigou.data.query.model.QueryDescriptor;
 import com.huigou.data.query.model.QueryModel;
+import com.huigou.topsun.base.bsnMessage.appliction.MannualStartWorkApplication;
 import com.huigou.topsun.mes.produceException.application.ProduceExceptionApplication;
 import com.huigou.topsun.mes.produceException.domain.ProduceException;
 import com.huigou.topsun.mes.produceException.domain.query.ProduceExceptionQueryRequest;
@@ -62,6 +63,8 @@ public class ProduceExceptionApplicationImpl extends FlowBroker implements Produ
     private HttpClient httpClient;
     @Autowired
     SapMutualEpLogApplication sapMutualEpLogApplication;
+    @Autowired
+    private MannualStartWorkApplication mannualStartWorkApplication;
 
     @Override
     protected String saveBizAndApprovalData() {
@@ -178,12 +181,11 @@ public class ProduceExceptionApplicationImpl extends FlowBroker implements Produ
 
     @Override
     protected void onAbortProcessInstance(DelegateExecution delegateExecution) {
-        super.onAbortProcessInstance(delegateExecution);
+        //super.onAbortProcessInstance(delegateExecution);
         String bizId = delegateExecution.getProcessBusinessKey();
         ProduceException produceException = produceExceptionRepository.findOne(bizId);
         produceException.setStatusId(BizBillStatus.ABORTED.getId());
         produceExceptionRepository.save(produceException);
-
         this.feedBackSaleOrder(produceException,"N");
     }
 
@@ -271,10 +273,14 @@ public class ProduceExceptionApplicationImpl extends FlowBroker implements Produ
         Operator operator = operatorApplication.createOperatorByPersonMemberId(personMemberId);
         SDO localSdo = new SDO();
         localSdo.setOperator(operator);
+        ThreadLocalUtil.putOperator(operator);
         produceException.setDefaultValues(new OrgUnit(operator.getFullId(), operator.getFullName()));
 
-        Map<String, Object> formData = BeanUtil.beanToMap(produceException);
-        this.startProcessInstance(ProduceExceptionApplication.PROCESS_DEFINITION_KEY, formData, localSdo);
+        String bizId =mannualStartWorkApplication.startWorkflow(produceException,PROCESS_DEFINITION_KEY,"produceException");
+        produceException.setId(bizId);
+        produceException.setStatusId(BizBillStatus.APPROVING.getId());
+        produceExceptionRepository.save(produceException);
+        //this.startProcessInstance(ProduceExceptionApplication.PROCESS_DEFINITION_KEY, formData, localSdo);
     }
 
     public String startProcessInstance(String processDefinitionKey,Map<String, Object> formData, SDO localSdo){