Просмотр исходного кода

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

# Conflicts:
#	sckw-modules/sckw-transport/src/main/java/com/sckw/transport/handler/UnloadingWeighHandler.java
#	sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/param/WaybillOrderUnloadingWeighParam.java
donglang 1 месяц назад
Родитель
Сommit
e0b1e85674

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

@@ -376,18 +376,6 @@ public class AppWayBillController {
         return BaseResult.success("打印中!");
     }
 
-    /**
-     * 卸货过磅
-     *
-     * @param param
-     * @return
-     */
-    @Operation(summary = "卸货过磅", description = "卸货过磅")
-    @PostMapping("/unloadingWeigh")
-    public BaseResult unloadingWeigh(@RequestBody @Valid WaybillOrderUnloadingWeighParam param){
-        waybillOrderService.unloadingWeigh(param);
-        return BaseResult.success();
-    }
 
     /**
      * 卸货离场

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

@@ -94,7 +94,6 @@ public class WaybillOrderService {
     private final ReplenishHandler replenishHandler;
     private final LiftRodReleaseHandler liftRodReleaseHandler;
 
-    private final UnloadingWeighHandler unloadingWeighHandler;
     private final UnloadingHandler unloadingHandler;
     private final UnloadingLeavedHandler unloadingLeavedHandler;
 
@@ -1245,15 +1244,7 @@ public class WaybillOrderService {
         log.info("运单状态统计,参数:{}", JSON.toJSONString(param));
     }
 
-    /**
-     * 卸货过磅
-     * @param param
-     */
-    @Transactional(rollbackFor = Exception.class)
-    public void unloadingWeigh(WaybillOrderUnloadingWeighParam param) {
-        unloadingWeighHandler.handler(param);
-    }
-
+    
     /**
      * 卸货离场
      * @param param