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 0d04ee1..91418f0 100644 --- a/src/main/java/com/gaotao/modules/productionReturn/controller/ProductionReturnController.java +++ b/src/main/java/com/gaotao/modules/productionReturn/controller/ProductionReturnController.java @@ -106,6 +106,33 @@ public class ProductionReturnController extends AbstractController { } } + @PostMapping("getQualifiedReturnListByProcedure") + public R getQualifiedReturnListByProcedure(@RequestBody Map params) { + try { + String warehouseId = (String) params.get("warehouseId"); + String searchCode = (String) params.get("searchCode"); + String site = (String) params.get("site"); + String status = (String) params.get("status"); + + if (warehouseId == null || warehouseId.trim().isEmpty()) { + return R.error("仓库ID不能为空"); + } + + // 默认状态为待入库 + if (status == null || status.trim().isEmpty()) { + status = "待入库"; + } + + List> resultList = productionReturnService.getQualifiedReturnListByProcedure( + site, warehouseId, searchCode, status); + + return R.ok().put("data", resultList); + } catch (Exception e) { + logger.error("获取生产待入库列表失败", e); + return R.error("获取数据失败: " + e.getMessage()); + } + } + /** * 获取生产入库单详情 */ 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 78b74be..c97a27c 100644 --- a/src/main/java/com/gaotao/modules/productionReturn/service/ProductionReturnService.java +++ b/src/main/java/com/gaotao/modules/productionReturn/service/ProductionReturnService.java @@ -25,6 +25,7 @@ public interface ProductionReturnService { * @return 待入库列表 */ List> getQualifiedInboundList(String site, String warehouseId, String searchCode, String status); + List> getQualifiedReturnListByProcedure(String site, String warehouseId, String searchCode, String status); /** * 获取生产入库单详情 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 02cd577..3e7119c 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 @@ -79,6 +79,13 @@ public class ProductionReturnServiceImpl implements ProductionReturnService { return productionReturnMapper.getQualifiedInboundList(site, warehouseId, searchCode, status, sysUserEntity.getUsername()); } + @Override + public List> getQualifiedReturnListByProcedure(String site, String warehouseId, String searchCode, String status) { + SysUserEntity sysUserEntity = (SysUserEntity) SecurityUtils.getSubject().getPrincipal(); + // 从inbound_notification_head表获取列表,关联SFDC_ROLLS表统计 + return procedureMapper.getProcedureData("dbo.usp_GetQualifiedReturnList", Arrays.asList(site, searchCode, sysUserEntity.getUsername())); + } + @Override public Map getInboundDetails(String orderNo, String warehouseId, String site, String buNo) { // 从inbound_notification_head表获取基本信息,关联SFDC_ROLLS表统计标签数据