From 4e66a7e6a3ac952d749b57d64c638dc682effedb Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Tue, 15 Oct 2024 19:11:41 +0800 Subject: [PATCH 1/2] =?UTF-8?q?1.=E6=96=B0=E5=BC=80=E5=85=B4=E4=B9=89?= =?UTF-8?q?=E4=BB=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../springblade/common/constant/OldSystemDataPushConfig.java | 3 +++ 1 file changed, 3 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 4826d53a1..bbc3dad1c 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 @@ -93,6 +93,9 @@ public class OldSystemDataPushConfig { //茂名仓 warehourseIds.add("152"); + + //兴义仓 + warehourseIds.add("155"); } From 7ff54b9488dbc4428dddbdbca930882686812d15 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Tue, 15 Oct 2024 20:16:42 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix=EF=BC=9A=E5=88=A0=E9=99=A4=E5=A4=87?= =?UTF-8?q?=E8=B4=A7=E5=88=97=E8=A1=A8=E7=9A=84=E8=B4=A7=E7=89=A9=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=92=8C=E6=89=98=E7=9B=98=E4=BF=A1=E6=81=AF=20?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=A4=87=E8=B4=A7=E6=98=8E=E7=BB=86=E7=A7=8D?= =?UTF-8?q?=E7=9A=84=E9=A2=84=E7=BA=A6=E5=8D=95=E5=8F=B7=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E9=A2=84=E5=A4=87=E8=B4=A7=E6=98=8E=E7=BB=86=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E6=89=98=E7=9B=98=E5=92=8C=E7=BC=BA=E5=B0=91=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E5=93=81=E4=BF=A1=E6=81=AF=E7=9A=84=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vo/DistributionStockupVO.java | 4 ++ .../mapper/DistributionParcelListMapper.xml | 7 +-- .../mapper/DistributionStockupMapper.xml | 62 +++++++++++-------- .../DistributionParcelListServiceImpl.java | 4 +- .../impl/DistributionStockupServiceImpl.java | 20 +++--- 5 files changed, 56 insertions(+), 41 deletions(-) diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupVO.java index 2cdecbcf4..5fd5c89e7 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupVO.java @@ -71,6 +71,10 @@ public class DistributionStockupVO extends DistributionStockupEntity { private String orderCode; //订单自编号 private String descriptionGoods; private Integer reservationNum; //预约数量 + /** + * 预约编号 + */ + private String reservationCode; private Date stockupDate; private Integer number; private String goodsAllocation; //货位 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 6d293e3eb..42463486b 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 @@ -551,16 +551,15 @@ lds.id =#{id} --> - select DISTINCT ldsi.stockup_id , ldpl.id id,ldpl.order_package_code orderPackageCode,lds.type + select ldsi.stockup_id , ldr.reservation_code, ldpl.id id,ldpl.order_package_code orderPackageCode,lds.type stockupStatus,ldpl.firsts,ldpl.second,ldpl.third_product thirdProduct, ldpl.material_name materialName,lds.create_time stockupDate,lds.stockup_area stockupArea,ldpl.goods_allocation - goodsAllocation,lwt.pallet_name pallet + goodsAllocation,ldpl.pallet pallet from logpm_distribution_stockup_info ldsi + LEFT JOIN logpm_distribution_reservation ldr on ldr.id= ldsi.reservation_id LEFT JOIN logpm_distribution_reservation_package ldrp on ldrp.reservation_id = ldsi.reservation_id LEFT JOIN logpm_distribution_parcel_list ldpl on ldpl.id = ldrp.parce_list_id LEFT JOIN logpm_distribution_stock lds on ldpl.id = lds.parcel_list_id and lds.stockup_id = ldsi.stockup_id - LEFT JOIN logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldpl.id and lwtg.association_type = '3' - LEFT JOIN logpm_warehouse_tray lwt on lwtg.tray_id = lwt.id ldsi.stockup_id =#{id} and ldpl.order_package_code is not null and ldsi.stock_status != 4 AND ldrp.packet_bar_status != 2 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml index f176246a6..559f303e2 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml @@ -944,33 +944,43 @@