Merge remote-tracking branch 'origin/dev_20260131' into dev_20260131_youshen430

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/controller/enterpriseApp/AppWayBillController.java

@@ -377,15 +377,15 @@ public class AppWayBillController {
     }
 
     /**
-     * 卸货入场
+     * 卸货过磅
      *
      * @param param
      * @return
      */
-    @Operation(summary = "卸货入场", description = "卸货入场")
-    @PostMapping("/unloadingInto")
-    public BaseResult unloadingInto(@RequestBody @Valid WaybillOrderUnloadingIntoParam param){
-        waybillOrderService.unloadingInto(param);
+    @Operation(summary = "卸货过磅", description = "卸货过磅")
+    @PostMapping("/unloadingWeigh")
+    public BaseResult unloadingWeigh(@RequestBody @Valid WaybillOrderUnloadingWeighParam param){
+        waybillOrderService.unloadingWeigh(param);
         return BaseResult.success();
     }
 

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/handler/UnloadingIntoHandler.java → sckw-modules/sckw-transport/src/main/java/com/sckw/transport/handler/UnloadingWeighHandler.java

@@ -7,7 +7,7 @@ import com.sckw.core.model.enums.CarWaybillV1Enum;
 import com.sckw.transport.model.KwtWaybillOrder;
 import com.sckw.transport.model.KwtWaybillOrderSubtask;
 import com.sckw.transport.model.KwtWaybillOrderTicket;
-import com.sckw.transport.model.param.WaybillOrderUnloadingIntoParam;
+import com.sckw.transport.model.param.WaybillOrderUnloadingWeighParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
@@ -16,28 +16,28 @@ import java.util.Objects;
 /**
  * Author: donglang
  * Time: 2026-01-20
- * Des: 卸货入场（计算卸货单毛重和净重）
+ * Des: 卸货过磅
  * Version: 1.0
  */
 
 @Slf4j
 @Service
-public class UnloadingIntoHandler extends AbstractWaybillOrderHandler<WaybillOrderUnloadingIntoParam> {
+public class UnloadingWeighHandler extends AbstractWaybillOrderHandler<WaybillOrderUnloadingWeighParam> {
 
     @Override
-    protected KwtWaybillOrder getWaybillOrder(WaybillOrderUnloadingIntoParam param) {
+    protected KwtWaybillOrder getWaybillOrder(WaybillOrderUnloadingWeighParam param) {
         return getWaybillOrder(param.getWaybillOrderId());
     }
 
     @Override
-    protected void checkState(WaybillOrderUnloadingIntoParam param, KwtWaybillOrder waybillOrder) {
+    protected void checkState(WaybillOrderUnloadingWeighParam param, KwtWaybillOrder waybillOrder) {
         if (!Objects.equals(CarWaybillV1Enum.WAIT_LOADING.getCode(), waybillOrder.getStatus())) {
             throw new BusinessPlatfromException(ErrorCodeEnum.WAYBILL_ORDER_STATUS_ERROR, "运单状态不是“已离场”状态，无法推进下一节点！");
         }
     }
 
     @Override
-    protected void doBusiness(WaybillOrderUnloadingIntoParam param, KwtWaybillOrder waybillOrder) {
+    protected void doBusiness(WaybillOrderUnloadingWeighParam param, KwtWaybillOrder waybillOrder) {
         KwtWaybillOrderTicket takeTicket = waybillOrderTicketRepository.queryByWOrderIdByIdAndType(param.getWaybillOrderId(), 2);
         if (takeTicket == null) {
             throw new BusinessPlatfromException(ErrorCodeEnum.WAYBILL_ORDER_TICKET_NOT_FOUND, "当前物流运单卸货单信息不存在，无法记录毛重！");
@@ -49,7 +49,7 @@ public class UnloadingIntoHandler extends AbstractWaybillOrderHandler<WaybillOrd
     }
 
     @Override
-    protected void calculateAutoDispatchScore(WaybillOrderUnloadingIntoParam param, KwtWaybillOrder waybillOrder) {
+    protected void calculateAutoDispatchScore(WaybillOrderUnloadingWeighParam param, KwtWaybillOrder waybillOrder) {
 
     }
 
@@ -72,7 +72,7 @@ public class UnloadingIntoHandler extends AbstractWaybillOrderHandler<WaybillOrd
 
 
     @Override
-    protected String getRemark(WaybillOrderUnloadingIntoParam param, KwtWaybillOrder waybillOrder) {
+    protected String getRemark(WaybillOrderUnloadingWeighParam param, KwtWaybillOrder waybillOrder) {
         return "车辆[" + waybillOrder.getTruckNo() + "]已到达卸货点["  + param.getWeighbridgeName() + "]称重[" + param.getGrossAmount() + "吨]";
     }
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/param/WaybillOrderUnloadingIntoParam.java → sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/param/WaybillOrderUnloadingWeighParam.java

@@ -15,7 +15,7 @@ import java.math.BigDecimal;
  * @create :2025-11-13 08:59:00
  */
 @Data
-public class WaybillOrderUnloadingIntoParam extends WaybillOrderProcessParam implements Serializable {
+public class WaybillOrderUnloadingWeighParam extends WaybillOrderProcessParam implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 6321184385988633871L;

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/app/WaybillOrderService.java

@@ -94,7 +94,7 @@ public class WaybillOrderService {
     private final ReplenishHandler replenishHandler;
     private final LiftRodReleaseHandler liftRodReleaseHandler;
 
-    private final UnloadingIntoHandler unloadingIntoHandler;
+    private final UnloadingWeighHandler unloadingWeighHandler;
     private final UnloadingHandler unloadingHandler;
     private final UnloadingLeavedHandler unloadingLeavedHandler;
 
@@ -1246,12 +1246,12 @@ public class WaybillOrderService {
     }
 
     /**
-     * 卸货入场
+     * 卸货过磅
      * @param param
      */
     @Transactional(rollbackFor = Exception.class)
-    public void unloadingInto(WaybillOrderUnloadingIntoParam param) {
-        unloadingIntoHandler.handler(param);
+    public void unloadingWeigh(WaybillOrderUnloadingWeighParam param) {
+        unloadingWeighHandler.handler(param);
     }
 
     /**