getMatReqDetail接口返回集合

src/main/java/com/neotel/smfcore/custom/micron20031/Micron20031Api.java

@@ -17,6 +17,10 @@ import java.util.*;
  */
  */
 @Slf4j
 @Slf4j
 public class Micron20031Api {
 public class Micron20031Api {
+    public static String MODE_DISABLE_SAP="DISABLE_SAP";
+    public static String MODE_DISABLE_MAM="DISABLE_MAM";
+    public static String MODE_DISABLE_MAM_AND_SAP="DISABLE_MAM_AND_SAP";
+    public static String MODE_ENABLE_MAM_SAP="ENABLE_MAM_SAP";
 
 
     private static String AUTH_TOKEN = "";
     private static String AUTH_TOKEN = "";
 
 
@@ -151,19 +155,24 @@ public class Micron20031Api {
      * //Input: MatReqNo, MaterialType
      * //Input: MatReqNo, MaterialType
      * //Output: MatReqNo, Micron Part Number, Lot No, Quantity, UnitOfMeasures, MaterialType, Message, Status
      * //Output: MatReqNo, Micron Part Number, Lot No, Quantity, UnitOfMeasures, MaterialType, Message, Status
      */
      */
-    public static DepositMatReqBean getMatReqDetail(String matReqNo) throws ApiException {
+    public static List<DepositMatReqBean> getMatReqDetail(String matReqNo) throws ApiException {
         //pnMap的key为pn, value为库存数量
         //pnMap的key为pn, value为库存数量
         String getMatReqDetailUrl = "";
         String getMatReqDetailUrl = "";
         String auth = getAuthToken();
         String auth = getAuthToken();
-        Map<String,Object> dataMap = new HashMap<>();
-        dataMap.put("MatReqNo",matReqNo);
-        dataMap.put("MaterialType",MATERIAL_TYPE);
+        Map<String, Object> dataMap = new HashMap<>();
+        dataMap.put("MatReqNo", matReqNo);
+        dataMap.put("MaterialType", MATERIAL_TYPE);
 
 
-        log.info("调用MES接口 getMatReqDetail,参数:"+JsonUtil.toJsonStr(dataMap));
+        log.info("调用MES接口 getMatReqDetail,参数:" + JsonUtil.toJsonStr(dataMap));
         String resultStr = HttpHelper.postJsonWithAuth(getMatReqDetailUrl, dataMap, auth);
         String resultStr = HttpHelper.postJsonWithAuth(getMatReqDetailUrl, dataMap, auth);
         log.info("调用MES接口 getMatReqDetail 返回:" + resultStr);
         log.info("调用MES接口 getMatReqDetail 返回:" + resultStr);
-        DepositMatReqBean depositMatReqBean = JsonUtil.toObj(resultStr,DepositMatReqBean.class);
-        return depositMatReqBean;
+        Map<String, Object> resultMap = JsonUtil.toMap(resultStr);
+        List<DepositMatReqBean> beans = new ArrayList<>();
+        if (resultMap.containsKey("materialDocList")) {
+            beans = (List<DepositMatReqBean>) resultMap.get("materialDocList");
+        }
+//        DepositMatReqBean depositMatReqBean = JsonUtil.toObj(resultStr,DepositMatReqBean.class);
+        return beans;
     }
     }
 
 
     /**
     /**