order提交修改

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

@@ -344,7 +344,7 @@ public class Micron20031Api {
         String resultStr = HttpHelper.postJsonWithAuth(checkStockAvailableUrl, dataMap, auth);
         String resultStr = HttpHelper.postJsonWithAuth(checkStockAvailableUrl, dataMap, auth);
         log.info("调用MES接口 triggerMatReqOrder 返回:" + resultStr);
         log.info("调用MES接口 triggerMatReqOrder 返回:" + resultStr);
         Object object=getResult(resultStr,"MicronPN");
         Object object=getResult(resultStr,"MicronPN");
-
+//        MatReqNo
         MatOrderBean resultOrderBean = JsonUtil.toObj(resultStr,MatOrderBean.class);
         MatOrderBean resultOrderBean = JsonUtil.toObj(resultStr,MatOrderBean.class);
 
 
         return resultOrderBean;
         return resultOrderBean;

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

@@ -82,12 +82,23 @@ public class MicronSpOrderController {
         MatOrderBean bean = new MatOrderBean();
         MatOrderBean bean = new MatOrderBean();
         bean.setMicronPN(partNumber);
         bean.setMicronPN(partNumber);
         bean.setQuantity(qty);
         bean.setQuantity(qty);
+//
+//        Map<String, String> map=new HashMap<>();
+//        map.put("partNumber",partNumber);
+//        map.put("matReqNo","matReqNo");
+//        return ResultBean.newOkResult(map);
         try {
         try {
             MatOrderBean orderBean1 = Micron20031Api.triggerMatReqOrder(bean);
             MatOrderBean orderBean1 = Micron20031Api.triggerMatReqOrder(bean);
+            if(orderBean1==null){
+                return ResultBean.newErrorResult(1,"smfcore.api.nodata","Failed to get data");
+            }
             if (ObjectUtil.isNotEmpty(orderBean1.getMessage())) {
             if (ObjectUtil.isNotEmpty(orderBean1.getMessage())) {
                 return ResultBean.newErrorResult(1, orderBean1.getMessage(), orderBean1.getMessage());
                 return ResultBean.newErrorResult(1, orderBean1.getMessage(), orderBean1.getMessage());
             } else {
             } else {
-                return ResultBean.newOkResult(partNumber);
+                Map<String, String> resultMap=new HashMap<>();
+                resultMap.put("partNumber",partNumber);
+                resultMap.put("matReqNo",orderBean1.getMatReqNo());
+                return ResultBean.newOkResult(resultMap);
             }
             }
         } catch (ApiException e) {
         } catch (ApiException e) {
             return ResultBean.newErrorResult(1, e.getMessage(), e.getMessage());
             return ResultBean.newErrorResult(1, e.getMessage(), e.getMessage());