2026-04-15

优化

src/main/java/com/gaotao/modules/productionReturn/controller/ProductionReturnController.java

@@ -194,6 +194,11 @@ public class ProductionReturnController extends AbstractController {
             String locationCode = (String) params.get("locationCode");
             String site = (String) params.get("site");
             String buNo = (String) params.get("buNo");
+            String actionType = (String) params.get("actionType");
+
+            if (actionType == null || actionType.trim().isEmpty()) {
+                actionType = "生产退仓";
+            }
 
             if (inboundNo == null || inboundNo.trim().isEmpty()) {
                 return R.error("生产订单号不能为空");
@@ -210,7 +215,7 @@ public class ProductionReturnController extends AbstractController {
 
             String userName = getUser().getUsername();
             boolean success = productionReturnService.confirmInboundStorage(
-                site, buNo, inboundNo, locationCode, userName);
+                site, buNo, inboundNo, locationCode, userName, actionType);
             if (success) {
                 return R.ok("上架成功");
             } else {

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

@@ -58,9 +58,10 @@ public interface ProductionReturnService {
      * @param orderNo 生产订单号
      * @param locationCode 库位号
      * @param userName 当前登录人
+     * @param actionType 动作类型（生产退仓/申请单退仓）
      * @return 处理结果
      */
-    boolean confirmInboundStorage(String site, String buNo, String orderNo, String locationCode, String userName);
+    boolean confirmInboundStorage(String site, String buNo, String orderNo, String locationCode, String userName, String actionType);
 
     /**
      * 获取生产物料清单

src/main/java/com/gaotao/modules/productionReturn/service/impl/ProductionReturnServiceImpl.java

@@ -126,8 +126,8 @@ public class ProductionReturnServiceImpl implements ProductionReturnService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public boolean confirmInboundStorage(String site, String buNo, String orderNo, String locationCode, String userName) {
-        logger.info("开始确认生产退仓上架，生产订单号: {}, 库位号: {}", orderNo, locationCode);
+    public boolean confirmInboundStorage(String site, String buNo, String orderNo, String locationCode, String userName, String actionType) {
+        logger.info("开始确认生产退仓上架，生产订单号: {}, 库位号: {}, 动作类型: {}", orderNo, locationCode, actionType);
         
         try {
             // 调用存储过程 GetSaveLabelVerification
@@ -140,7 +140,7 @@ public class ProductionReturnServiceImpl implements ProductionReturnService {
             params.add("");                      // 参数6: 空字符串
             params.add("");                      // 参数7: 空字符串
             params.add(locationCode);            // 参数8: 库位
-            params.add("生产退仓");               // 参数9: 生产退仓
+            params.add(actionType);              // 参数9: 生产退仓 或 申请单退仓
             params.add(userName);                // 参数10: 当前登陆人
 
             List<Map<String, Object>> resultList = procedureMapper.getProcedureData("GetSaveLabelVerification", params);