From 0d800967413c970095463e2ccc88ba909da40827 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Tue, 7 May 2024 14:58:32 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E8=BF=94=E5=9B=9E=E5=8C=85=E4=BB=B6ID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logpm/distribution/mapper/DistributionSignforMapper.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml index 77aca1984..258cb7054 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml @@ -1032,7 +1032,8 @@ ldpl.order_package_stockup_status AS orderPackageStockupStatus, ldpl.order_package_reservation_status AS orderPackageReservationStatus, ldpl.order_package_loading_status AS orderPackageLoadingStatus, - ldpl.material_name AS materialName + ldpl.material_name AS materialName, + ldpl.id AS packageId FROM logpm_distribution_loadscan_abnormal AS ldla LEFT JOIN logpm_distribution_loadscan AS ldl ON ldla.package_id = ldl.package_id From 94bd62a4f09a96e3862e6f0841ff3272d1819380 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Tue, 7 May 2024 17:10:19 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E9=85=8D=E9=80=81=E5=AF=BC=E5=87=BABUG?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/DistributionDeliveryListMapper.xml | 2 +- .../impl/DistributionDeliveryListServiceImpl.java | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml index 4918a1739..b3937b3cb 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml @@ -372,7 +372,7 @@ LEFT JOIN logpm_distribution_delivery_tripartite AS lddt ON ldds.delivery_id = lddl.id AND lddt.is_deleted = 0 lddl.is_deleted = 0 - + AND lddl.id in #{item} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java index 7038e1b2b..a7a4ca4ad 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java @@ -264,7 +264,11 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl deliveryId = Func.toLongList((String) distributionDeliveryList.get("ids")); - distributionDeliveryList.put("ids",deliveryId); + if (!deliveryId.isEmpty()){ + distributionDeliveryList.put("ids",deliveryId); + } + }else { + distributionDeliveryList.remove("ids"); } BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); if (Func.isEmpty(myCurrentWarehouse)){ @@ -296,8 +300,10 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl Date: Tue, 7 May 2024 18:12:33 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=93=81=E5=BA=93?= =?UTF-8?q?=E4=BD=8D=E4=BF=A1=E6=81=AF=E5=B1=95=E7=A4=BA=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logpm/distribution/mapper/DistributionStockListMapper.xml | 2 ++ .../logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml index b5df4d2ba..e5187fbaf 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml @@ -387,6 +387,7 @@ LEFT JOIN logpm_warehouse_updown_goods lwug on ldsi.material_id = lwug.association_id and ldsi.incoming_batch = lwug.incoming_batch and ldsi.market_id = lwug.market_id and lwug.association_type = '4' and lwug.warehouse_id = ldsi.warehouse_id + lwug.id is not null and ldsi.material_id = #{param.materialId} and ldsi.market_id = #{param.marketId} and ldsi.warehouse_id = #{param.warehouseId} @@ -414,6 +415,7 @@ AND ldsi.market_id = ldsli.market_id and ldsli.incoming_batch = ldsi.incoming_batch LEFT JOIN logpm_warehouse_updown_goods lwug ON ldsli.parcel_list_id = lwug.association_id and lwug.association_type = '3' + lwug.id is not null and ldsi.id = #{param.id} group by lwug.allocation_id diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml index dbf42eb3a..4a693961a 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml @@ -89,7 +89,7 @@ and dsa.consignee_unit like concat('%',#{param.consigneeUnit},'%') - and dsa.customer_name like + and dbl.customer_name like concat('%',#{param.customerName},'%') and dsa.customer_telephone like From 510605168439e08fc74b397ef5031abb2a115d4b Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Tue, 7 May 2024 20:25:06 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E5=9C=A8=E5=BA=93=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=AF=BC=E5=87=BABUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/DistributionReservationMapper.xml | 3 +- .../DistributionStockArticleMapper.java | 2 +- .../mapper/DistributionStockArticleMapper.xml | 48 ++++++++++--------- .../mapper/DistrilbutionBillStockMapper.xml | 2 +- .../DistributionStockArticleServiceImpl.java | 19 ++++++-- 5 files changed, 44 insertions(+), 30 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml index d328268e0..bf4d52f2a 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml @@ -1821,7 +1821,8 @@ ldrzp.reservation_id = #{param.reservationId} AND ldrzp.zero_package_status in ('1','3') - + GROUP BY + ldrzp.parcel_list_id diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.xml index d3839e21f..712d37788 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.xml @@ -150,7 +150,7 @@ from logpm_distribution_parcel_list ldpl LEFT JOIN logpm_warehouse_updown_goods lwug on lwug.association_id = ldpl.id and lwug.association_type = '3' where ldpl.stock_article_id = ldbs.stock_article_id) goodsAllocation, - ldsa.service_number serviceNumber,ldsa.waybill_number waybillNumber,ldsa.train_number trainNumber,ldsa.send_warehouse_name sendWarehouseName + ldsa.service_number serviceNumber,ldsa.waybill_number waybillNumber,ldsa.train_number trainNumber,ldsa.send_warehouse_name sendWarehouseName, GROUP_CONCAT(DISTINCT ldbls.scan_user) AS scanUser ,MAX(ldbls.create_time) AS signingTime from logpm_distrilbution_bill_lading AS ldbl diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java index 02c38752e..03d80f041 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java @@ -165,20 +165,29 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl warehouseList = warehouseClient.getMyWarehouseList(); + if (!warehouseList.isEmpty()){ + List warehouseListIds = warehouseList.stream().map(BasicdataWarehouseEntity::getId).collect(Collectors.toList()); + paramMap.put("warehouseIds", warehouseListIds); + } + }else { + paramMap.put("warehouseId", myCurrentWarehouse.getId()); } // 用户勾选数据的ids Object ids = paramMap.get("ids"); - List idArr = null; + List idArr = null; if (null != ids && !"".equals(ids.toString())) { - idArr = Arrays.asList(paramMap.get("ids").toString().split(",")); +// idArr = Arrays.asList(paramMap.get("ids").toString().split(",")); + idArr = Func.toLongList((String) paramMap.get("ids")); + } String tenantId = AuthUtil.getTenantId(); - paramMap.put("warehouseId", myCurrentWarehouse.getId()); paramMap.put("tenantId", tenantId); + paramMap.put("orderIds", idArr); - List list = baseMapper.exportDistributionStockArticle(paramMap, idArr); + List list = baseMapper.exportDistributionStockArticle(paramMap); List excelList = new ArrayList<>(); // list.forEach(li -> { From f86dea478196d2b0cf1e42a012d075f3b67d9204 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Wed, 8 May 2024 01:50:14 +0800 Subject: [PATCH 5/9] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0=E4=BB=93=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../springblade/common/constant/OldSystemDataPushConfig.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java b/blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java index f9780a1df..48d4d5077 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java @@ -78,6 +78,11 @@ public class OldSystemDataPushConfig { // 攀枝花 warehourseIds.add("32"); + // 万州仓 + warehourseIds.add("50"); + + //广元仓 + warehourseIds.add("40"); } From bdc4523b2a8751969f2c09d82088d0a80279408d Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Wed, 8 May 2024 11:10:53 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E5=8F=B8=E6=9C=BA=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=AF=B9=E9=A2=84=E7=BA=A6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=AE=8C=E7=BB=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DistributionSignforServiceImpl.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java index be6d48f19..52cc51a4e 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java @@ -5672,6 +5672,11 @@ public class DistributionSignforServiceImpl extends BaseServiceImplupdate().lambda() + .eq(DistributionSignforEntity::getReservationId, distributionSignfor.getReservationId()) + .set(DistributionSignforEntity::getDriverSigning, "2") + .set(!Objects.isNull(distributionSignfor.getDriverRemarks()),DistributionSignforEntity::getDriverRemarks, "2") + ); } return false; From 29a90e7a5d28b8daa9b8d08e381bff17f4edbba2 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Wed, 8 May 2024 14:04:46 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E9=85=8D=E9=80=81=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E5=8C=85=E4=BB=B6=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E8=BD=A6?= =?UTF-8?q?=E6=AC=A1=E5=8F=B7=E3=80=81=E9=A2=84=E7=BA=A6=E5=8D=95=E5=8F=B7?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vo/DistributionParcelListVO.java | 5 +++ .../vo/DistributionStockArticleVO.java | 5 +++ .../DistributionDeliveryPackageExcel.java | 14 +++++++++ .../mapper/DistributionReservationMapper.java | 4 +-- .../mapper/DistributionReservationMapper.xml | 1 + .../DistributionDeliveryListServiceImpl.java | 31 +++++++++++++++++++ 6 files changed, 58 insertions(+), 2 deletions(-) diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListVO.java index 40f944836..f81731ed7 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListVO.java @@ -134,6 +134,11 @@ public class DistributionParcelListVO extends DistributionParcelListEntity { * 签收数量 */ private String loadingTime; + + /** + * 配送车次号 + */ + private String deliveryTrainNumber; /** * 实际装车人 */ diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockArticleVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockArticleVO.java index 5b37b61c9..aebfc01c2 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockArticleVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockArticleVO.java @@ -170,6 +170,11 @@ public class DistributionStockArticleVO extends DistributionStockArticleEntity { */ private String isZeroString; + /** + * 是否零担显示 + */ + private String reservationCode; + private Integer unreceivedQuantity; diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionDeliveryPackageExcel.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionDeliveryPackageExcel.java index 9eeaa1d32..1d80793c7 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionDeliveryPackageExcel.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionDeliveryPackageExcel.java @@ -39,6 +39,20 @@ public class DistributionDeliveryPackageExcel implements Serializable { private static final long serialVersionUID = 1L; + /** + * 租户号 + */ + @ColumnWidth(20) + @ExcelProperty("配送车次号") + private String deliveryTrainNumber; + + /** + * 租户号 + */ + @ColumnWidth(20) + @ExcelProperty("预约单号") + private String reservationCode; + /** * 租户号 */ diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java index 144a2f312..a1f3f5734 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java @@ -241,10 +241,10 @@ public interface DistributionReservationMapper extends BaseMapper selectOrderInfoByReservationId(Long parseLong); + List selectOrderInfoByReservationId(@Param("reservationId") Long reservationId); /** * 查询预约零担订单详情 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml index bf4d52f2a..90c473006 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml @@ -1242,6 +1242,7 @@ ldrs.is_have_data, ldsa.id AS id, ldsa.waybill_number AS waybillNumber, + lds.reservation_code AS reservationCode, ldrs.is_zero FROM logpm_distribution_reservation AS lds diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java index a7a4ca4ad..d2b8b47c8 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java @@ -4354,6 +4354,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl parcelNumberVOS = baseMapper.getZeroPackageListByDeliveryId(distributionDeliveryInfoDTO.getDeliveryId()); List deliveryStockArticleInfo = baseMapper.getDeliveryStockArticleInfo(deliveryId); @@ -4376,6 +4377,16 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl distributionParcelListVOS = new ArrayList<>(); if (Func.isNotEmpty(reservationStockarticleEntityList)) { List orderIds = reservationStockarticleEntityList.stream().filter(order -> order.getIsZero().equals(IsOrNoConstant.no.getValue())).map(DistributionReservationStockarticleEntity::getStockArticleId).collect(Collectors.toList()); + List reservationId = reservationStockarticleEntityList.stream().map(DistributionReservationStockarticleEntity::getReservationId).collect(Collectors.toList()); + Map map = new HashMap<>(); + if (!reservationId.isEmpty()) { + for (Long l : reservationId) { + List distributionStockArticleVOS = distributionReservationMapper.selectOrderInfoByReservationId(l); + distributionStockArticleVOS.forEach(s->{ + map.put(s.getId(),s.getReservationCode()); + }); + } + } if (Func.isNotEmpty(orderIds)) { //查询该客户的非零但订单包间 IPage parcelListEntityList = distributionReservationMapper.getReservationPackage(page, orderIds, distributionDeliveryInfoDTO); @@ -4385,6 +4396,10 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl parcelListVOList = DistributionParcelListWrapper.build().listVO(parcelListEntityList.getRecords()); for (DistributionParcelListVO distributionParcelListVO : parcelListVOList) { // log.info(">>>>>> distributionParcelListVO {}", distributionParcelListVO); + distributionParcelListVO.setDeliveryTrainNumber(deliveryListEntity.getTrainNumber()); + if (!map.isEmpty()){ + distributionParcelListVO.setReservationCode(map.get(distributionParcelListVO.getStockArticleId())); + } if (Func.isNotEmpty(loadingDataMap)) { DistributionLoadscanEntity loadscanEntity = loadingDataMap.get(distributionParcelListVO.getId()); // log.info(">>>>>> loadscanEntity {}", loadscanEntity); @@ -4608,6 +4623,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl parcelNumberVOS = baseMapper.getZeroPackageListByDeliveryId(distributionDeliveryInfoDTO.getDeliveryId()); + DistributionDeliveryListEntity deliveryListEntity = this.getById(deliveryId); + List deliveryStockArticleInfo = baseMapper.getDeliveryStockArticleInfo(deliveryId); if (Func.isEmpty(deliveryStockArticleInfo)) { log.error("配送任务订单查询异常:{}", deliveryStockArticleInfo); @@ -4628,6 +4645,16 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl distributionParcelListVOS = new ArrayList<>(); if (Func.isNotEmpty(reservationStockarticleEntityList)) { List orderIds = reservationStockarticleEntityList.stream().filter(order -> order.getIsZero().equals(IsOrNoConstant.no.getValue())).map(DistributionReservationStockarticleEntity::getStockArticleId).collect(Collectors.toList()); + List reservationId = reservationStockarticleEntityList.stream().map(DistributionReservationStockarticleEntity::getReservationId).collect(Collectors.toList()); + Map map = new HashMap<>(); + if (!reservationId.isEmpty()) { + for (Long l : reservationId) { + List distributionStockArticleVOS = distributionReservationMapper.selectOrderInfoByReservationId(l); + distributionStockArticleVOS.forEach(s->{ + map.put(s.getId(),s.getReservationCode()); + }); + } + } if (Func.isNotEmpty(orderIds)) { //查询该客户的非零但订单包间 List parcelListEntityList = distributionReservationMapper.getReservationPackageByDeliveryId(orderIds, deliveryId); @@ -4637,6 +4664,10 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl parcelListVOList = DistributionParcelListWrapper.build().listVO(parcelListEntityList); for (DistributionParcelListVO distributionParcelListVO : parcelListVOList) { log.info(">>>>>> distributionParcelListVO {}", distributionParcelListVO); + distributionParcelListVO.setDeliveryTrainNumber(deliveryListEntity.getTrainNumber()); + if (!map.isEmpty()){ + distributionParcelListVO.setReservationCode(map.get(distributionParcelListVO.getStockArticleId())); + } if (Func.isNotEmpty(loadingDataMap)) { DistributionLoadscanEntity loadscanEntity = loadingDataMap.get(distributionParcelListVO.getId()); log.info(">>>>>> loadscanEntity {}", loadscanEntity); From 47b1f2269382362de7dd31ee3db4c2c3e52253ea Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Wed, 8 May 2024 14:28:02 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E8=A3=85=E8=BD=A6=E6=89=AB=E6=8F=8F?= =?UTF-8?q?=E4=B8=8B=E6=9E=B6=E8=A7=A3=E6=89=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DistributionDeliveryListServiceImpl.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java index d2b8b47c8..426830bd0 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java @@ -710,7 +710,11 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl info = new HashMap<>(); + info.put("orderPackageCode",parcelListEntity.getOrderPackageCode()); + info.put("warehouseId",myCurrentWarehouse.getId()); + warehouseUpdownTypeClient.downDeliveryPackage(info); Map map = new HashMap(); String distrilbutionloadingscanDTOJson = JSONObject.toJSONString(distrilbutionloadingscanDTO); @@ -736,6 +740,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl Date: Wed, 8 May 2024 14:56:11 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E5=8C=85=E4=BB=B6=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E5=AF=BC=E5=87=BABUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distribution/mapper/DistributionParcelListMapper.xml | 6 ++++++ .../service/impl/DistributionParcelListServiceImpl.java | 9 +++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml index cb71fa228..2ffd15749 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml @@ -929,6 +929,12 @@ and ldpl.warehouse_id = #{paramMap.warehouseId} + + and ldpl.warehouse_id IN + + #{wItem} + + and ldpl.tenant_id = #{paramMap.tenantId} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java index 7501fa694..f7030cece 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java @@ -677,7 +677,13 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl warehouseList = warehouseClient.getMyWarehouseList(); + if (!warehouseList.isEmpty()) { + List warehouseIds = warehouseList.stream().map(BasicdataWarehouseEntity::getId).collect(Collectors.toList()); + paramMap.put("warehouseIds", warehouseIds); + } + }else { + paramMap.put("warehouseId", myCurrentWarehouse.getId()); } // 用户勾选数据的ids Object ids = paramMap.get("ids"); @@ -687,7 +693,6 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl list = baseMapper.exportDistributionParcelList(paramMap, idArr);