物料/产品接口数据的修改2

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

@@ -197,6 +197,35 @@ function bindEvent(){
             $('#lgfsbName').val(data.LTYPT);
         }
     });
+
+
+    $('#minbeName').searchbox({
+        type: "system", name: "dictionary",
+        getParam: function (item) {
+            return {
+                fieldName: "MINBE",
+                //filterValue:$('#lgnum').val()
+            }
+        },
+        onChange: function (value, data) {
+            $('#minbe').val(data.MINBE);
+            $('#minbeName').val(data.NAME);
+        }
+    });
+
+    $('#dispoName').searchbox({
+        type: "system", name: "dictionary",
+        getParam: function (item) {
+            return {
+                fieldName: "DISPO",
+                //filterValue:$('#lgnum').val()
+            }
+        },
+        onChange: function (value, data) {
+            $('#dispo').val(data.DISPO);
+            $('#dispoName').val(data.NAME);
+        }
+    });
 }
 
 /**

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

@@ -83,8 +83,12 @@
                 <x:selectC name="disgr" label="MRP组" labelCol="1" fieldCol="2" dictionary="disgr"/>
                 <x:selectC name="dismm" label="MRP类型" labelCol="1" fieldCol="2" dictionary="dismm"/>
 
-                <x:inputC name="minbe" label="重订货点" labelCol="1" fieldCol="2"/>
-                <x:inputC name="dispo" label="MRP控制者" labelCol="1" fieldCol="2" required="true"/>
+                <x:hidden name="minbe"/>
+                <x:inputC name="minbeName" label="重订货点" labelCol="1" fieldCol="2" required="true" wrapper="select"/>
+
+                <x:hidden name="dispo"/>
+                <x:inputC name="dispoName" label="MRP控制者" labelCol="1" fieldCol="2" required="true" wrapper="select"/>
+
                 <x:selectC name="disls" label="批量规模" labelCol="1" fieldCol="2" required="true" dictionary="disls"/>
                 <x:inputC name="bstfe" label="固定批量" labelCol="1" fieldCol="2"/>
                 <x:inputC name="bstma" label="最大批量" labelCol="1" fieldCol="2"/>

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

@@ -277,8 +277,8 @@ function bindEvent() {
             return {fieldName: "RAUBE"}
         },
         onChange: function (value, data) {
-            $('#raube').val(data.WERKS);
-            $('#raubeName').val(data.NAME1);
+            $('#raube').val(data.RAUBE);
+            $('#raubeName').val(data.NAME);
         }
     });
 

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

@@ -384,6 +384,18 @@ function getMeId() {
 }
 
 function bindEvent(){
+
+
+    $('#ladgrName').searchbox({
+        type: "system", name: "dictionary",
+        getParam: function (item) {
+            return {fieldName: "LADGR"}
+        },
+        onChange: function (value, data) {
+            $('#ladgr').val(data.LADGR);
+            $('#ladgrName').val(data.LADGRTEXT);
+        }
+    });
     /*$('#vtwegName').searchbox({
         type: "system", name: "dictionary",
         getParam: function (item) {

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

@@ -101,7 +101,8 @@
                 <x:inputC name="mtpos" label="销售项次组" labelCol="1" fieldCol="2" required="false"/>
                 <x:inputC name="xchpf" label="批次管理" labelCol="1" fieldCol="2" />
                 <x:inputC name="tragr" label="运输组" labelCol="1" fieldCol="2" required="false"/>
-                <x:selectC name="ladgr" label="装载组" labelCol="1" fieldCol="2" required="false"  dictionary="ladgr"/>
+                <x:hidden name="ladgr"/>
+                <x:inputC name="ladgrName" label="装载组" labelCol="1" fieldCol="2" required="false"  wrapper="select"/>
             </div>
         </div>
 

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

@@ -409,7 +409,9 @@ public class NonProdApplyApplicationImpl  extends FlowBroker implements NonProdA
             if ("S".equals(resultMap.get("TYPE"))) {
                 resultMap.put("type", "S");
                 resultMap.put("message", applyDept.getMatnr()+resultMap.get("MESSAGE"));
-                applyDept.setMatnr((String) map.get("MESSAGE_V1"));
+                if (!"product".equals(prodApplyBaseInfo.getKind())) {
+                  applyDept.setMatnr((String) map.get("MESSAGE_V1"));
+                }
                 nonProdApplyDeptApplication.save(applyDept);
             } else {
                 throw new RuntimeException("数据传输失败，请稍后手动重试！" + resultMap.get("MESSAGE"));

topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/domain/SapNonProdApplyDept.java

@@ -828,6 +828,16 @@ public class SapNonProdApplyDept implements Serializable {
 
     @Column(name = "raube_name")
     private String raubeName;
+
+    @Column(name = "dispo_name")
+    private String dispoName;
+
+    @Column(name = "minbe_name")
+    private String minbeName;
+
+    @Column(name = "ladgr_name")
+    private String ladgrName;
+
     @Transient
     private String billCode;
     @Transient