From 14b00a20edbc7f3944349079bce02b1fbb428070 Mon Sep 17 00:00:00 2001 From: shenzhouyu Date: Sat, 4 Oct 2025 15:43:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9F=A5=E8=AF=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/gaotao/modules/mr/service/impl/MrServiceImpl.java | 3 ++- .../outsourcing/service/impl/OutsourcingReturnServiceImpl.java | 1 + .../production/service/impl/ProductionReturnServiceImpl.java | 1 + src/main/resources/mapper/mr/MrIssueMapper.xml | 2 ++ .../resources/mapper/outsourcing/OutsourcingReturnMapper.xml | 1 + .../resources/mapper/production/ProductionReturnMapper.xml | 1 + 6 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/gaotao/modules/mr/service/impl/MrServiceImpl.java b/src/main/java/com/gaotao/modules/mr/service/impl/MrServiceImpl.java index 32bc0c0e..8f2d007d 100644 --- a/src/main/java/com/gaotao/modules/mr/service/impl/MrServiceImpl.java +++ b/src/main/java/com/gaotao/modules/mr/service/impl/MrServiceImpl.java @@ -69,6 +69,7 @@ public class MrServiceImpl implements MrService { labelInfo.setBatchNo(handlingUnit.getBatchNo()); labelInfo.setLocationId(handlingUnit.getLocationId()); labelInfo.setWarehouseId(handlingUnit.getWarehouseId()); + labelInfo.setWdrNo(handlingUnit.getWdr()); labelInfo.setAvailableQty(handlingUnit.getQty()); return labelInfo; @@ -196,7 +197,7 @@ public class MrServiceImpl implements MrService { labelInfo.setLocationId(handlingUnit.getLocationId()); labelInfo.setWarehouseId(handlingUnit.getWarehouseId()); labelInfo.setAvailableQty(handlingUnit.getQty()); - + labelInfo.setWdrNo(handlingUnit.getWdr()); return labelInfo; } return null; diff --git a/src/main/java/com/gaotao/modules/outsourcing/service/impl/OutsourcingReturnServiceImpl.java b/src/main/java/com/gaotao/modules/outsourcing/service/impl/OutsourcingReturnServiceImpl.java index b8b39b00..abe95cb4 100644 --- a/src/main/java/com/gaotao/modules/outsourcing/service/impl/OutsourcingReturnServiceImpl.java +++ b/src/main/java/com/gaotao/modules/outsourcing/service/impl/OutsourcingReturnServiceImpl.java @@ -74,6 +74,7 @@ public class OutsourcingReturnServiceImpl implements OutsourcingReturnService { labelInfo.setLocationId(label.getLocationId()); labelInfo.setWarehouseId(label.getWarehouseId()); labelInfo.setAvailableQty(label.getQty()); + labelInfo.setWdrNo(label.getWdr()); return labelInfo; } return null; diff --git a/src/main/java/com/gaotao/modules/production/service/impl/ProductionReturnServiceImpl.java b/src/main/java/com/gaotao/modules/production/service/impl/ProductionReturnServiceImpl.java index c262c98d..39121fbd 100644 --- a/src/main/java/com/gaotao/modules/production/service/impl/ProductionReturnServiceImpl.java +++ b/src/main/java/com/gaotao/modules/production/service/impl/ProductionReturnServiceImpl.java @@ -182,6 +182,7 @@ public class ProductionReturnServiceImpl implements ProductionReturnService { labelInfo.setLocationId(label.getLocationId()); labelInfo.setWarehouseId(label.getWarehouseId()); labelInfo.setAvailableQty(label.getQty()); + labelInfo.setWdrNo(label.getWdr()); return labelInfo; } return null; diff --git a/src/main/resources/mapper/mr/MrIssueMapper.xml b/src/main/resources/mapper/mr/MrIssueMapper.xml index ec911849..822d742d 100644 --- a/src/main/resources/mapper/mr/MrIssueMapper.xml +++ b/src/main/resources/mapper/mr/MrIssueMapper.xml @@ -35,6 +35,7 @@ a.warehouse_id, a.status, a.status_db, + a.wdr, a.created_date from handling_unit a where a.site=#{site} and a.unit_id=#{labelCode} and a.in_stock_flag='Y' and a.part_no = #{partNo} @@ -52,6 +53,7 @@ a.warehouse_id, a.status, a.status_db, + a.wdr, a.created_date from handling_unit a where a.site=#{site} and a.unit_id=#{labelCode} and (a.in_stock_flag='N' or a.in_stock_flag='X') and a.part_no = #{partNo} diff --git a/src/main/resources/mapper/outsourcing/OutsourcingReturnMapper.xml b/src/main/resources/mapper/outsourcing/OutsourcingReturnMapper.xml index f017ad2d..bee7bd78 100644 --- a/src/main/resources/mapper/outsourcing/OutsourcingReturnMapper.xml +++ b/src/main/resources/mapper/outsourcing/OutsourcingReturnMapper.xml @@ -51,6 +51,7 @@ a.warehouse_id, a.status, a.status_db, + a.wdr, a.created_date from handling_unit a where a.site=#{site} and a.unit_id=#{scannedLabel} and (a.in_stock_flag='N' or a.in_stock_flag='X') and a.part_no = #{componentPartNo} diff --git a/src/main/resources/mapper/production/ProductionReturnMapper.xml b/src/main/resources/mapper/production/ProductionReturnMapper.xml index 88ee8937..476475e5 100644 --- a/src/main/resources/mapper/production/ProductionReturnMapper.xml +++ b/src/main/resources/mapper/production/ProductionReturnMapper.xml @@ -31,6 +31,7 @@ a.warehouse_id, a.status, a.status_db, + a.wdr, a.created_date from handling_unit a where a.site=#{site} and a.unit_id=#{labelCode} and (a.in_stock_flag='N' or a.in_stock_flag='X') and a.batch_no = #{batchNo} and a.part_no = #{partNo}