Sfoglia il codice sorgente

430版本删除卸货过磅逻辑

donglang 1 mese fa
parent
commit
f4a2fd4119

+ 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();
-    }
 
     /**
      * 卸货

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

@@ -1,78 +0,0 @@
-package com.sckw.transport.handler;
-
-
-import com.sckw.core.common.enums.enums.ErrorCodeEnum;
-import com.sckw.core.exception.BusinessPlatfromException;
-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.WaybillOrderUnloadingWeighParam;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-import java.util.Objects;
-
-/**
- * Author: donglang
- * Time: 2026-01-20
- * Des: 卸货过磅
- * Version: 1.0
- */
-
-@Slf4j
-@Service
-public class UnloadingWeighHandler extends AbstractWaybillOrderHandler<WaybillOrderUnloadingWeighParam> {
-
-    @Override
-    protected KwtWaybillOrder getWaybillOrder(WaybillOrderUnloadingWeighParam param) {
-        return getWaybillOrder(param.getWaybillOrderId());
-    }
-
-    @Override
-    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(WaybillOrderUnloadingWeighParam param, KwtWaybillOrder waybillOrder) {
-        KwtWaybillOrderTicket takeTicket = waybillOrderTicketRepository.queryByWOrderIdByIdAndType(param.getWaybillOrderId(), 2);
-        if (takeTicket == null) {
-            throw new BusinessPlatfromException(ErrorCodeEnum.WAYBILL_ORDER_TICKET_NOT_FOUND, "当前物流运单卸货单信息不存在,无法记录毛重!");
-        }
-        //填充卸货单毛重
-        takeTicket.setGrossAmount(param.getGrossAmount());
-        waybillOrderTicketRepository.updateById(takeTicket);
-
-    }
-
-    @Override
-    protected void calculateAutoDispatchScore(WaybillOrderUnloadingWeighParam param, KwtWaybillOrder waybillOrder) {
-
-    }
-
-    @Override
-    protected String getProcessName() {
-        return "离场过磅";
-    }
-
-    @Override
-    protected void getStatus(KwtWaybillOrder waybillOrder) {
-        // 1. 修改运单状态
-        waybillOrder.setStatus(CarWaybillV1Enum.INTO_UNLOADING.getCode());
-        waybillOrderRepository.updateById(waybillOrder);
-
-        // 2. 修改子运单状态
-        KwtWaybillOrderSubtask waybillSubtask = getWaybillSubtask(waybillOrder.getId());
-        waybillSubtask.setStatus(CarWaybillV1Enum.INTO_UNLOADING.getCode());
-        waybillOrderSubtaskRepository.updateById(waybillSubtask);
-    }
-
-
-    @Override
-    protected String getRemark(WaybillOrderUnloadingWeighParam param, KwtWaybillOrder waybillOrder) {
-        return "车辆[" + waybillOrder.getTruckNo() + "]已到达卸货点["  + param.getWeighbridgeName() + "]称重[" + param.getGrossAmount() + "吨]";
-    }
-}

+ 0 - 30
sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/param/WaybillOrderUnloadingWeighParam.java

@@ -1,30 +0,0 @@
-package com.sckw.transport.model.param;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-import lombok.Data;
-
-import java.io.Serial;
-import java.io.Serializable;
-import java.math.BigDecimal;
-
-/**
- * @author :donglang
- * @version :1.0
- * @description : 车辆卸货入场过磅入参信息
- * @create :2025-11-13 08:59:00
- */
-@Data
-public class WaybillOrderUnloadingWeighParam extends WaybillOrderProcessParam implements Serializable {
-
-    @Serial
-    private static final long serialVersionUID = 6321184385988633871L;
-
-    /**
-     * 毛重
-     */
-    @Schema(description = "毛重")
-    @NotNull(message = "毛重不能为空")
-    private BigDecimal grossAmount;
-
-}

+ 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 KwtWaybillOrderV1Service waybillOrderV1Service;
@@ -1244,15 +1243,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