客供料查询条件

topsun-xt/src/main/webapp/biz/topsun/sap/clientMaterials/clientMaterialsList.js

@@ -25,7 +25,7 @@ function loadGrid() {
             {display: "订单完成日期", name: "pedtr", width: 150, minWidth: 60, type: "string", align: "left"},
             {display: "订货数量", name: "gsmng", width: 150, minWidth: 60, type: "string", align: "left"},
             {display: "单位", name: "meins", width: 120, minWidth: 60, type: "string", align: "left"},
-            {display: "计划订单", name: "plnum", width: 60, minWidth: 60, type: "string", align: "left"},
+            {display: "计划订单", name: "plnum", width: 120, minWidth: 60, type: "string", align: "left"},
             {display: "销售订单", name: "kdauf", width: 120, minWidth: 60, type: "string", align: "left"},
             {display: "行项次", name: "kdpos", width: 120, minWidth: 60, type: "string", align: "left"},
             {display: "生产订单", name: "aufnr", width: 200, minWidth: 60, type: "string", align: "left"},

topsun/src/main/java/com/huigou/topsun/sap/clientMaterials/application/impl/ClientMaterialsApplicationImpl.java

@@ -13,11 +13,13 @@ import com.huigou.topsun.sap.clientMaterials.application.ClientMaterialsApplicat
 import com.huigou.topsun.sap.clientMaterials.domain.ClientMaterials;
 import com.huigou.topsun.sap.clientMaterials.domain.query.ClientMaterialsQueryRequest;
 import com.huigou.topsun.sap.clientMaterials.repository.ClientMaterialsRepository;
+import com.huigou.topsun.sap.clientMaterials.vo.ClientMaterialsQueryRequestVo;
 import com.huigou.topsun.sap.clientMaterials.vo.ClientMaterialsVo;
 import com.huigou.topsun.sap.common.HttpClient;
 import com.huigou.topsun.sap.common.domain.SapResult;
 import com.huigou.topsun.util.SAPUtils;
 import com.huigou.uasp.bmp.common.application.BaseApplication;
+import com.huigou.util.ClassHelper;
 import com.huigou.util.JSONUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -60,12 +62,13 @@ public class ClientMaterialsApplicationImpl extends BaseApplication implements C
     public Map<String, Object> getClientMaterialsListFromSap(ClientMaterialsQueryRequest queryRequest) {
         List<ClientMaterials>  sapClientMaterialsList = new ArrayList<>();
         Map<String, Object> dataMap = new HashMap<>();
-        Map<String, Object> queryMap = new HashMap<>();
+        ClientMaterialsQueryRequestVo queryRequestVo = new ClientMaterialsQueryRequestVo();
+        ClassHelper.copyProperties(queryRequest,queryRequestVo);
         ArrayList<Map<String, Object>> maps = new ArrayList<>();
         String json = null;
         try {
             //http://192.168.3.109:8000/sap/bc/erp_ep/search/sch_planorder?sap-client=300
-            json = httpClient.execute(queryMap, "search/sch_planorder");
+            json = httpClient.execute(queryRequestVo, "search/sch_planorder");
             Map<String, Object> map = JSONUtil.toMap(json);
             SapResult sapResult = JSONObject.parseObject(JSONUtil.toString(map.get("MSG")), SapResult.class);
             if ("S".equals(sapResult.getTYPE())){

topsun/src/main/java/com/huigou/topsun/sap/clientMaterials/domain/query/ClientMaterialsQueryRequest.java

@@ -3,6 +3,8 @@ package com.huigou.topsun.sap.clientMaterials.domain.query;
 import com.huigou.data.domain.query.QueryAbstractRequest;
 import lombok.Data;
 
+import javax.persistence.Column;
+
 /**
  * @Auther: lxh
  * @Date: 2024/06/05/16:38
@@ -11,4 +13,19 @@ import lombok.Data;
 @Data
 public class ClientMaterialsQueryRequest extends QueryAbstractRequest {
     private String closed;
+
+    /**
+     * 客供料
+     */
+    private String matnr;
+
+    /**
+     * 计划订单
+     */
+    private String plnum;
+
+    /**
+     * 工厂
+     */
+    private String werks;
 }

topsun/src/main/java/com/huigou/topsun/sap/clientMaterials/vo/ClientMaterialsQueryRequestVo.java

+package com.huigou.topsun.sap.clientMaterials.vo;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.huigou.data.domain.query.QueryAbstractRequest;
+import lombok.Data;
+
+/**
+ * @Auther: lxh
+ * @Date: 2024/06/05/16:38
+ * @Description:
+ */
+@Data
+public class ClientMaterialsQueryRequestVo {
+
+    /**
+     * 客供料
+     */
+    @JsonProperty("MATNR")
+    private String matnr;
+
+    /**
+     * 计划订单
+     */
+    @JsonProperty("PLNUM")
+    private String plnum;
+
+    /**
+     * 工厂
+     */
+    @JsonProperty("PWWRK")
+    private String werks;
+}