From 9b57e30c7eb28af55a316422beeb7ef7ba25c43a Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Sun, 7 Apr 2024 13:43:14 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=87=AA=E6=8F=90=E5=8C=85=E4=BB=B6?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E7=AD=BE=E6=94=B6=E6=8E=A5=E5=8F=A3=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/DistributionParcelListMapper.java | 20 +++++ .../mapper/DistributionParcelListMapper.xml | 83 ++++++++++++++++++- .../DistributionParcelListServiceImpl.java | 26 +++++- .../DistrilbutionBillLadingServiceImpl.java | 6 +- 4 files changed, 129 insertions(+), 6 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.java index 83dd8f774..7680cc9bc 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.java @@ -229,4 +229,24 @@ public interface DistributionParcelListMapper extends BaseMapper selectPackagePlanBillLading(@Param("orderPackageCode")String orderPackageCode,@Param("warehouseId") Long warehouseId); + + + /** + * 查询自提签收扫描记录 + * @param orderPackageCode + * @param id + * @return + */ + List selectPackageSignForlBillLading(@Param("orderPackageCode")String orderPackageCode,@Param("warehouseId") Long warehouseId); + + + List selectPackageCancelBillLading(@Param("orderPackageCode")String orderPackageCode,@Param("warehouseId") Long warehouseId); } 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 304368e29..74d3f9716 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 @@ -1300,6 +1300,85 @@ and ldpl.waybill_number is not null and ldpl.waybill_number != '' - - + + + 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 cf01390c8..f3b6496df 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 @@ -76,6 +76,7 @@ import org.springblade.core.tool.utils.BeanUtil; import org.springblade.core.tool.utils.Func; import org.springblade.core.tool.utils.ObjectUtil; import org.springblade.system.cache.DictBizCache; +import org.springblade.system.entity.User; import org.springblade.system.feign.IUserClient; import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.beans.BeanUtils; @@ -1024,7 +1025,7 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl planBillLadingPackage =baseMapper.selectPackagePlanBillLading(parcelListEntity.getOrderPackageCode(), myCurrentWarehouse.getId()); + if (Func.isNotEmpty(planBillLadingPackage)){ + parcelListNodeVOS.addAll(planBillLadingPackage); + } + //查询自提取消 + List cancelBillLadingPackage =baseMapper.selectPackageCancelBillLading(parcelListEntity.getOrderPackageCode(), myCurrentWarehouse.getId()); + if (Func.isNotEmpty(cancelBillLadingPackage)){ + cancelBillLadingPackage.forEach(s->{ + R userR = userClient.userInfoById(s.getNodeControlsUserId()); + s.setNodeControlsUserName(userR.getData().getName()); + }); + parcelListNodeVOS.addAll(cancelBillLadingPackage); + } + //查询自提签收扫描 + List signForBillLadingPackage =baseMapper.selectPackageSignForlBillLading(parcelListEntity.getOrderPackageCode(), myCurrentWarehouse.getId()); + if (Func.isNotEmpty(signForBillLadingPackage)){ + signForBillLadingPackage.forEach(s->{ + R userR = userClient.userInfoById(s.getNodeControlsUserId()); + s.setNodeControlsUserName(userR.getData().getName()); + }); + parcelListNodeVOS.addAll(signForBillLadingPackage); + } //查询计划取消的包件 List cancelPlanDeliveryPackage = baseMapper.selectPackageCancelPlanDelivery(parcelListEntity.getOrderPackageCode(), myCurrentWarehouse.getId()); if (Func.isNotEmpty(cancelPlanDeliveryPackage)) { diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java index d12c5fcf1..6af3dd11c 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java @@ -1019,7 +1019,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl updateWrapper = new UpdateWrapper<>(); updateWrapper.lambda() .in(DistrilbutionBillPackageEntity::getBillLadingId, ids) - .set(DistrilbutionBillPackageEntity::getPacketBarStatus, "3") + .set(DistrilbutionBillPackageEntity::getPacketBarStatus, "2") ; distrilbutionBillPackageService.update(updateWrapper); @@ -1027,7 +1027,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl orderUpdateWrapper = new UpdateWrapper<>(); orderUpdateWrapper.lambda() .in(DistrilbutionBillStockEntity::getBillLadingId, ids) - .set(DistrilbutionBillStockEntity::getOrderStatus, "3") + .set(DistrilbutionBillStockEntity::getOrderStatus, "2") ; distrilbutionBillStockService.update(orderUpdateWrapper); @@ -1047,7 +1047,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl Date: Sun, 7 Apr 2024 14:02:51 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=87=AA=E6=8F=90=E5=8D=95=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2=E8=BF=99=E5=B1=95=E7=A4=BA=E8=BF=90?= =?UTF-8?q?=E5=8D=95=E6=94=B6=E8=B4=A7=E4=BA=BA=E3=80=81=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E7=94=B5=E8=AF=9D=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distribution/mapper/DistrilbutionBillLadingMapper.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 8838b6337..d5fabdffe 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 @@ -37,7 +37,7 @@ GROUP_CONCAT(DISTINCT dsa.service_number) serviceNumber, GROUP_CONCAT(DISTINCT dsa.waybill_number) waybillNumber, GROUP_CONCAT(DISTINCT dsa.consignee_unit) - consigneeUnit,GROUP_CONCAT(DISTINCT dsa.customer_name) customerName, + consigneeUnit,GROUP_CONCAT(DISTINCT dsa.consignee_person) customerName, GROUP_CONCAT(DISTINCT dsa.customer_telephone) customerTelephone,dsa.warehouse,dsa.warehouse_entry_time warehouseEntryTime,dsa.storage_fee storageFee, @@ -430,8 +430,8 @@ GROUP_CONCAT(DISTINCT ANY_VALUE(ldsa.waybill_number)) AS waybillNumber, GROUP_CONCAT(DISTINCT ANY_VALUE(ldsa.service_number)) AS serviceNumber, GROUP_CONCAT(DISTINCT ANY_VALUE(ldsa.consignee_unit)) AS consigneeUnit, - GROUP_CONCAT(DISTINCT ANY_VALUE(ldsa.customer_name)) AS customerName, - GROUP_CONCAT(DISTINCT ANY_VALUE(ldsa.customer_telephone)) AS customerTelephone + GROUP_CONCAT(DISTINCT ANY_VALUE(ldsa.consignee_person)) AS customerName, + GROUP_CONCAT(DISTINCT ANY_VALUE(ldsa.consignee_mobile)) AS customerTelephone FROM logpm_distrilbution_bill_lading ldbl LEFT JOIN logpm_distrilbution_bill_stock ldbs ON ldbl.id = ldbs.bill_lading_id LEFT JOIN logpm_distribution_stock_article ldsa ON ldbs.stock_article_id = ldsa.id From 90a4f7e0ee4beffade57e6f6a7c6c9202b38df2b Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Sun, 7 Apr 2024 14:03:40 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=87=AA=E6=8F=90=E5=8D=95=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2=E8=BF=99=E5=B1=95=E7=A4=BA=E8=BF=90?= =?UTF-8?q?=E5=8D=95=E6=94=B6=E8=B4=A7=E4=BA=BA=E3=80=81=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E7=94=B5=E8=AF=9D=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 d5fabdffe..ae1b8dd7e 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 @@ -433,7 +433,7 @@ GROUP_CONCAT(DISTINCT ANY_VALUE(ldsa.consignee_person)) AS customerName, GROUP_CONCAT(DISTINCT ANY_VALUE(ldsa.consignee_mobile)) AS customerTelephone FROM logpm_distrilbution_bill_lading ldbl - LEFT JOIN logpm_distrilbution_bill_stock ldbs ON ldbl.id = ldbs.bill_lading_id + LEFT JOIN logpm_distrilbution_bill_stock ldbs ON ldbl.id = ldbs.bill_lading_id AND order_status != '2' LEFT JOIN logpm_distribution_stock_article ldsa ON ldbs.stock_article_id = ldsa.id WHERE ldbl.id = #{id} GROUP BY ldbl.id; From 7b476f94685d5015da8d1938402bf98788fd79cb Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Sun, 7 Apr 2024 14:04:18 +0800 Subject: [PATCH 4/4] =?UTF-8?q?1.=E5=B9=B2=E7=BA=BF-=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trunkline/service/impl/TrunklineAdvanceServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java index 27d105d19..83d6942f9 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java @@ -142,7 +142,7 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl