2025-12-09

pda物料清单优化

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<Map<String, Object>> materialList = productionInboundService.getMaterialList(site, buNo, inboundNo, relatedOrderNo);
+            List<Map<String, Object>> materialList = productionInboundService.getMaterialList(
+                    site, buNo, inboundNo, warehouseId, relatedOrderNo);
 
             return R.ok().put("data", materialList);
         } catch (Exception e) {

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<Map<String, Object>> materialList = productionReturnService.getMaterialList(site, buNo, inboundNo);
+            List<Map<String, Object>> materialList = productionReturnService.getMaterialList(
+                    site, buNo, inboundNo, warehouseId);
 
             return R.ok().put("data", materialList);
         } catch (Exception e) {

src/main/java/com/gaotao/modules/productionReturn/service/ProductionReturnService.java

@@ -60,6 +60,16 @@ public interface ProductionReturnService {
      */
     List<Map<String, Object>> getMaterialList(String site, String buNo, String inboundNo);
 
+    /**
+     * 获取生产退仓物料清单（带仓库参数）
+     * @param site 站点
+     * @param buNo 业务单元
+     * @param inboundNo 入库单号
+     * @param warehouseId 仓库ID
+     * @return 物料清单
+     */
+    List<Map<String, Object>> getMaterialList(String site, String buNo, String inboundNo, String warehouseId);
+
     /**
      * 获取生产退仓物料清单（带仓库和关联单号参数）
      * @param site 站点

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<Map<String, Object>> getMaterialList(String site, String buNo, String inboundNo, String warehouseId) {
+        return getMaterialList(site, buNo, inboundNo, warehouseId, null);
+    }
+
     @Override
     public List<Map<String, Object>> getMaterialList(String site, String buNo, String inboundNo, String warehouseId, String relatedOrderNo) {
         logger.info("获取生产退仓物料清单，站点: {}, 业务单元: {}, 入库单号: {}, 仓库: {}, 关联单号: {}",