过磅称重mock，皮重毛重更改为称重重量

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

@@ -46,6 +46,9 @@ public class ComeIntoHandler extends AbstractWaybillOrderHandler<WaybillOrderCme
 
     @Override
     protected void checkState(WaybillOrderCmeIntoWeighParam param, KwtWaybillOrder waybillOrder) {
+        if (param.getWeighAmount() == null) {
+            throw new BusinessPlatfromException(ErrorCodeEnum.PARAM_ERROR, "称重重量不能为空！");
+        }
     }
 
     @Override
@@ -85,16 +88,13 @@ public class ComeIntoHandler extends AbstractWaybillOrderHandler<WaybillOrderCme
         if (StringUtils.isBlank(param.getTruckNo())) {
             throw new BusinessPlatfromException(ErrorCodeEnum.PARAM_ERROR, "车牌号不能为空！");
         }
-        if (param.getTareAmount() == null) {
-            throw new BusinessPlatfromException(ErrorCodeEnum.PARAM_ERROR, "皮重不能为空！");
-        }
         // 校验运单
         if (!Objects.equals(CarWaybillV1Enum.PENDING_VEHICLE.getCode(), waybillOrder.getStatus())) {
             throw new BusinessPlatfromException(ErrorCodeEnum.WAYBILL_ORDER_STATUS_ERROR, "当前物流运单状态不是“已接单”状态，无法称重过磅！");
         }
 
         //1.填充运单装货单皮重
-        orderTicket.setTareAmount(param.getTareAmount());
+        orderTicket.setTareAmount(param.getWeighAmount());
         waybillOrderTicketRepository.updateById(orderTicket);
 
         //2.填充首次皮重
@@ -102,7 +102,7 @@ public class ComeIntoHandler extends AbstractWaybillOrderHandler<WaybillOrderCme
         if (truck != null && (truck.getTareWeight() == null || BigDecimal.ZERO.compareTo(truck.getTareWeight()) == 0)) {
             RTruckVo truckNo = new RTruckVo();
             truckNo.setId(truck.getId());
-            truckNo.setTareWeight(param.getTareAmount());
+            truckNo.setTareWeight(param.getWeighAmount());
             remoteFleetService.updateTruckTareAmount(truckNo);
         }
 
@@ -228,10 +228,6 @@ public class ComeIntoHandler extends AbstractWaybillOrderHandler<WaybillOrderCme
      * @param waybillOrder
      */
     private void laterWeighbridge(WaybillOrderCmeIntoWeighParam param, KwtWaybillOrder waybillOrder, KwtWaybillOrderTicket orderTicket) {
-        if (StringUtils.isBlank(param.getGrossAmount())) {
-            throw new BusinessPlatfromException(ErrorCodeEnum.PARAM_ERROR, "毛重不能为空！");
-        }
-
         //1.填充装货单毛重和装货净重
         BigDecimal loadAmount = updateGrossAmount(param, orderTicket);
         //2.填充运单装货净重
@@ -250,11 +246,11 @@ public class ComeIntoHandler extends AbstractWaybillOrderHandler<WaybillOrderCme
      */
     private BigDecimal updateGrossAmount(WaybillOrderCmeIntoWeighParam param, KwtWaybillOrderTicket shipmentTicket) {
         //毛重
-        shipmentTicket.setGrossAmount(param.getGrossAmount());
+        shipmentTicket.setGrossAmount(param.getWeighAmount());
         //皮重
         BigDecimal tareAmount = shipmentTicket.getTareAmount();
         //装货单装货净重
-        BigDecimal loadAmount = param.getGrossAmount().subtract(Optional.ofNullable(tareAmount).orElse(BigDecimal.ZERO));
+        BigDecimal loadAmount = param.getWeighAmount().subtract(Optional.ofNullable(tareAmount).orElse(BigDecimal.ZERO));
         shipmentTicket.setAmount(loadAmount);
         waybillOrderTicketRepository.updateById(shipmentTicket);
         return loadAmount;
@@ -272,7 +268,7 @@ public class ComeIntoHandler extends AbstractWaybillOrderHandler<WaybillOrderCme
         subtask.setLoadAmount(loadAmount);
         subtask.setLoadTime(new Date());
         waybillOrderSubtaskRepository.updateById(subtask);
-        log.info("物流运单离场过磅成功！运单ID: {}, 毛重: {}, 装货净重: {}", param.getWaybillOrderId(), param.getGrossAmount(), loadAmount);
+        log.info("物流运单离场过磅成功！运单ID: {}, 毛重: {}, 装货净重: {}", param.getWaybillOrderId(), param.getWeighAmount(), loadAmount);
     }
 
     //
@@ -325,16 +321,6 @@ public class ComeIntoHandler extends AbstractWaybillOrderHandler<WaybillOrderCme
         waybillOrder.setTargetStatus(3);
     }
 
