客户资料同步和工单明细校验

src/main/java/com/uas/eis/controller/ERPController.java

@@ -80,4 +80,9 @@ public class ERPController {
         return erpService.syncProdInOutMakeGive(data);
     }
 
+    @RequestMapping("/erp/checkProdBomItem")
+    public Map<String, Object> checkProdBomItem(String data){
+        return erpService.checkProdBomItem(data);
+    }
+
 }

src/main/java/com/uas/eis/service/Impl/ERPServiceImpl.java

@@ -179,11 +179,13 @@ public class ERPServiceImpl implements ERPService {
         Map<String, Object> hashMap = new HashMap<>();
         hashMap.put("code", 0);
         hashMap.put("msg", "参数异常，请联系管理员！");
-        Map<String, Object> map = syncMESDeleteMake(JSON.toJSONString(data).replace("null", "\"\""), tokenConfig.get("syncMakeMaterialCheck"));
+        System.err.println(JSONObject.parseObject(data));
+        System.err.println(JSON.toJSONString(data));
+        Map<String, Object> map = syncMESCheckBomItems(JSON.toJSONString(JSONObject.parseObject(data)).replace("null", "\"\""), tokenConfig.get("syncMakeMaterialCheck"));
         if (map != null) {
-            int msgId = Integer.parseInt(StringUtil.nvl(map.get("msgId"), "-1"));
+            int msgId = Integer.parseInt(StringUtil.nvl(map.get("code"), "-1"));
             hashMap.put("code", msgId);
-            hashMap.put("msg", map.get("msgStr"));
+            hashMap.put("msg", map.get("msg"));
         }
         return hashMap;
     }
@@ -233,4 +235,31 @@ public class ERPServiceImpl implements ERPService {
         }
         return map;
     }
+
+
+    private Map<String, Object> syncMESCheckBomItems(String params,String url){
+        Map<String, Object> map = new HashMap<>();
+        map.put("code",-1);
+        logger.info("params："+params);
+        try {
+            String post = PSHttpUtils.sendPost(tokenConfig.get("mesHttp") + url, params);
+            logger.info("post："+post);
+            JSONObject jsonObject = JSON.parseObject(post);
+            int code = jsonObject.getIntValue("msgId");
+            if (code==0){
+                map.put("code",code);
+                map.put("msg","同步MES成功");
+            }else if(code==1){
+                map.put("code",code);
+                map.put("msg",jsonObject.getString("msgStr"));
+            }else {
+                map.put("msg","接口调用异常，错误代码："+code+"，请联系MES处理！");
+            }
+        }catch (Exception e){
+            map.put("msg","接口调用异常，异常信息："+e.getMessage()+"，请联系MES处理！");
+            logger.info("异常信息："+e.getMessage());
+            e.printStackTrace();
+        }
+        return map;
+    }
 }