出库增加商品名称搜索条件

dubin

10 天以前 1e035e59e748a047993a88389f4872b1c74fc1a4

 src/main/java/com/zy/asrs/controller/WorkController.java

@@ -4,10 +4,7 @@
import com.core.common.Cools;
import com.core.common.R;
import com.zy.asrs.entity.WaitPakin;
import com.zy.asrs.entity.param.EmptyPlateOutParam;
import com.zy.asrs.entity.param.FullStoreParam;
import com.zy.asrs.entity.param.LocDetlAdjustParam;
import com.zy.asrs.entity.param.StockOutParam;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.WorkService;
import com.zy.common.model.StartupDto;
@@ -18,10 +15,7 @@
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;

/**
 * 工作流接口控制器
@@ -93,6 +87,67 @@
        return R.ok("出库启动成功");
    }

//    @RequestMapping("/plate/out/start")
//    @ManagerAuth(memo = "出库作业")
//    public R fullStoreTakeStart(@RequestBody StockOutFloorParam param) {
//        if (param.getFloor() != null) {
//            List<Integer> siteIdList = new ArrayList<>();
//
//            // 第一步：根据楼层选择站点集合
//            switch (param.getFloor()) {
//                case 1: // 一楼（东区）
//                    siteIdList = Arrays.asList(121, 124, 125, 126);
//                    break;
//                case 2: // 二楼（东区）
//                    siteIdList = Arrays.asList(221, 224, 226, 229);
//                    break;
//                case 3: // 四楼（东区）
//                    siteIdList = Arrays.asList(411, 412, 413, 414);
//                    break;
//                case 4: // 一楼（西区）
//                    siteIdList = Arrays.asList(103); // 只有一个站点
//                    break;
//                case 5: // 二楼（西区）
//                    siteIdList = Arrays.asList(201, 204, 206, 209);
//                    break;
//                case 6: // 四楼（西区）
//                    siteIdList = Arrays.asList(401, 402, 403, 404);
//                    break;
//                default:
//                    break;
//            }
//
//            // 第二步：根据 locNo 的排号，给每个 locDetl 设置 siteId
//            if (param.getLocDetls() != null) {
//                for (StockOutFloorParam.LocDetl locDetl : param.getLocDetls()) {
//                    String locNo = locDetl.getLocNo(); // 如：0312001
//                    if (locNo != null && locNo.length() >= 2) {
//                        String rowStr = locNo.substring(0, 2); // 前两位为排号
//                        int row = Integer.parseInt(rowStr);
//
//                        Integer siteId = null;
//
//                        // 站点分布规则
//                        if (row == 1 || row == 2) {
//                            siteId = siteIdList.size() > 0 ? siteIdList.get(0) : null;
//                        } else if (row == 3 || row == 4) {
//                            siteId = siteIdList.size() > 1 ? siteIdList.get(1) : null;
//                        } else if (row == 5 || row == 6) {
//                            siteId = siteIdList.size() > 2 ? siteIdList.get(2) : null;
//                        } else if (row == 7 || row == 8) {
//                            siteId = siteIdList.size() > 3 ? siteIdList.get(3) : null;
//                        }
//
//                        // 设置 siteId
//                        locDetl.setSiteId(siteId);
//                    }
//                }
//            }
//        }
//        workService.startupFullTakeStore(param, getUserId());
//        return R.ok("出库启动成功");
//    }

    @RequestMapping("/empty/plate/in/start")
    @ManagerAuth(memo = "空板入库")
    public R emptyPlateInStart(@RequestParam Integer sourceStaNo) {
@@ -109,10 +164,72 @@
    @RequestMapping("/locCheck/out/start")
    @ManagerAuth(memo = "盘点出库")
    public R locCheckOutStart(@RequestBody StockOutParam param) {

        workService.locCheckOut(param, getUserId());
        return R.ok("出库启动成功");
    }

//    @RequestMapping("/locCheck/out/start")
//    @ManagerAuth(memo = "盘点出库")
//    public R locCheckOutStart(@RequestBody StockOutFloorParam param) {
//        if (param.getFloor() != null) {
//            List<Integer> siteIdList = new ArrayList<>();
//
//            // 第一步：根据楼层选择站点集合
//            switch (param.getFloor()) {
//                case 1: // 一楼（东区）
//                    siteIdList = Arrays.asList(121, 124, 125, 126);
//                    break;
//                case 2: // 二楼（东区）
//                    siteIdList = Arrays.asList(221, 224, 226, 229);
//                    break;
//                case 3: // 四楼（东区）
//                    siteIdList = Arrays.asList(411, 412, 413, 414);
//                    break;
//                case 4: // 一楼（西区）
//                    siteIdList = Arrays.asList(103); // 只有一个站点
//                    break;
//                case 5: // 二楼（西区）
//                    siteIdList = Arrays.asList(201, 204, 206, 209);
//                    break;
//                case 6: // 四楼（西区）
//                    siteIdList = Arrays.asList(401, 402, 403, 404);
//                    break;
//                default:
//                    break;
//            }
//
//            // 第二步：根据 locNo 的排号，给每个 locDetl 设置 siteId
//            if (param.getLocDetls() != null) {
//                for (StockOutFloorParam.LocDetl locDetl : param.getLocDetls()) {
//                    String locNo = locDetl.getLocNo(); // 如：0312001
//                    if (locNo != null && locNo.length() >= 2) {
//                        String rowStr = locNo.substring(0, 2); // 前两位为排号
//                        int row = Integer.parseInt(rowStr);
//
//                        Integer siteId = null;
//
//                        // 站点分布规则
//                        if (row == 1 || row == 2) {
//                            siteId = siteIdList.size() > 0 ? siteIdList.get(0) : null;
//                        } else if (row == 3 || row == 4) {
//                            siteId = siteIdList.size() > 1 ? siteIdList.get(1) : null;
//                        } else if (row == 5 || row == 6) {
//                            siteId = siteIdList.size() > 2 ? siteIdList.get(2) : null;
//                        } else if (row == 7 || row == 8) {
//                            siteId = siteIdList.size() > 3 ? siteIdList.get(3) : null;
//                        }
//
//                        // 设置 siteId
//                        locDetl.setSiteId(siteId);
//                    }
//                }
//            }
//        }
//        workService.locCheckOut(param, getUserId());
//        return R.ok("出库启动成功");
//    }

    @RequestMapping("/loc/move/start")
    @ManagerAuth(memo = "库位移转")
    public R locMoveStart(@RequestParam String sourceLocNo,