tijia

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

@@ -208,6 +208,11 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
         //装货时查询是否含有净重
         Integer netWeight = tmstruckUnloadResultMapper.getNetWeightByTotalId(resultTotalId);
         if(orderType == 11 || orderType == 15 || orderType == 16){
+            //根据总实绩ID查询内转订单是否有装货实绩
+            BigDecimal loadResultId = tmstruckLoadResultMapper.getResultId(resultTotalId);
+            if(loadResultId != null){
+                return -5;
+            }
             int sqe = DataChange.dataToBigDecimal(mesMap.get("Sqe")).intValue();
             sqe = sqe + 1;
             map.put("resultId",tmstruckLoadResultMapper.selectMaxId());
@@ -220,10 +225,7 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
             //推送消息到websocket
             utilsService.pushMesToWebsocket(capacityNumber, "装货");
             BigDecimal orderId = DataChange.dataToBigDecimal(mesMap.get("orderId"));
-            int i1 = addCapacityRemark(map);
-            if (i1==-5){
-                return -5;
-            }
+            //int i1 = addCapacityRemark(map);
             //根据运输订单查找需求备注
             Map<String,Object>  remarkMap=tmstruckTimeTaskResultMapper.selectInwardDueTimeByOrderId(orderId);
             String remark =(String) remarkMap.get("remark");