质量异常评审表增加生产批次查询条件；ECN原材料变更选择时去掉前导0

topsun-xt/src/main/webapp/biz/topsun/ep/change/epMaterialChangeFormDetail.js

@@ -29,7 +29,12 @@ function bindEvent(){
             }
         },
         onChange: function (value, data) {
-            $('#pd').val(value.value);
+            var values = value.value.split(",");
+            var pds = [];
+            for (let i = 0; i < values.length; i++) {
+                pds.push(values[i].replace(/^0+/g, ""));
+            }
+            $('#pd').val(pds.join(","));
             $('#productName').val(value.text);
         }
     });
@@ -48,7 +53,12 @@ function bindEvent(){
             }
         },
         onChange: function (value, data) {
-            $('#changedPd').val(value.value);
+            var values = value.value.split(",");
+            var pds = [];
+            for (let i = 0; i < values.length; i++) {
+                pds.push(values[i].replace(/^0+/g, ""));
+            }
+            $('#changedPd').val(pds.join(","));
             $('#changedProductName').val(value.text);
         }
     });

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

@@ -6,15 +6,9 @@ function initialize(){
     UICtrl.layout("#layout", {leftWidth: 3});
     $('#fileList').fileList({bizId:$("#id").val()});
 
-
 }
 
 function bindEvent(){
-    // $("#result").combox({onChange:function(data){
-    //         var handleOpinion = $("#handleOpinion").val();
-    //         $("#handleOpinion").val(data.text + "-" + handleOpinion)
-    //     }
-    // })
 }
 
 function getExtendedData(processAction) {

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

@@ -16,6 +16,7 @@
             <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:inputC name="batchNo" required="false" label="生产批次" labelCol="1"/>
                 <x:searchButtons/>
             </form>
             <div class="blank_div clearfix"></div>

topsun/src/main/java/com/huigou/topsun/ep/change/application/impl/EpChangeFormApplicationImpl.java

@@ -394,8 +394,15 @@ public class EpChangeFormApplicationImpl extends FlowBroker implements EpChangeF
         Map<String,Object> map = new HashMap<>();
         //日志记录
         Map<String, Object> resultMap = new HashMap<>();
+        //成品变更
+        String url = "pro/productionSolution/openEcn?pds="+epChangeForm.getPd();
+        //String url = "pro/productionSolution/openEcn?pds="+epChangeForm.getPd()+"&changedPd="+"";
+        //原材料变更
+//        if (StringUtil.isNotBlank(epChangeForm.getMaterialReasonForChange())){
+//            url = url + epChangeForm.getChangedPd();
+//        }
         try {
-            String execute = httpClient.executeForEp(map, "pro/productionSolution/openEcn?pds="+epChangeForm.getPd());
+            String execute = httpClient.executeForEp(map, url);
             EpResult epResult = JSONObject.parseObject(execute, EpResult.class);
             resultMap.put("TYPE", epResult.getCode());
             resultMap.put("message", epResult.getMsg());

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

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

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

@@ -6,6 +6,7 @@
         </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="batch_no" name="batchNo" type="java.lang.String" symbol="like" alias="t"/>
         <condition column="id" name="id" type="java.lang.String" symbol="=" alias="t"/>
     </query>