-//    /**
-//     * 正常流程和超载流程，需校验是否已完成装载
-//     */
-//    private void checkStatus(KwtWaybillOrder waybillOrder) {
-//        if (!Objects.equals(CarWaybillV1Enum.EXIT_COMPLETED.getCode(), waybillOrder.getStatus())
-//                && !Objects.equals(CarWaybillV1Enum.REPLENISH_FINISH.getCode(), waybillOrder.getStatus())) {
-//            return;
-//        }
-//    }
-
     @Override
     protected String getProcessName() {
         return "称重过磅";
@@ -390,7 +376,7 @@ public class ComeIntoHandler extends AbstractWaybillOrderHandler<WaybillOrderCme
 
             // 第二条：称重信息
             KwtWaybillOrderNode node2 = getWaybillOrderNode(param, waybillOrder);
-            String tareAmount = Objects.isNull(param.getTareAmount()) ? "0.00" : param.getTareAmount().setScale(2, RoundingMode.HALF_UP).toPlainString();
+            String tareAmount = Objects.isNull(param.getWeighAmount()) ? "0.00" : param.getWeighAmount().setScale(2, RoundingMode.HALF_UP).toPlainString();
             node2.setRemark("[" + param.getWeighbridgeName() + "]首次称重[" + tareAmount + "吨]");
             node2.setCreateTime(fiveSecondsLater);
             waybillOrderNodeRepository.save(node2);
@@ -400,7 +386,7 @@ public class ComeIntoHandler extends AbstractWaybillOrderHandler<WaybillOrderCme
             KwtWaybillOrderNode node1 = getWaybillOrderNode(param, waybillOrder);
             //过磅次数
             int size = weighbridges.size() + 1;
-            String grossAmount = Objects.isNull(param.getGrossAmount()) ? "0.00" : param.getGrossAmount().setScale(2, RoundingMode.HALF_UP).toPlainString();
+            String grossAmount = Objects.isNull(param.getWeighAmount()) ? "0.00" : param.getWeighAmount().setScale(2, RoundingMode.HALF_UP).toPlainString();
             node1.setRemark("第" + size + "次称重，[" + param.getWeighbridgeName() +  "]称重["  + grossAmount + "吨]");
             waybillOrderNodeRepository.save(node1);
             log.info("记录【过磅称重】节点轨迹成功，节点ID：{}", node1.getId());
@@ -427,7 +413,7 @@ public class ComeIntoHandler extends AbstractWaybillOrderHandler<WaybillOrderCme
             case 1: // 空载离场
                 return "司机[" + waybillOrder.getDriverName() + "]空载待离场";
             case 2: // 正常离场
-                String grossAmount = Objects.isNull(param.getGrossAmount()) ? "0.00" : param.getGrossAmount().setScale(2, RoundingMode.HALF_UP).toPlainString();
+                String grossAmount = Objects.isNull(param.getWeighAmount()) ? "0.00" : param.getWeighAmount().setScale(2, RoundingMode.HALF_UP).toPlainString();
                 return "[" + param.getWeighbridgeName() + "]称重[" + grossAmount + "吨]";
             case 3: // 超载离场
                 return "司机[" + waybillOrder.getDriverName() + "]已超载，卸货中";

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/param/WaybillOrderCmeIntoWeighParam.java

@@ -26,16 +26,9 @@ public class WaybillOrderCmeIntoWeighParam extends WaybillOrderProcessParam impl
     private String truckNo;
 
     /**
-     * 皮重
+     * 称重重量（毛重/皮重）
      */
-    @Schema(description = "皮重")
-    private BigDecimal tareAmount;
-
-    /**
-     * 毛重
-     */
-    @Schema(description = "毛重")
-    private BigDecimal grossAmount;
-
+    @Schema(description = "称重重量")
+    private BigDecimal weighAmount;
 
 }