From f98bfe026bbc7f212e2c881fafaa1aab313a1ec3 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Sat, 26 Aug 2023 08:59:41 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BB=93=E5=BA=93=E9=80=BB=E8=BE=91=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/constant/ModuleNameConstant.java | 2 +- .../warehouse/vo/WarehouseUpdownGoodsVO.java | 3 +++ .../api/WarehouseUpdownTypeApiController.java | 2 +- .../mapper/WarehouseTrayGoodsMapper.xml | 2 +- .../mapper/WarehouseUpdownGoodsMapper.xml | 3 +-- .../IWarehouseTrayGoodsLogService.java | 2 +- .../service/IWarehouseTrayGoodsService.java | 2 +- .../WarehouseTrayGoodsLogServiceImpl.java | 4 ++-- .../impl/WarehouseTrayGoodsServiceImpl.java | 2 +- .../impl/WarehouseTrayTypeServiceImpl.java | 19 +++++++++++-------- .../impl/WarehouseUpdownTypeServiceImpl.java | 13 ++++++++----- 11 files changed, 31 insertions(+), 23 deletions(-) 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 301dcc0d5..d4d3b3676 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 =""; + public static final String DEVAUTH ="-zhy"; /** * 工厂对接服务名称 diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseUpdownGoodsVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseUpdownGoodsVO.java index 85cf3460b..62d65ea8d 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseUpdownGoodsVO.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseUpdownGoodsVO.java @@ -7,4 +7,7 @@ import lombok.EqualsAndHashCode; @Data @EqualsAndHashCode(callSuper = true) public class WarehouseUpdownGoodsVO extends WarehouseUpdownGoodsEntity { + + private String orderCode; + } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseUpdownTypeApiController.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseUpdownTypeApiController.java index 8ee8a97cd..ba6ca63f6 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseUpdownTypeApiController.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseUpdownTypeApiController.java @@ -322,7 +322,7 @@ public class WarehouseUpdownTypeApiController { public R downScanPackage(@RequestBody UpdownTypeDTO updownTypeDTO ) { String method = "###########downScanPackage: "; log.info(method + "下架扫描包件码 updownTypeDTO={}", updownTypeDTO); - String orderPackageCode = updownTypeDTO.getCode(); + String orderPackageCode = updownTypeDTO.getOrderPackageCode(); try{ if(StringUtil.isBlank(orderPackageCode)){ log.warn(method+"包件码不能为空 orderPackageCode={}",orderPackageCode); diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayGoodsMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayGoodsMapper.xml index bee712957..38343c776 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayGoodsMapper.xml +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayGoodsMapper.xml @@ -251,7 +251,7 @@ FROM logpm_warehouse_tray_goods lwtg LEFT JOIN logpm_warehouse_tary_allocation lwta ON lwta.tray_id = lwtg.tray_id AND lwta.is_deleted = 0 WHERE lwtg.market_id = #{marketId} - and lwtg.association_code = #{materialCode} + and lwtg.association_value = #{materialCode} and lwtg.incoming_batch = #{incomingBatch} AND lwta.id IS NULL diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsMapper.xml index 67551bf18..24c824c5b 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsMapper.xml +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsMapper.xml @@ -218,13 +218,12 @@ lwug.allocation_title allocationName, lwt.pallet_code trayCode, lwug.num num - FROM logpm_warehouse_updown_goods lwug ON ldsa.id = lwug.association_id + FROM logpm_warehouse_updown_goods lwug LEFT JOIN logpm_warehouse_tary_allocation lwta ON lwta.allocation_id = lwug.allocation_id AND lwta.is_deleted = 0 LEFT JOIN logpm_warehouse_tray lwt ON lwt.id = lwta.tray_id WHERE lwug.market_id = #{marketId} and lwug.association_value = #{materialCode} and lwug.incoming_batch = #{incomingBatch} - AND lwta.id IS NOT NULL diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseTrayGoodsLogService.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseTrayGoodsLogService.java index 219fc7d3a..53bf90641 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseTrayGoodsLogService.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseTrayGoodsLogService.java @@ -14,7 +14,7 @@ public interface IWarehouseTrayGoodsLogService extends BaseService sourceTrayGoodsList, String bindingType, String remark, String palletizingType); } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseTrayGoodsService.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseTrayGoodsService.java index 5e20ce00f..bd9759d1f 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseTrayGoodsService.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseTrayGoodsService.java @@ -50,7 +50,7 @@ public interface IWarehouseTrayGoodsService extends BaseService ls = new ArrayList<>(); UpShelfDataVO dataVO = new UpShelfDataVO(); dataVO.setOrderCode(parcelListEntity.getOrderCode()); @@ -749,7 +749,10 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl