655称重过磅轨迹日志记录优化

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/handler/ComeIntoHandler.java

@@ -479,12 +479,12 @@ public class ComeIntoHandler extends AbstractWaybillOrderHandler<WaybillOrderCme
      */
     @Override
     protected void createNodeTrace(WaybillOrderCmeIntoWeighParam param, KwtWaybillOrder waybillOrder) {
-        List<KwtWaybillOrderWeighbridge> weighbridges = waybillOrderWeighbridgeRepository
-                .queryWaybillOrderWeighbridgeByWOrderId(waybillOrder.getId(), WeighbridgeTypeEnum.LOADING.getCode());
-        if (CollectionUtils.isEmpty(weighbridges)) {
+        if (waybillOrder.getIsExistWeighbridges()) {
             // 首次过磅
             createArrivedAndFirstWeighNodes(param, waybillOrder);
         } else {
+            List<KwtWaybillOrderWeighbridge> weighbridges = waybillOrderWeighbridgeRepository
+                    .queryWaybillOrderWeighbridgeByWOrderId(waybillOrder.getId(), WeighbridgeTypeEnum.LOADING.getCode());
             // 后续过磅
             createMultipleWeighNode(param, waybillOrder, weighbridges);
         }
@@ -522,7 +522,7 @@ public class ComeIntoHandler extends AbstractWaybillOrderHandler<WaybillOrderCme
     private void createMultipleWeighNode(WaybillOrderCmeIntoWeighParam param, KwtWaybillOrder waybillOrder, List<KwtWaybillOrderWeighbridge> weighbridges) {
         KwtWaybillOrderNode node = getWaybillOrderNode(param, waybillOrder);
         //过磅次数
-        int size = weighbridges.size() + 1;
+        int size = weighbridges.size();
         String grossAmount = getWeighAmount(param);
         node.setRemark("第" + size + "次称重，[" + param.getWeighbridgeName() +  "]称重["  + grossAmount + "吨]");
         waybillOrderNodeRepository.save(node);