质量异常评审多人不同意见时，进行裁决

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

@@ -5,6 +5,8 @@ $(document).ready(function () {
 function initialize(){
     UICtrl.layout("#layout", {leftWidth: 3});
     $('#fileList').fileList({bizId:$("#id").val()});
+
+
 }
 
 function bindEvent(){
@@ -34,13 +36,13 @@ function checkConstraints(){
     var defaultResult = $("#defaultResult").val();
     var result = $("#result").val();
     var hasDecide = $("#hasDecide").val();
-    // if (Public.isNotBlank(defaultResult) && Public.isNotBlank(result) && defaultResult != result && hasDecide != "1"){
-    //     counterSign();
-    //     $("#hasDecide").val("1");
-    //     save("SAVE",null);
-    //     Public.tip("评审结果不一致，请添加裁决");
-    //     return false;
-    // }
+    if (Public.isNotBlank(defaultResult) && Public.isNotBlank(result) && defaultResult != result && hasDecide != "1"){
+        counterSign();
+        $("#hasDecide").val("1");
+        save("SAVE",null);
+        Public.tip("评审结果不一致，请添加裁决");
+        return false;
+    }
     return true;
 }
 
@@ -72,6 +74,7 @@ function businessJudgmentUnit() {
     }
     if (approveProcUnit){
         UICtrl.enable($("#result"));
+        UICtrl.enable($("#exceptionDesc"));
         UICtrl.setElRequiredFlag("#result",true);
     }
     return true;

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

@@ -15,6 +15,7 @@
             <x:title title="common.button.search" hideTable="queryMainForm" isHide="true"/>
             <form class="hg-form ui-hide" method="post" action="" id="queryMainForm">
                 <x:inputC name="billCode" required="false" label="申请单号" labelCol="1"/>
+                <x:inputC name="pd" required="false" label="PD/YL编码" labelCol="1"/>
                 <x:searchButtons/>
             </form>
             <div class="blank_div clearfix"></div>

topsun/src/main/java/com/huigou/topsun/mes/unqualifiedMaterials/application/impl/UnqualifiedMaterialsApplicationImpl.java

@@ -211,6 +211,9 @@ public class UnqualifiedMaterialsApplicationImpl extends FlowBroker implements U
             String bizId = delegateTask.getExecution().getProcessBusinessKey();
             UnqualifiedMaterials unqualifiedMaterials = unqualifiedMaterialsRepository.findOne(bizId);
             unqualifiedMaterials.setStatusId(BizBillStatus.APPLYING.getId());
+            unqualifiedMaterials.setDefaultResult("");
+            unqualifiedMaterials.setResult("");
+            unqualifiedMaterials.setHasDecide("");
             unqualifiedMaterialsRepository.save(unqualifiedMaterials);
 
             //回退后，清空评审结果明细

topsun/src/main/java/com/huigou/topsun/mes/unqualifiedMaterials/domain/query/UnqualifiedMaterialsQueryRequest.java

@@ -11,4 +11,5 @@ import lombok.Data;
 @Data
 public class UnqualifiedMaterialsQueryRequest extends QueryAbstractRequest {
     private String billCode;
+    private String pd;
 }

topsun/src/main/resources/config/topsun/mes/unqualifiedMaterials/unqualifiedMaterials.xml

@@ -5,6 +5,7 @@
             select t.* from mes_unqualified_materials t
         </sql-query>
         <condition column="bill_code" name="billCode" type="java.lang.String" symbol="like" alias="t"/>
+        <condition column="pd" name="pd" type="java.lang.String" symbol="like" alias="t"/>
         <condition column="id" name="id" type="java.lang.String" symbol="=" alias="t"/>
     </query>