From f396086eed8d477c69d57efacb3bdb7475c3ff3b Mon Sep 17 00:00:00 2001 From: shenzhouyu Date: Fri, 3 Oct 2025 13:45:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A7=94=E5=A4=96=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../outsourcing/controller/OutsourcingIssueController.java | 2 +- .../outsourcing/controller/OutsourcingReturnController.java | 2 +- .../production/controller/ProductionIssueController.java | 2 +- .../production/controller/ProductionReturnController.java | 2 +- src/main/resources/mapper/mr/MrIssueMapper.xml | 2 +- src/main/resources/mapper/production/ProductionReturnMapper.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/gaotao/modules/outsourcing/controller/OutsourcingIssueController.java b/src/main/java/com/gaotao/modules/outsourcing/controller/OutsourcingIssueController.java index 60b04dc..99fca63 100644 --- a/src/main/java/com/gaotao/modules/outsourcing/controller/OutsourcingIssueController.java +++ b/src/main/java/com/gaotao/modules/outsourcing/controller/OutsourcingIssueController.java @@ -68,7 +68,7 @@ public class OutsourcingIssueController { try { MaterialLabelInfo labelInfo = outsourcingIssueService.scanOutsourcingMaterialLabel(dto.getScannedLabel(), dto.getSite(), dto.getComponentPartNo()); if (labelInfo == null) { - return R.error("无法解析物料标签"); + return R.error("物料库存不存在或标签不是在库状态"); } return R.ok().put("labelInfo", labelInfo); } catch (Exception e) { diff --git a/src/main/java/com/gaotao/modules/outsourcing/controller/OutsourcingReturnController.java b/src/main/java/com/gaotao/modules/outsourcing/controller/OutsourcingReturnController.java index 46fbec8..0154d6a 100644 --- a/src/main/java/com/gaotao/modules/outsourcing/controller/OutsourcingReturnController.java +++ b/src/main/java/com/gaotao/modules/outsourcing/controller/OutsourcingReturnController.java @@ -80,7 +80,7 @@ public class OutsourcingReturnController { try { MaterialLabelInfo labelInfo = outsourcingReturnService.scanMaterialLabelForOutsourcing(dto.getScannedLabel(), dto.getSite(), dto.getBatchNo(), dto.getComponentPartNo()); if (labelInfo == null) { - return R.error("无法解析物料标签"); + return R.error("标签不是未入库状态"); } return R.ok().put("labelInfo", labelInfo); } catch (Exception e) { diff --git a/src/main/java/com/gaotao/modules/production/controller/ProductionIssueController.java b/src/main/java/com/gaotao/modules/production/controller/ProductionIssueController.java index 942facf..45057f3 100644 --- a/src/main/java/com/gaotao/modules/production/controller/ProductionIssueController.java +++ b/src/main/java/com/gaotao/modules/production/controller/ProductionIssueController.java @@ -222,7 +222,7 @@ public class ProductionIssueController { public R scanMaterialLabel(@RequestBody DirectIssueDto dto) throws Exception{ MaterialLabelInfo labelInfo = productionIssueService.scanMaterialLabel(dto.getScannedLabel(), dto.getSite(),dto.getComponentPartNo()); if (labelInfo == null) { - return R.error("无法解析物料标签"); + return R.error("物料库存不存在或者标签不是在库状态"); } return R.ok().put("labelInfo", labelInfo); } diff --git a/src/main/java/com/gaotao/modules/production/controller/ProductionReturnController.java b/src/main/java/com/gaotao/modules/production/controller/ProductionReturnController.java index ba052c1..de9abf1 100644 --- a/src/main/java/com/gaotao/modules/production/controller/ProductionReturnController.java +++ b/src/main/java/com/gaotao/modules/production/controller/ProductionReturnController.java @@ -102,7 +102,7 @@ public class ProductionReturnController { public R scanMaterialLabel(@RequestBody DirectIssueDto dto) throws Exception{ MaterialLabelInfo labelInfo = productionReturnService.scanMaterialLabel(dto.getScannedLabel(), dto.getSite(),dto.getBatchNo(),dto.getComponentPartNo()); if (labelInfo == null) { - return R.error("无法解析物料标签"); + return R.error("标签不是未入库状态"); } return R.ok().put("labelInfo", labelInfo); } diff --git a/src/main/resources/mapper/mr/MrIssueMapper.xml b/src/main/resources/mapper/mr/MrIssueMapper.xml index d9c9b62..ec91184 100644 --- a/src/main/resources/mapper/mr/MrIssueMapper.xml +++ b/src/main/resources/mapper/mr/MrIssueMapper.xml @@ -54,6 +54,6 @@ a.status_db, a.created_date from handling_unit a - where a.site=#{site} and a.unit_id=#{labelCode} and a.in_stock_flag='N' and a.part_no = #{partNo} + 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/production/ProductionReturnMapper.xml b/src/main/resources/mapper/production/ProductionReturnMapper.xml index 9951cea..88ee893 100644 --- a/src/main/resources/mapper/production/ProductionReturnMapper.xml +++ b/src/main/resources/mapper/production/ProductionReturnMapper.xml @@ -33,7 +33,7 @@ a.status_db, a.created_date from handling_unit a - where a.site=#{site} and a.unit_id=#{labelCode} and a.in_stock_flag='N' and a.batch_no = #{batchNo} and a.part_no = #{partNo} + 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}