领料申请增加物料组

topsun-xt/src/main/webapp/biz/topsun/sap/nonProducePick/nonProducePickDetail.js

@@ -98,6 +98,26 @@ function loadGrid() {
             {
                 display: "序号", name: "rspos", width: 70, minWidth: 60, type: "string", align: "left",
             },
+            {
+                display: "物料组", name: "wgbez", width: 160, align: "left", type: "string",
+                editor: {
+                    required: true, type: "select",
+                    data: {
+                        type: 'system',
+                        name: "dictionary",
+                        getParam: function (item) {
+                            return {
+                                fieldName: "MATKL",
+                                //filterValue: $("#werks").val()
+                            }
+                        },
+                        back: {
+                            MATKL: "matkl",
+                            WGBEZ: "wgbez",
+                        }
+                    },
+                }
+            },
             {
                 display: "物料", name: "matnr", width: 160, minWidth: 60, type: "string", align: "left",
                 editor: {
@@ -108,6 +128,7 @@ function loadGrid() {
                         getParam: function (item) {
                             return {
                                 filterValue:$("#werks").val(),
+                                matkl:item.matkl,
                                 mtart:"ZGMB"
                             }
                         },

topsun-xt/src/main/webapp/biz/topsun/sap/nonProducePick/nonProducePickList.js

@@ -34,6 +34,8 @@ function loadGrid() {
             {display: "内部订单编号", name: "aufnr", width: 100, minWidth: 60, type: "string", align: "left"},
             {display: "内部订单描述", name: "aufnrName", width: 200, minWidth: 60, type: "string", align: "left"},
             {display: "序号", name: "rspos", width: 70, minWidth: 60, type: "string", align: "left",},
+            {display: "物料组编码", name: "matkl", width: 100, minWidth: 60, type: "string", align: "left"},
+            {display: "物料组描述", name: "wgbez", width: 160, minWidth: 60, type: "string", align: "left"},
             {display: "物料", name: "matnr", width: 160, minWidth: 60, type: "string", align: "left"},
             {display: "SAP物料名称", name: "maktx", width: 300, minWidth: 60, type: "string", align: "left",},
             {display: "物料要求描述", name: "matxt", width: 300, minWidth: 60, type: "string", align: "left",},

topsun/src/main/java/com/huigou/topsun/controller/ResourceSearchController.java

@@ -133,8 +133,10 @@ public class ResourceSearchController {
         String param = sdo.getString("paramValue");
         String filterValue = sdo.getString("filterValue");
         String mtart = sdo.getString("mtart");//如果传了刀模板具，就排除掉
+        String matkl = sdo.getString("matkl");//物料组
         SapDialogQuery queryRequest = sdo.toObject(SapDialogQuery.class);
         queryRequest.setWerks(filterValue);
+        queryRequest.setMatkl(matkl);
         List<Map<String,String>> mapList = sapMaterialApplication.getSapMaterial(queryRequest);
 //        if (CollectionUtil.isNotEmpty(mapList)){
 //            mapList = mapList

topsun/src/main/java/com/huigou/topsun/sap/nonProducePick/domain/NonProducePickItem.java

@@ -30,6 +30,17 @@ public class NonProducePickItem extends AbstractEntity {
      */
     @Column(name = "RSPOS")
     private String rspos;
+    /**
+     * 物料组
+     */
+    @Column(name = "MATKL")
+    private String matkl;
+
+    /**
+     * 物料组描述
+     */
+    @Column(name = "WGBEZ")
+    private String wgbez;
 
     /**
      *物料

topsun/src/main/resources/config/topsun/sap/nonProducePick/nonProducePick.xml

@@ -26,6 +26,8 @@
             t.message,
             pi.id as item_id,
             pi.rspos,
+            pi.matkl,
+            pi.wgbez,
             pi.matnr,
             pi.maktx,
             pi.lgort,