打开汽运港存库出库

src/main/java/com/steerinfo/dil/service/impl/TmstruckLoadResultServiceImpl.java

@@ -133,15 +133,7 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
         tmstruckLoadResult.setResultIsclear(resultIsclear);
         tmstruckLoadResult.setResultLoadStartTime(new Date((long) map.get("resultLoadStartTime")));
         tmstruckLoadResult.setInsertUpdateRemark((String) map.get("insertUpdateRemark"));
-        int i = tmstruckLoadResultMapper.insertSelective(tmstruckLoadResult);
-
-        //修改订单状态为执行中 1
-        int i1 = utilsService.updateOrderStatus(map, 1);
-
-        //修改运力状态为执行中 1
-//        int i2 = utilsService.updateCapacityStatus(map, 1);
-
-        Object portId = map.get("portId");
+        Object portId = map.get("portId"); //获取港口
         if(portId != null){
             BigDecimal batchId = tmstruckLoadResultMapper.getBatchIdByOrderId(DataChange.dataToBigDecimal(map.get("orderId")));
             if(batchId != null){
@@ -151,8 +143,16 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
                 hashMap.put("resultTonnage",resultMeasuredTonnage);
                 hashMap.put("isClean", resultIsclear);
                 wmshBoundFeign.addResult(hashMap);
+                tmstruckLoadResult.setLoadingId(DataChange.dataToBigDecimal(portId)); // 添加装货点为港口
             }
         }
+        int i = tmstruckLoadResultMapper.insertSelective(tmstruckLoadResult);
+
+        //修改订单状态为执行中 1
+        int i1 = utilsService.updateOrderStatus(map, 1);
+
+        //修改运力状态为执行中 1
+//        int i2 = utilsService.updateCapacityStatus(map, 1);
         return i + i1;
     }