物料主数据显示工厂，条件查询增加工厂查询；MRP视图控制优化

topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyList.js

@@ -4,6 +4,7 @@ $(document).ready(function () {
     initializateUI()
     loadNonProdApplyListGrid();
     initBasicInfoMaintenance();
+    bindEvent();
 })
 function initializateUI() {
     UICtrl.layout("#layout", {leftWidth: 3});
@@ -94,6 +95,7 @@ function loadNonProdApplyListGrid() {
                     return type;
                 }
             },
+            {display: "工厂", name: "werksName", width: 200, minWidth: 60, type: "string", align: "left"},
             {display: "物料/产品编码", name: "matnr", width: 150, minWidth: 60, type: "string", align: "left"},
             {display: "维护类型", name: "maintenanceTypeTextView", width: 130, minWidth: 60, type: "string", align: "left",
                 render:function(item){
@@ -189,7 +191,19 @@ function resetForm(obj) {
     $(obj).formClean();
 }
 
-
+function bindEvent() {
+    //工厂
+    $('#werksName').searchbox({
+        type: "system", name: "dictionary",
+        getParam: function (item) {
+            return {fieldName: "WERKS"}
+        },
+        onChange: function (value, data) {
+            $('#werks').val(data.WERKS);
+            $('#werksName').val(data.NAME1);
+        }
+    });
+}
 
 
 //删除按钮

topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyList.jsp

@@ -20,6 +20,8 @@
             <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:hidden name="werks"/>
+                <x:inputC name="werksName" required="false" label="工厂" labelCol="1"/>
                 <x:inputC name="matnr" required="false" label="物料编码" labelCol="1"/>
                 <x:inputC name="genericName" required="false" label="通用品名" labelCol="1"/>
                 <x:inputC name="maktx" required="false" label="汉语品名" labelCol="1"/>

topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyNext.js

@@ -313,6 +313,7 @@ function  hideAllBusiness(flag) {
     werksMustInput(); //可以不需要的？
     lgortMustInput();
     mtvfpMustInput();
+    mrpMustInput(false);
 
     saleMustInput(false);
     purchaseMustInput(false);
@@ -478,15 +479,18 @@ function mtvfpMustInput(){ //可用性检查必输
 }
 
 function  mrpMustInput(flag) { //MRP必输项
-    UICtrl.setElRequiredFlag("#dispo",true);
-    UICtrl.setElRequiredFlag("#disls",true);
-    UICtrl.setElRequiredFlag("#beskz",true);
+    UICtrl.setElRequiredFlag("#dispo",flag);
+    UICtrl.setElRequiredFlag("#disls",flag);
+    UICtrl.setElRequiredFlag("#beskz",flag);
     UICtrl.setElRequiredFlag("#mtvfp",flag);
 
     UICtrl.setElRequiredFlag("#rgekz",flag);
+    //物料主数据需求计划1：MARC-DISGR（MRP组）
+    // 需求计划3：MARC-MISKZ（综合MRP标识）
+    // 上述两个字段，确保在BPM系统的“物料主数据扩展/修改”功能和“非产成品/非半成品物料维护申请”功能中，不必显示出来，更不必带出默认值。
     UICtrl.setElRequiredFlag("#disgr",false);
-    UICtrl.setElRequiredFlag("#strgr",true);
-    UICtrl.setElRequiredFlag("#sbdkz",true);
+    UICtrl.setElRequiredFlag("#strgr",flag);
+    UICtrl.setElRequiredFlag("#sbdkz",flag);
     UICtrl.setElRequiredFlag("#vrmod",flag);
     UICtrl.setElRequiredFlag("#vint1",flag);
     UICtrl.setElRequiredFlag("#vint2",flag);
@@ -503,7 +507,7 @@ function  mrpMustInput(flag) { //MRP必输项
         $("#dispo").val("105");//MRP控制者
         $("#dispo_text").val("105-客供料");//MRP控制者
     }else {
-        UICtrl.setElRequiredFlag("#beskz",true);
+        UICtrl.setElRequiredFlag("#beskz",flag);
         UICtrl.enable("#beskz");
     }
     werksMustInput();
@@ -774,7 +778,7 @@ function  clearForm_sale(){
     // $("#mvgr4").val("");
     // $("#mvgr5").val("");
     $("#mtpos").val("");
-    $("#xchpf").val("");
+    //$("#xchpf").val("");
     $("#tragr").val("");
     $("#ladgr").val("");
     $("#ladgrName").val("");
@@ -805,7 +809,7 @@ function  clearForm_mrp() {
     $("#eisbe").val("");
     $("#eislo").val("");
     $("#strgr").val("");
-    $("#mtvfp").val("");
+    //$("#mtvfp").val("");
     $("#wzeit").val("");
     $("#sbdkz").val("");
     $("#diskz").val("");

topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/controller/NonProdApplyController.java

@@ -80,7 +80,7 @@ public class NonProdApplyController extends CommonController {
           if (StringUtil.isNotBlank(extended)) { //扩展流程
                 nonProdApplyBaseInfo = nonProdApplyApplication.loadNonProdApplyBaseInfoById(bizId);
                 if (!isLastedData(nonProdApplyBaseInfo.getBillCode(), nonProdApplyBaseInfo.getMatnr())) {
-                    throw new RuntimeException("请选择物料"+nonProdApplyBaseInfo.getMatnr()+"的最新数据进行扩展！");
+                    //throw new RuntimeException("请选择物料"+nonProdApplyBaseInfo.getMatnr()+"的最新数据进行扩展！");
                 }
                 this.putAttribute("processDefinitionKey", NonProdApplyApplication.PROCESS_DEFINITION_KEY_EXD);
                 this.putAttribute("applyType", "2");
@@ -113,7 +113,8 @@ public class NonProdApplyController extends CommonController {
                 if (StringUtil.isNotBlank(bizId)) {
                     nonProdApplyBaseInfo = nonProdApplyApplication.loadNonProdApplyBaseInfoById(bizId);
                     if (!isLastedData(nonProdApplyBaseInfo.getBillCode(), nonProdApplyBaseInfo.getMatnr())) {
-                        throw new IllegalArgumentException("请选择物料"+nonProdApplyBaseInfo.getMatnr()+"的最新数据进行变更！");
+                        //先注释
+                        //throw new IllegalArgumentException("请选择物料"+nonProdApplyBaseInfo.getMatnr()+"的最新数据进行变更！");
                     }
 
                     this.putAttribute("processDefinitionKey", NonProdApplyApplication.PROCESS_DEFINITION_KEY_MOD);

topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/domain/query/NonProdApplyBaseInfoQueryRequest.java

@@ -101,5 +101,6 @@ public class NonProdApplyBaseInfoQueryRequest extends FlowBillSuperQueryRequest
     private String  startDate;
 
     private String  endDate;
+    private String  werks;
 
 }
\ No newline at end of file

topsun/src/main/resources/config/topsun/sap/nonProdApply/nonProdApplyBaseInfo.xml

@@ -2,7 +2,7 @@
 <query-mappings>
     <query name="slicedNonProdApplyBaseInfoQuery" table="sap_non_prod_apply_base_info">
         <sql-query>
-            select t.*,ad.matnr,ad.status as dept_status,ad.maktx from sap_non_prod_apply_base_info t left join sap_non_prod_apply_dept ad on t.id  = ad.base_info_id where 1=1
+            select t.*,ad.matnr,ad.status as dept_status,ad.maktx,ad.werks,ad.werks_name from sap_non_prod_apply_base_info t left join sap_non_prod_apply_dept ad on t.id  = ad.base_info_id where 1=1
         </sql-query>
         <condition column="matnr" name="matnr" type="java.lang.String" symbol="like" alias="ad"/>
         <condition column="status" name="status" type="java.lang.String" symbol="in" alias="t"/>
@@ -10,6 +10,8 @@
         <condition column="generic_name" name="genericName" type="java.lang.String" symbol="like" alias="t"/>
         <condition column="maktx" name="maktx" type="java.lang.String" symbol="like" alias="ad"/>
         <condition column="bill_code" name="billCode" type="java.lang.String" symbol="like" alias="t"/>
+        <condition column="werks" name="werks" type="java.lang.String" symbol="=" alias="ad"/>
+        <condition column="bill_code" name="billCode" type="java.lang.String" symbol="like" alias="t"/>
         <condition column="created_date" name="startDate" type="java.util.Date" symbol="&gt;=" alias="t"/>
         <condition column="created_date" name="endDate" type="java.util.Date" symbol="&lt;=" alias="t"/>
     </query>