diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/CarsLoadOrderInfoVO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/CarsLoadOrderInfoVO.java new file mode 100644 index 000000000..4dd8b1cfa --- /dev/null +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/CarsLoadOrderInfoVO.java @@ -0,0 +1,22 @@ +package com.logpm.trunkline.vo; + +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; + +@Data +public class CarsLoadOrderInfoVO implements Serializable { + + private String orderCode; + private Integer orderNum; + private Integer planNum; + private Integer loadingNum; + private Integer unloadNum; + private BigDecimal unloadIncome; + private BigDecimal orderLineCost; + private BigDecimal weight; + private BigDecimal volume; + private BigDecimal orderFreight; + +} 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 05bb2fc02..5b919baaa 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 @@ -4,13 +4,14 @@ import lombok.Data; import java.io.Serializable; import java.math.BigDecimal; +import java.util.ArrayList; import java.util.Date; +import java.util.List; @Data public class CarsLoadWaybillInfoVO implements Serializable { private String waybillNo; - private String orderCode; private Date createTime; private String destination; private String destinationWarehouseName; @@ -19,19 +20,10 @@ public class CarsLoadWaybillInfoVO implements Serializable { 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; @@ -41,6 +33,6 @@ public class CarsLoadWaybillInfoVO implements Serializable { private BigDecimal insuranceFee; private BigDecimal totalFee; - + List carsLoadOrderInfoList = new ArrayList<>(); } diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseWaybillDetailClient.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseWaybillDetailClient.java index 6e0b4cedd..5a20210ae 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseWaybillDetailClient.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseWaybillDetailClient.java @@ -50,4 +50,7 @@ public interface IWarehouseWaybillDetailClient { @GetMapping(API_PREFIX+"/findByWaybillId") List findByWaybillId(@RequestParam Long waybillId); + + @GetMapping(API_PREFIX+"/findListByWaybillNo") + List findListByWaybillNo(@RequestParam String waybillNo); } 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 389ac0447..2737cf152 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 @@ -29,4 +29,6 @@ public interface TrunklineCarsOrderMapper extends BaseMapper findUseOrderWaybilllList(@Param("loadId") Long loadId, @Param("warehouseId") Long warehouseId); List findWaybillOrderByloadId(@Param("loadId") Long loadId); + + List findCarsLoadOrderInfoList(@Param("loadId") Long loadId, @Param("waybillNo") String waybillNo); } 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 8db23b080..482cc3d3e 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 @@ -102,6 +102,47 @@ + + 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 00cf8a5db..2f1d54491 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 @@ -27,4 +27,5 @@ public interface ITrunklineCarsOrderService extends BaseService findWaybillOrderByloadId(Long loadId); + List findCarsLoadOrderInfoList(Long loadId, String waybillNo); } 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 f445b65ec..bd28890f2 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 @@ -22,10 +22,12 @@ import com.logpm.trunkline.entity.TrunklineCarsOrderEntity; import com.logpm.trunkline.mapper.TrunklineCarsLoadMapper; import com.logpm.trunkline.service.*; import com.logpm.trunkline.vo.*; +import com.logpm.warehouse.entity.WarehouseWayBillDetail; import com.logpm.warehouse.entity.WarehouseWaybillEntity; import com.logpm.warehouse.feign.IWarehouseTrayTypeClient; import com.logpm.warehouse.feign.IWarehouseUpdownTypeClient; import com.logpm.warehouse.feign.IWarehouseWaybillClient; +import com.logpm.warehouse.feign.IWarehouseWaybillDetailClient; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringEscapeUtils; @@ -68,6 +70,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl loadCarsPageList(LoadCarsDTO loadCarsDTO) { @@ -1913,9 +1916,36 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl carsLoadWaybillInfoList = trunklineCarsOrderService.findWaybillOrderByloadId(loadId); -// trunklineCarsOrderService.find + for (CarsLoadWaybillInfoVO carsLoadWaybillInfoVO : carsLoadWaybillInfoList) { + String waybillNo = carsLoadWaybillInfoVO.getWaybillNo(); + List wayBillDetails = warehouseWaybillDetailClient.findListByWaybillNo(waybillNo); + + String openPrice = null; + String productNames = null; + for (WarehouseWayBillDetail wayBillDetail : wayBillDetails) { + String productName = wayBillDetail.getProductName(); + Integer num = wayBillDetail.getNum(); + BigDecimal price = wayBillDetail.getPrice(); + if(StringUtil.isBlank(openPrice)){ + openPrice = price.toPlainString(); + }else{ + openPrice = openPrice + "," +price.toPlainString(); + } + if(StringUtil.isBlank(productNames)){ + productNames = productName+"("+num+")"; + }else{ + productNames = productNames + "," + productName+"("+num+")"; + } + } + carsLoadWaybillInfoVO.setOpenPrice(openPrice); + carsLoadWaybillInfoVO.setGoodsName(productNames); + + List carsLoadOrderInfoList = trunklineCarsOrderService.findCarsLoadOrderInfoList(loadId,waybillNo); - return null; + carsLoadWaybillInfoVO.setCarsLoadOrderInfoList(carsLoadOrderInfoList); + + } + return R.data(carsLoadWaybillInfoList); } @Override 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 9ad49145e..622cf1ffc 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 @@ -62,4 +62,9 @@ public class TrunklineCarsOrderEntityServiceImpl extends BaseServiceImpl findCarsLoadOrderInfoList(Long loadId, String waybillNo) { + return baseMapper.findCarsLoadOrderInfoList(loadId,waybillNo); + } + } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseWaybillDetailClient.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseWaybillDetailClient.java index be66f98f0..0fd9395ce 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseWaybillDetailClient.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseWaybillDetailClient.java @@ -24,4 +24,9 @@ public class WarehouseWaybillDetailClient implements IWarehouseWaybillDetailClie public List findByWaybillId(Long waybillId) { return warehouseWayBillDetailService.findByWaybillId(waybillId); } + + @Override + public List findListByWaybillNo(String waybillNo) { + return warehouseWayBillDetailService.findListByWaybillNo(waybillNo); + } } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseWayBillDetailService.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseWayBillDetailService.java index 0c0369eb8..c370e9c20 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseWayBillDetailService.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseWayBillDetailService.java @@ -16,4 +16,6 @@ public interface IWarehouseWayBillDetailService { WarehouseWayBillDetail findByWaybillIdAndGoodsName(Long waybillId, String goodsName); void addList(List ls); + + List findListByWaybillNo(String waybillNo); } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWayBillDetailServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWayBillDetailServiceImpl.java index 736a61d09..be64c0797 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWayBillDetailServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWayBillDetailServiceImpl.java @@ -52,4 +52,11 @@ public class WarehouseWayBillDetailServiceImpl implements IWarehouseWayBillDetai save(warehouseWayBillDetail); } } + + @Override + public List findListByWaybillNo(String waybillNo) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("waybill_no",waybillNo); + return warehouseWayBillDetailMapper.selectList(queryWrapper); + } }