物料组根据物料类型筛选；采购申请审批增加发货工厂

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

@@ -326,7 +326,7 @@ function bindEvent() {
         getParam: function (item) {
             return {
                 fieldName: "MATKLTYPE",
-                //filterValue: $("#mtart").val()
+                filterValue: $("#mtart").val()
             }
         },
         onChange: function (value, data) {

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

@@ -930,7 +930,7 @@ function bindEvent() {
         getParam: function (item) {
             return {
                 fieldName: "MATKLTYPE",
-                //filterValue: $("#mtart").val()
+                filterValue: $("#mtart").val()
             }
         },
         onChange: function (value, data) {

topsun-xt/src/main/webapp/biz/topsun/sap/purchaseApproval/sapPurchaseApprovalDetail.js

@@ -65,6 +65,7 @@ function getGridColumns() {
         {display: "项目类别描述", name: "ptext", width: "100", align: "left", type: "string"},
         {display: "科目分配类别", name: "knttp", width: "100", align: "left", type: "string",},
         {display: "科目分配类别描述", name: "knttx", width: "100", align: "left", type: "string"},
+        {display: "发货工厂", name: "reswk", width: "100", align: "left", type: "string",},
         {display: "工厂", name: "werks", width: "100", align: "left", type: "string",},
         {display: "工厂名称", name: "name1", width: "200", align: "left", type: "string"},
         {display: "物料编号", name: "matnr", width: "200", align: "left", type: "string",},

topsun-xt/src/main/webapp/biz/topsun/sap/purchaseApproval/sapPurchaseApprovalList.js

@@ -42,6 +42,7 @@ function initPurchaseListGrid() {
                 {display: "项目类别描述", name: "ptext", width: "100", align: "left", type: "string"},
                 {display: "科目分配类别", name: "knttp", width: "100", align: "left", type: "string"},
                 {display: "科目分配类别描述", name: "knttx", width: "100", align: "left", type: "string"},
+                {display: "发货工厂", name: "reswk", width: "100", align: "left", type: "string",},
                 {display: "工厂", name: "werks", width: "100", align: "left", type: "string",},
                 {display: "工厂名称", name: "name1", width: "200", align: "left", type: "string"},
                 {display: "物料编号", name: "matnr", width: "200", align: "left", type: "string",},

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

@@ -726,6 +726,10 @@ public class ResourceSearchController {
                         .filter(
                                 map -> map.containsKey("MATKL") && map.get("MATKL").length() == 3
                         ).collect(Collectors.toList());
+                resultMapList = resultMapList
+                        .stream()
+                        .filter(map -> map.values().stream().anyMatch(value->value.contains(filterValue)))
+                        .collect(Collectors.toList());
             }else {
                 //原材料  1/2/3开头，去掉二级分类（三位数）
                 if (StringUtil.isNotBlank(filterValue)){//固定条件过滤,前3位为大类编码

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

@@ -48,6 +48,7 @@
             ai.badat,
             ai.ernam,
             ai.name_text,
+            ai.reswk,
             o.dept_name as afnam_dept_name
              FROM sap_purchase_approval t
              LEFT JOIN sap_purchase_approval_item ai ON t.id = ai.sap_purchase_approval_id