From 09972954f67e8fc998bd54d12139f2ff71ecef16 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Sat, 28 Feb 2026 14:03:06 +0800 Subject: [PATCH] =?UTF-8?q?2026-02-28=20=E7=94=9F=E4=BA=A7=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E6=89=AB=E6=8F=8F=E5=A2=9E=E5=8A=A0=E5=85=B3=E8=81=94?= =?UTF-8?q?=E5=8D=95=E8=A1=8C=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProductionInboundController.java | 3 +- .../service/ProductionInboundService.java | 4 ++- .../impl/ProductionInboundServiceImpl.java | 32 +++++++++---------- 3 files changed, 21 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/gaotao/modules/productionInbound/controller/ProductionInboundController.java b/src/main/java/com/gaotao/modules/productionInbound/controller/ProductionInboundController.java index a189cbb..75f7db3 100644 --- a/src/main/java/com/gaotao/modules/productionInbound/controller/ProductionInboundController.java +++ b/src/main/java/com/gaotao/modules/productionInbound/controller/ProductionInboundController.java @@ -96,6 +96,7 @@ public class ProductionInboundController extends AbstractController { String site = (String) params.get("site"); String buNo = (String) params.get("buNo"); String relatedOrderNo = (String) params.get("relatedOrderNo"); + String relatedOrderLineNo = (String) params.get("relatedOrderLineNo"); String operationType = (String) params.get("operationType"); String warehouseId = (String) params.get("warehouseId"); // 仓库ID @@ -114,7 +115,7 @@ public class ProductionInboundController extends AbstractController { // 调用存储过程验证标签 Map result = productionInboundService.validateLabelWithInbound( - site, buNo, relatedOrderNo, inboundNo, labelCode, operationType, userName, warehouseId); + site, buNo, relatedOrderNo, relatedOrderLineNo, inboundNo, labelCode, operationType, userName, warehouseId); return R.ok().put("data", result); } catch (Exception e) { logger.error("生产标签验证失败", e); diff --git a/src/main/java/com/gaotao/modules/productionInbound/service/ProductionInboundService.java b/src/main/java/com/gaotao/modules/productionInbound/service/ProductionInboundService.java index 1be87e5..b45fb5b 100644 --- a/src/main/java/com/gaotao/modules/productionInbound/service/ProductionInboundService.java +++ b/src/main/java/com/gaotao/modules/productionInbound/service/ProductionInboundService.java @@ -32,13 +32,15 @@ public interface ProductionInboundService { * @param site 站点 * @param buNo 业务单元 * @param relatedOrderNo 关联单号 + * @param relatedOrderLineNo 关联单行号 * @param inboundNo 入库单号 * @param labelCode 标签条码 * @param operationType 操作类型 I-添加 D-移除 * @param userName 当前登录人 + * @param warehouseId 仓库ID * @return 标签信息 */ - Map validateLabelWithInbound(String site, String buNo, String relatedOrderNo, String inboundNo, String labelCode, String operationType, String userName, String warehouseId); + Map validateLabelWithInbound(String site, String buNo, String relatedOrderNo, String relatedOrderLineNo, String inboundNo, String labelCode, String operationType, String userName, String warehouseId); /** * 确认生产入库上架（通过存储过程） diff --git a/src/main/java/com/gaotao/modules/productionInbound/service/impl/ProductionInboundServiceImpl.java b/src/main/java/com/gaotao/modules/productionInbound/service/impl/ProductionInboundServiceImpl.java index c39d086..ff9342e 100644 --- a/src/main/java/com/gaotao/modules/productionInbound/service/impl/ProductionInboundServiceImpl.java +++ b/src/main/java/com/gaotao/modules/productionInbound/service/impl/ProductionInboundServiceImpl.java @@ -73,26 +73,26 @@ public class ProductionInboundServiceImpl implements ProductionInboundService { } @Override - public Map validateLabelWithInbound(String site, String buNo, String relatedOrderNo, String inboundNo, String labelCode, String operationType, String userName, String warehouseId) { - logger.info("验证生产入库标签，site: {}, buNo: {}, 关联单号: {}, 入库单号: {}, 标签: {}, 操作类型: {}, 仓库: {}", - site, buNo, relatedOrderNo, inboundNo, labelCode, operationType, warehouseId); + public Map validateLabelWithInbound(String site, String buNo, String relatedOrderNo, String relatedOrderLineNo, String inboundNo, String labelCode, String operationType, String userName, String warehouseId) { + logger.info("验证生产入库标签，site: {}, buNo: {}, 关联单号: {}, 关联单行号: {}, 入库单号: {}, 标签: {}, 操作类型: {}, 仓库: {}", + site, buNo, relatedOrderNo, relatedOrderLineNo, inboundNo, labelCode, operationType, warehouseId); try { // 调用存储过程 GetScanLabelVerification List params = new ArrayList<>(); - params.add(site); // 参数1: site - params.add(buNo); // 参数2: buNo - params.add(inboundNo); // 参数3: 关联单号 - params.add(relatedOrderNo); // 参数4: 入库单号 - params.add(""); // 参数5: 空字符串 - params.add(""); // 参数6: 空字符串 - params.add(""); // 参数7: 空字符串 - params.add(labelCode); // 参数8: 扫描的标签条码 - params.add(""); // 参数9: 空字符串 - params.add("生产入库"); // 参数10: 生产入库 - params.add(operationType); // 参数11: 操作类型 I或D - params.add(userName); // 参数12: 当前登陆人 - params.add(warehouseId != null ? warehouseId : ""); // 参数13: 仓库ID + params.add(site); // 参数1: site + params.add(buNo); // 参数2: buNo + params.add(inboundNo); // 参数3: 入库单号 + params.add(relatedOrderNo); // 参数4: 关联单号 + params.add(relatedOrderLineNo != null ? relatedOrderLineNo : ""); // 参数5: 关联单行号 + params.add(""); // 参数6: 空字符串 + params.add(""); // 参数7: 空字符串 + params.add(labelCode); // 参数8: 扫描的标签条码 + params.add(""); // 参数9: 空字符串 + params.add("生产入库"); // 参数10: 生产入库 + params.add(operationType); // 参数11: 操作类型 I或D + params.add(userName); // 参数12: 当前登陆人 + params.add(warehouseId != null ? warehouseId : ""); // 参数13: 仓库ID List> resultList = procedureMapper.getProcedureData("GetScanLabelVerification", params);