#

zjj

2024-11-12 2feeab89a8c715b245b421a364713e3cc041a150

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

@@ -13,6 +13,7 @@
import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.StaDescService;
import com.zy.asrs.service.WorkService;
import com.zy.asrs.utils.Utils;
import com.zy.common.model.StartupDto;
import com.zy.common.utils.RoleUtils;
import com.zy.common.web.BaseController;
@@ -42,6 +43,13 @@
    @Autowired
    private StaDescService staDescService;

    @RequestMapping("/locMerge/out/start")
    @ManagerAuth(memo = "并板出库")
    public R locMergeOutStart(@RequestBody StockOutParam param) {
        workService.locMergeOut(param, getUserId());
        return R.ok("出库启动成功");
    }

    @RequestMapping("/available/put/site")
    @ManagerAuth()
    public R availablePutSite(){
@@ -58,19 +66,39 @@
    @ManagerAuth()
    public R availableTakeSite(){
        List<Map<String, Object>> result = new ArrayList<>();
        List<Integer> outSite = basDevpService.getAvailableOutSite(101);
        EntityWrapper<StaDesc> wrapper = new EntityWrapper<>();
        // 不同继承角色显示不同库信息
        RoleUtils.addRoleWrapperByCrn(getUserId(),wrapper);
        wrapper.eq("type_no",101);
        List<StaDesc> staDescs = staDescService.selectList(wrapper);
        List<Integer> outSite = staDescs.stream().map(StaDesc::getStnNo).distinct().collect(Collectors.toList());
//        List<Integer> outSite = basDevpService.getAvailableOutSite(101);
        for (Integer siteId : outSite) {
            Map<String, Object> map = new HashMap<>();
            map.put("siteId", siteId);
            map.put("desc", siteId + "（全板出库口）");
            map.put("desc", Utils.getStaName(siteId));
            result.add(map);
        }
        List<Integer> pickOutSite = basDevpService.getAvailableOutSite(103);

        EntityWrapper<StaDesc> wrapper2 = new EntityWrapper<>();
        // 不同继承角色显示不同库信息
        RoleUtils.addRoleWrapperByCrn(getUserId(),wrapper2);
        wrapper2.eq("type_no",103);
        List<StaDesc> staDescs2 = staDescService.selectList(wrapper2);
        List<Integer> pickOutSite = staDescs2.stream().map(StaDesc::getStnNo).distinct().collect(Collectors.toList());

//        List<Integer> pickOutSite = basDevpService.getAvailableOutSite(103);
        for (Integer siteId : pickOutSite) {
            Map<String, Object> map = new HashMap<>();
            map.put("siteId", siteId);
            map.put("desc", siteId + "（拣料出库口）");
            result.add(map);
            for (Map<String, Object> map1:  result){
                if (map1.get(siteId) == null){
                    Map<String, Object> map = new HashMap<>();
                    map.put("siteId", siteId);
                    map.put("desc", Utils.getStaName(siteId));
                    result.add(map);
                }

            }

        }
        return R.ok().add(result);
    }
@@ -101,6 +129,12 @@
        return R.ok().add(basDevpService.getAvailableOutSite(107));
    }

    @RequestMapping("/available/take/merge/site")
    @ManagerAuth()
    public R availableTakeMergeSite(){
        return R.ok().add(basDevpService.getAvailableOutSite(104));
    }

    @RequestMapping("/available/take/check/site/crn")
    @ManagerAuth()
    public R availableTakeCheckSiteCrn(){