物料主数据字段调整

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

@@ -175,8 +175,7 @@ function bindEvent(){
     if ($('#vint2').val()==''){
         $('#vint2').val("999");
     }
-    if ($('#vrmod').val()=='')
-    {
+    if ($('#vrmod').val()==''){ //消耗模式
       $('#vrmod').val("2");
     }
     $('#lgproName').searchbox({

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

@@ -116,10 +116,9 @@
                 <x:selectC name="vrmod" label="消耗模式" labelCol="1" fieldCol="2" dictionary="vrmod"/>
                 <x:inputC name="vint1" label="逆推消耗期间" labelCol="1" fieldCol="2" mask="99999"/>
                 <x:inputC name="vint2" label="顺推消耗期间" labelCol="1" fieldCol="2" mask="99999"/>
-                <x:inputC name="miskz" label="综合MRP" labelCol="1" fieldCol="2"/>
-
-                <x:inputC name="perkz" label="期间标识" labelCol="1" fieldCol="2"/>
+                <x:selectC name="miskz" label="综合MRP" labelCol="1" fieldCol="2"  dictionary="MISKZ"/>
 
+                <x:selectC name="perkz" label="期间标识" labelCol="1" fieldCol="2"  dictionary="perkz"/>
             </div>
         </div>
 

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

@@ -175,6 +175,17 @@ function bindEvent(){
             $('#ausme').val(data.MSEHI);
             $('#ausmeName').val(data.MSEHL);
         }
+    });  //"T024F
+    //alert($('#werks').val());
+    $('#fevor').searchbox({
+        type: "system", name: "dictionary",
+        getParam: function (item) {
+            return {fieldName: "T024F", filterValue: $('#werks').val()}
+        },
+        onChange: function (value, data) {
+            $('#fevor').val(data.FEVOR);
+           // $('#fevorName').val(data.LGOBE);
+        }
     });
 }
 

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

@@ -17,6 +17,7 @@
     <form class="hg-form" method="post" action="" id="submitForm">
         <x:hidden name="active"/> <!--状态-->
         <x:hidden name="meId"/> <!--状态-->
+        <x:hidden name="werks"/>
         <div style="float: right; margin-right: 10px;display: none;" class="btn-group" id="buttonBox">
             <button id="save" title="" type="button" onclick="saveForm(0)" class="btn btn-gray"><i
                     class="fa fa-save"></i>保存
@@ -79,7 +80,7 @@
                 <x:inputC name="umrenProd" label="转换分母" labelCol="1" fieldCol="3"/>
                 <x:inputC name="umrezProd" label="转换分子" labelCol="1" fieldCol="3"/>
                 <x:selectC name="sfcpf" label="生产计划参数文件" labelCol="2" fieldCol="2" dictionary="sfcpf"/>
-                <x:inputC name="fevor" label="生产主管" labelCol="1" fieldCol="2"/>
+                <x:inputC name="fevor" label="生产主管" labelCol="1" fieldCol="2" wrapper="select"/>
             </div>
         </div>
 

topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/application/impl/NonProdApplyDeptApplicationImpl.java

@@ -330,7 +330,10 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
         }
         //存储分区标识默认001
         sapVO.setLgbkz("001");
-        sapVO.setMbrsh("M");//行业默认M
+         sapVO.setMbrsh("M");//行业默认M
+        if ("0".equals(sapVO.getPerkz())){ //期间标识
+           sapVO.setPerkz("");
+        }
         //销售单位转换
         if (StringUtil.isNotBlank(sapVO.getVrkme())){
             Map<String,Object> unitsaleMap = new HashMap<>();