diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/CarsLoadWaybillInfoVO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/CarsLoadWaybillInfoVO.java index 0f6b96152..b4093b94a 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/CarsLoadWaybillInfoVO.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/CarsLoadWaybillInfoVO.java @@ -37,5 +37,6 @@ public class CarsLoadWaybillInfoVO implements Serializable { private Integer costNum; List carsLoadOrderInfoList = new ArrayList<>(); + List carsLoadOrderInfoListPlan = new ArrayList<>(); } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java index 690ed589d..1aa12d65c 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java @@ -17,7 +17,9 @@ import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.StringUtil; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletRequest; import java.math.BigDecimal; +import java.util.Enumeration; import java.util.List; import java.util.Objects; @@ -35,11 +37,13 @@ public class CarsLoadController { @PostMapping("/loadCarsPageList") @ApiOperationSupport(order = 1) @ApiOperation(value = "配载计划分页列表", notes = "传入loadCarsDTO") - public R loadCarsPageList(@RequestBody LoadCarsDTO loadCarsDTO) { + public R loadCarsPageList(@RequestBody LoadCarsDTO loadCarsDTO, HttpServletRequest request) { String method = "############loadCarsPageList: "; log.info(method+"请求参数{}",loadCarsDTO); try{ + Enumeration headerNames = request.getHeaderNames(); + //当前登录人选择的仓库 BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); if(!Objects.isNull(myCurrentWarehouse)){ diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsOrderMapper.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsOrderMapper.java index e864094c8..264655d8d 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsOrderMapper.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsOrderMapper.java @@ -33,6 +33,8 @@ public interface TrunklineCarsOrderMapper extends BaseMapper findCarsLoadOrderInfoList(@Param("loadId") Long loadId, @Param("waybillNo") String waybillNo); + List findCarsLoadOrderInfoListPlan(@Param("loadId") Long loadId, @Param("waybillNo") String waybillNo); + void clearFinalNodeId(@Param("loadId") Long loadId, @Param("nodeId") Long nodeId); void deleteByLoadIdAndNodeIdAndWarehouseId(@Param("loadId") Long loadId, @Param("nodeId") Long nodeId, @Param("warehouseId") Long warehouseId); diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsOrderMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsOrderMapper.xml index 3f821fe37..946a30e3c 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsOrderMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsOrderMapper.xml @@ -165,6 +165,26 @@ + + + update logpm_trunkline_cars_order set final_node_id = null diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsOrderService.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsOrderService.java index 555746965..ed3466a15 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsOrderService.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsOrderService.java @@ -30,6 +30,8 @@ public interface ITrunklineCarsOrderService extends BaseService findCarsLoadOrderInfoList(Long loadId, String waybillNo); + List findCarsLoadOrderInfoListPlan(Long loadId, String waybillNo); + void clearFinalNodeId(Long loadId, Long nodeId); void deleteByLoadIdAndNodeIdAndWarehouseId(Long loadId, Long nodeId, Long warehouseId); diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java index 54da3e175..448edf32b 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java @@ -27,7 +27,6 @@ import com.logpm.warehouse.entity.WarehouseWaybillEntity; import com.logpm.warehouse.feign.IWarehouseWaybillClient; import com.logpm.warehouse.feign.IWarehouseWaybillDetailClient; import com.logpm.warehouse.vo.WarehouseWaybillVO; -import io.seata.spring.annotation.GlobalTransactional; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.common.constant.CodeNumConstant; @@ -275,7 +274,6 @@ public class OpenOrderServiceImpl implements IOpenOrderService { return R.success("验证成功"); } - @GlobalTransactional @Transactional(rollbackFor = ServiceException.class) @Override public R openWaybill(OpenOrderDTO openOrderDTO) { diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java index 08a4a4f32..9315f6878 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java @@ -2750,7 +2750,10 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl carsLoadOrderInfoList = trunklineCarsOrderService.findCarsLoadOrderInfoList(loadId, waybillNo); + List carsLoadOrderInfoListPlan = trunklineCarsOrderService.findCarsLoadOrderInfoListPlan(loadId, waybillNo); + carsLoadWaybillInfoVO.setCarsLoadOrderInfoList(carsLoadOrderInfoList); + carsLoadWaybillInfoVO.setCarsLoadOrderInfoListPlan(carsLoadOrderInfoListPlan); TrunklineCostShareRecordEntity costShareRecordEntity = trunklineCostShareRecordService.findTotalUnloadNumByLoadAndWaybillNo(loadId, waybillNo); carsLoadWaybillInfoVO.setCostPiece(costShareRecordEntity.getCostPiece()); diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsOrderEntityServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsOrderEntityServiceImpl.java index 01bf2c223..57ea6074d 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsOrderEntityServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsOrderEntityServiceImpl.java @@ -68,6 +68,11 @@ public class TrunklineCarsOrderEntityServiceImpl extends BaseServiceImpl findCarsLoadOrderInfoListPlan(Long loadId, String waybillNo) { + return baseMapper.findCarsLoadOrderInfoList(loadId,waybillNo); + } + @Override public void clearFinalNodeId(Long loadId, Long nodeId) { baseMapper.clearFinalNodeId(loadId,nodeId);