From 3f3e1890145ceb3d85c5bb2854e15daba03cd7de Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Tue, 9 Dec 2025 17:03:48 +0800 Subject: [PATCH] =?UTF-8?q?2025-12-09=20pda=E7=89=A9=E6=96=99=E6=B8=85?= =?UTF-8?q?=E5=8D=95=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ProductionInboundController.java | 4 +++- .../controller/ProductionReturnController.java | 4 +++- .../service/ProductionReturnService.java | 10 ++++++++++ .../service/impl/ProductionReturnServiceImpl.java | 5 +++++ 4 files changed, 21 insertions(+), 2 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 58aedfc..a189cbb 100644 --- a/src/main/java/com/gaotao/modules/productionInbound/controller/ProductionInboundController.java +++ b/src/main/java/com/gaotao/modules/productionInbound/controller/ProductionInboundController.java @@ -194,6 +194,7 @@ public class ProductionInboundController extends AbstractController { String buNo = (String) params.get("buNo"); String inboundNo = (String) params.get("inboundNo"); String relatedOrderNo = (String) params.get("relatedOrderNo"); + String warehouseId = (String) params.get("warehouseId"); if (site == null || site.trim().isEmpty()) { return R.error("站点不能为空"); @@ -207,7 +208,8 @@ public class ProductionInboundController extends AbstractController { return R.error("入库单号不能为空"); } - List> materialList = productionInboundService.getMaterialList(site, buNo, inboundNo, relatedOrderNo); + List> materialList = productionInboundService.getMaterialList( + site, buNo, inboundNo, warehouseId, relatedOrderNo); return R.ok().put("data", materialList); } catch (Exception e) { diff --git a/src/main/java/com/gaotao/modules/productionReturn/controller/ProductionReturnController.java b/src/main/java/com/gaotao/modules/productionReturn/controller/ProductionReturnController.java index dca203c..7b429cd 100644 --- a/src/main/java/com/gaotao/modules/productionReturn/controller/ProductionReturnController.java +++ b/src/main/java/com/gaotao/modules/productionReturn/controller/ProductionReturnController.java @@ -177,6 +177,7 @@ public class ProductionReturnController extends AbstractController { String site = (String) params.get("site"); String buNo = (String) params.get("buNo"); String inboundNo = (String) params.get("inboundNo"); + String warehouseId = (String) params.get("warehouseId"); if (site == null || site.trim().isEmpty()) { return R.error("站点不能为空"); @@ -190,7 +191,8 @@ public class ProductionReturnController extends AbstractController { return R.error("入库单号不能为空"); } - List> materialList = productionReturnService.getMaterialList(site, buNo, inboundNo); + List> materialList = productionReturnService.getMaterialList( + site, buNo, inboundNo, warehouseId); return R.ok().put("data", materialList); } catch (Exception e) { diff --git a/src/main/java/com/gaotao/modules/productionReturn/service/ProductionReturnService.java b/src/main/java/com/gaotao/modules/productionReturn/service/ProductionReturnService.java index e90efcd..0c2cd53 100644 --- a/src/main/java/com/gaotao/modules/productionReturn/service/ProductionReturnService.java +++ b/src/main/java/com/gaotao/modules/productionReturn/service/ProductionReturnService.java @@ -60,6 +60,16 @@ public interface ProductionReturnService { */ List> getMaterialList(String site, String buNo, String inboundNo); + /** + * 获取生产退仓物料清单（带仓库参数） + * @param site 站点 + * @param buNo 业务单元 + * @param inboundNo 入库单号 + * @param warehouseId 仓库ID + * @return 物料清单 + */ + List> getMaterialList(String site, String buNo, String inboundNo, String warehouseId); + /** * 获取生产退仓物料清单（带仓库和关联单号参数） * @param site 站点 diff --git a/src/main/java/com/gaotao/modules/productionReturn/service/impl/ProductionReturnServiceImpl.java b/src/main/java/com/gaotao/modules/productionReturn/service/impl/ProductionReturnServiceImpl.java index d1d63f4..6040f35 100644 --- a/src/main/java/com/gaotao/modules/productionReturn/service/impl/ProductionReturnServiceImpl.java +++ b/src/main/java/com/gaotao/modules/productionReturn/service/impl/ProductionReturnServiceImpl.java @@ -320,6 +320,11 @@ public class ProductionReturnServiceImpl implements ProductionReturnService { return getMaterialList(site, buNo, inboundNo, null, null); } + @Override + public List> getMaterialList(String site, String buNo, String inboundNo, String warehouseId) { + return getMaterialList(site, buNo, inboundNo, warehouseId, null); + } + @Override public List> getMaterialList(String site, String buNo, String inboundNo, String warehouseId, String relatedOrderNo) { logger.info("获取生产退仓物料清单，站点: {}, 业务单元: {}, 入库单号: {}, 仓库: {}, 关联单号: {}",