固定资产采购申请选择资产编号时根据物料组筛选对应资产类型下的资产编号（待提供对应关系）

topsun-xt/src/main/webapp/biz/topsun/sap/purchase/purchaseAnln1Detail.js

@@ -20,7 +20,10 @@ function initGrid() {
                     display: "工厂", name: "BUKRS", width: "80", align: "left", type: "string",
                 },
                 {
-                    display: "资产编号", name: "ANLN1", width: "200", align: "left", type: "string",
+                    display: "资产编号", name: "ANLN1", width: "100", align: "left", type: "string",
+                },
+                {
+                    display: "资产类型", name: "TXK20", width: "200", align: "left", type: "string",
                 },
                 {
                     display: "资产描述", name: "TXT50", width: "300", align: "left", type: "string",
@@ -28,7 +31,10 @@ function initGrid() {
             ],
             dataAction: 'server',
             url: web_app.name + '/sapPurchase/queryAnlanFromSap.ajax?',
-            parms: {werks: $("#werks").val()},
+            parms: {
+                werks: $("#werks").val(),
+                matkl: $("#matkl").val()
+            },
             toolbar: toolbarOptions,
             width: '99.8%',
             height: 500,

topsun-xt/src/main/webapp/biz/topsun/sap/purchase/purchaseAnln1Detail.jsp

@@ -14,6 +14,7 @@
         <form class="hg-form" method="post" action="" id="queryMainForm">
             <div class="hg-form-row">
                 <x:hidden name="werks"/>
+                <x:hidden name="matkl"/>
                 <x:inputC name="paramValue" label="查询条件" labelCol="2" fieldCol="4" required="true"/>
             </div>
             <x:searchButtons/>

topsun-xt/src/main/webapp/biz/topsun/sap/purchase/sapZNE1PurchaseDetail.js

@@ -131,11 +131,12 @@ function initItemGrid() {
             var id =$clicked.data('id');
             var werks =$clicked.data('werks');
             var menge =$clicked.data('menge');
+            var matkl =$clicked.data('matkl');
             UICtrl.showAjaxDialog({
                 title: '绑定',
                 height: 500,
                 width: 700,
-                url: web_app.name + '/sapPurchase/showBindAnln1.load?itemId='+id +"&werks="+werks,
+                url: web_app.name + '/sapPurchase/showBindAnln1.load?itemId='+id +"&werks="+werks+ "&matkl="+matkl,
                 ok: function(d){
                     var _self = this;
                     var rows = gridManager.getSelectedRows();
@@ -356,6 +357,7 @@ function getGridColumns() {
                 html.push('<a class="bindAnln1" href="javascript:void(0);"');
                 html.push(' data-id="', item.id, '"');
                 html.push(' data-werks="', item.werks, '"');
+                html.push(' data-matkl="', item.matkl, '"');
                 html.push(' data-menge="', item.menge, '"');
                 html.push(' data-name="', item.txz01, '">');
                 html.push('<i class="fa fa-location-arrow"></i>&nbsp;');

topsun/src/main/java/com/huigou/topsun/sap/purchase/controller/SapPurchaseController.java

@@ -110,7 +110,9 @@ public class SapPurchaseController extends CommonController {
         SDO sdo = this.getSDO();
         String itemId = sdo.getString("itemId");
         String werks = sdo.getString("werks");
+        String matkl = sdo.getString("matkl");
         this.putAttribute("werks",werks);
+        this.putAttribute("matkl",matkl);
         return forward("purchaseAnln1Detail",itemId);
     }
 
@@ -118,6 +120,7 @@ public class SapPurchaseController extends CommonController {
         SDO sdo = this.getSDO();
         String param = sdo.getString("paramValue");
         String werks = sdo.getString("werks");
+        String matkl = sdo.getString("matkl");
         List<Map<String, String>> mapList = new ArrayList<>();
         if (StringUtil.isBlank(param)){
             return packGridDataAndResult(mapList);
@@ -128,7 +131,13 @@ public class SapPurchaseController extends CommonController {
                     .stream()
                     .filter(map -> map.values().stream().anyMatch(value -> value.contains(werks)))
                     .collect(Collectors.toList());
-
+            //根据物料组筛选对应资产类型下的资产编号
+//            if ("A0001".equals(matkl)){//固定资产-房屋及建筑物
+//                mapList = mapList
+//                       .stream()
+//                       .filter(map -> map.values().stream().anyMatch(value -> value.contains("Z101")))
+//                       .collect(Collectors.toList());
+//            }
             if (StringUtil.isNotBlank(param)){//输入查询条件过滤
                 mapList = mapList
                         .stream()