调用mom接口增加非空判断,移除插入mom_log代码

陈翱
1 parent 9a0a42d8
Showing 2 changed files with 12 additions and 14 deletions
src/main/java/com/huaheng/api/mes/controller/MesReceiptController.java
src/main/java/com/huaheng/pc/monitor/job/task/RyTask.java
@@ -461,10 +461,8 @@ public class MesReceiptController extends BaseController {
      */
     @ApiLogger(apiName = "post调用E_Rd_Out（MOM）出库接口", from="ROBOT")
     @PostMapping("/postE_Rd_Out")
-    public Boolean postE_Rd_Out(@RequestBody ShipmentHeader shipmentHeader){
+    public Boolean  postE_Rd_Out(@RequestBody ShipmentHeader shipmentHeader){
         // ShipmentHeader shipmentHeader = shipmentHeaderService.getById(shipmentHeaderID.getId());
-        // 返回MOM，并记录在数据库
-        MomLog momLog = new MomLog();
         StringBuffer keyField = new StringBuffer();
         JSONArray dataArray = new JSONArray();
         // 如果订单为合并类型
@@ -483,12 +481,14 @@ public class MesReceiptController extends BaseController {
             Map<Integer,List<ShipmentDetail>> map = new HashMap<>();
             for (ShipmentDetail detail : shipmentDetailList){
                     Integer key = detail.getRecordID();
-                    if(map.containsKey(key)) {
-                        map.get(key).add(detail);
-                    }else {
-                        List<ShipmentDetail> list = new ArrayList<>();
-                        list.add(detail);
-                        map.put(key, list);
+                    if (key!=null){
+                        if(map.containsKey(key)) {
+                            map.get(key).add(detail);
+                        }else {
+                            List<ShipmentDetail> list = new ArrayList<>();
+                            list.add(detail);
+                            map.put(key, list);
+                        }
                     }
             }
  
@@ -531,10 +531,6 @@ public class MesReceiptController extends BaseController {
         String action = "E_Rd_Out";
         JSONObject json = new JSONObject();
         json.put("data", dataArray);
-        momLog.setType("2"); // （入：1  出：2）
-        momLog.setMomData(json.toJSONString());
-        momLog.setCreated(new Date());
-        momLogService.save(momLog);
         boolean success = postMOM(action, json);
         if(success) {
             shipmentHeader.setFirstStatus(QuantityConstant.SHIPMENT_HEADER_RETURN);
@@ -162,7 +162,6 @@ public class RyTask extends BaseController {
             shipmentHeaderLambdaQueryWrapper.eq(ShipmentHeader::getLastStatus, QuantityConstant.SHIPMENT_HEADER_COMPLETED);
             List<ShipmentHeader> shipmentHeaderList = shipmentHeaderService.list(shipmentHeaderLambdaQueryWrapper);
             for(ShipmentHeader shipmentHeader : shipmentHeaderList) {
-                System.out.println("ID>>>>>>>>"+shipmentHeader.getId());
                 if (("MOM".equals(shipmentHeader.getCreatedBy()) || "merge".equals(shipmentHeader.getShipmentType()) ||  "299".equals(shipmentHeader.getShipmentType()))) {
                     try{
                         shipmentHeader.setWarehouse("035");
@@ -192,6 +191,9 @@ public class RyTask extends BaseController {
         }
     }
  
+
+
+
     public void autoAssignCheckout(String params)  {
         System.out.println("autoAssignCheckout params:" + params);
         String[] areas = params.split(",");