diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java index 1baf7825b..153720380 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java @@ -8,7 +8,7 @@ public interface ModuleNameConstant { /** * 如果不需要 "" */ - public static final String DEVAUTH ="-tjj"; + public static final String DEVAUTH =""; /** * 工厂对接服务名称 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 new file mode 100644 index 000000000..05bb2fc02 --- /dev/null +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/CarsLoadWaybillInfoVO.java @@ -0,0 +1,46 @@ +package com.logpm.trunkline.vo; + +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +@Data +public class CarsLoadWaybillInfoVO implements Serializable { + + private String waybillNo; + private String orderCode; + private Date createTime; + private String destination; + private String destinationWarehouseName; + private String shipper; + private String shipperName; + private String consignee; + private String consigneeName; + private Integer waybillNum; + private Integer orderNum; + private Integer planNum; + private Integer loadingNum; + private Integer unloadNum; + private BigDecimal unloadIncome; + private BigDecimal orderLineCost; + private String openPrice; + private String goodsName; + private BigDecimal weight; + private BigDecimal volume; + private String remark; + private BigDecimal totalFreight; + private BigDecimal orderFreight; + private BigDecimal deliveryFee; + private BigDecimal pickupFee; + private BigDecimal warehouseManagementFee; + private BigDecimal storageFee; + private BigDecimal handlingFee; + private BigDecimal otherFee; + private BigDecimal insuranceFee; + private BigDecimal totalFee; + + + +} diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineCarsLoadVO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineCarsLoadVO.java index c0f457627..fe42db162 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineCarsLoadVO.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineCarsLoadVO.java @@ -43,4 +43,7 @@ public class TrunklineCarsLoadVO extends TrunklineCarsLoadEntity { private List zeroList = new ArrayList<>(); private List exceptionList = new ArrayList<>(); + + private List carsLoadWaybillInfoList = new ArrayList<>(); + } 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 3677bfbbf..389ac0447 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 @@ -27,4 +27,6 @@ public interface TrunklineCarsOrderMapper extends BaseMapper findUseOrderWaybilllList(@Param("loadId") Long loadId, @Param("warehouseId") Long warehouseId); + + List findWaybillOrderByloadId(@Param("loadId") Long loadId); } 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 b954f22a5..8db23b080 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 @@ -101,4 +101,8 @@ and node_id = #{warehouseId} + + 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 baa161399..00cf8a5db 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 @@ -24,4 +24,7 @@ public interface ITrunklineCarsOrderService extends BaseService findLoadScanPackageWithOrder(Long loadId, Long warehouseId); List findUseOrderWaybilllList(Long loadId, Long warehouseId); + + List findWaybillOrderByloadId(Long loadId); + } 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 c7ea61102..f445b65ec 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 @@ -1912,6 +1912,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl carsLoadWaybillInfoList = trunklineCarsOrderService.findWaybillOrderByloadId(loadId); // trunklineCarsOrderService.find return null; 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 b6b14aac9..9ad49145e 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 @@ -57,4 +57,9 @@ public class TrunklineCarsOrderEntityServiceImpl extends BaseServiceImpl findWaybillOrderByloadId(Long loadId) { + return baseMapper.findWaybillOrderByloadId(loadId); + } + }