Browse Source

655项目存储地磅编号信息

donglang 1 week ago
parent
commit
d6e681864f

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

@@ -115,7 +115,7 @@ public class ComeIntoHandler extends AbstractWaybillOrderHandler<WaybillOrderCme
         createForkliftWaybill(waybillOrder);
 
         //5.创建过磅记录
-        createWeighbridges(waybillOrder);
+        createWeighbridges(param, waybillOrder);
     }
 
     /**
@@ -228,7 +228,7 @@ public class ComeIntoHandler extends AbstractWaybillOrderHandler<WaybillOrderCme
      * 创建过磅记录
      * @param waybillOrder
      */
-    private void createWeighbridges(KwtWaybillOrder waybillOrder) {
+    private void createWeighbridges(WaybillOrderCmeIntoWeighParam param, KwtWaybillOrder waybillOrder) {
         CompletableFuture.runAsync(() ->{
             try {
                 log.debug("开始异步保存地磅记录,运单ID:{}", waybillOrder.getId());
@@ -238,8 +238,8 @@ public class ComeIntoHandler extends AbstractWaybillOrderHandler<WaybillOrderCme
                 weighbridge.setTruckId(waybillOrder.getTruckId());
                 weighbridge.setTruckNo(waybillOrder.getTruckNo());
                 weighbridge.setType(WeighbridgeTypeEnum.LOADING.getCode());
-                weighbridge.setWeighbridgeId(10001l);
-                weighbridge.setWeight(BigDecimal.ZERO);
+                weighbridge.setWeighbridgeId(param.getWeighbridgeId());
+                weighbridge.setWeight(param.getWeighAmount());
                 weighbridge.setWeighUrl(null);
                 weighbridge.setCreateTime(new Date());
                 weighbridge.setCreateUser(waybillOrder.getDriverId());
@@ -270,7 +270,7 @@ public class ComeIntoHandler extends AbstractWaybillOrderHandler<WaybillOrderCme
         //3.判断流程
         checkProcess(param, waybillOrder, loadAmount);
         //4.创建过磅记录
-        createWeighbridges(waybillOrder);
+        createWeighbridges(param, waybillOrder);
 
     }
 

+ 5 - 5
sckw-modules/sckw-transport/src/main/java/com/sckw/transport/handler/UnloadingWeighHandler.java

@@ -93,7 +93,7 @@ public class UnloadingWeighHandler extends AbstractWaybillOrderHandler<WaybillOr
         updateGatekeeperOrderStatus(waybillOrder);
 
         // 3.创建卸货过磅记录
-        createWeighbridges(waybillOrder);
+        createWeighbridges(param, waybillOrder);
     }
 
     /**
@@ -130,7 +130,7 @@ public class UnloadingWeighHandler extends AbstractWaybillOrderHandler<WaybillOr
      * 创建卸货过磅记录
      * @param waybillOrder
      */
-    private void createWeighbridges(KwtWaybillOrder waybillOrder) {
+    private void createWeighbridges(WaybillOrderUnloadingWeighParam param,KwtWaybillOrder waybillOrder) {
         CompletableFuture.runAsync(() ->{
             try {
                 log.debug("开始异步保存地磅记录,运单ID:{}", waybillOrder.getId());
@@ -140,8 +140,8 @@ public class UnloadingWeighHandler extends AbstractWaybillOrderHandler<WaybillOr
                 weighbridge.setTruckId(waybillOrder.getTruckId());
                 weighbridge.setTruckNo(waybillOrder.getTruckNo());
                 weighbridge.setType(WeighbridgeTypeEnum.UNLOADING.getCode());
-                weighbridge.setWeighbridgeId(10001l);
-                weighbridge.setWeight(BigDecimal.ZERO);
+                weighbridge.setWeighbridgeId(param.getWeighbridgeId());
+                weighbridge.setWeight(param.getWeighAmount());
                 weighbridge.setWeighUrl(null);
                 weighbridge.setCreateTime(new Date());
                 weighbridge.setCreateUser(waybillOrder.getDriverId());
@@ -169,7 +169,7 @@ public class UnloadingWeighHandler extends AbstractWaybillOrderHandler<WaybillOr
         updateTareAmount(param, waybillOrder, takeTicket);
 
         // 2.创建卸货过磅记录
-        createWeighbridges(waybillOrder);
+        createWeighbridges(param, waybillOrder);
     }
 
     /**