#

whycq

2024-05-21 8ee31c0f67f4ccbb3b2b30fdf6aa74514f863836

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

@@ -34,6 +34,8 @@
    AgvWaitPakinService agvWaitPakinService;
    @Autowired
    AgvWorkService agvWorkService;
    @Autowired
    AgvLocDetlService agvLocDetlService;

    @RequestMapping(value = "/basDevp/list/auth")
    @ManagerAuth
@@ -177,6 +179,15 @@
                AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>()
                        .eq("loc_no", agvBasDevp.getDevNo())
                        .or().eq("source_loc_no",agvBasDevp.getDevNo()));
                if (Cools.isEmpty(agvWrkMast)) {
                    Page<AgvLocDetl> agvLocDetlPage = agvLocDetlService.selectPage(new Page<>(curr, limit), new EntityWrapper<AgvLocDetl>()
                            .eq("supp_code", agvBasDevp.getBarcode()));
                    if (agvLocDetlPage.getRecords().size() > 0) {
                        return R.ok(agvLocDetlPage);
                    } else {
                        return R.error("当前货架码异常！");
                    }
                }

                Page<AgvWrkDetl> agvWrkDetlPage = agvWrkDetlService.selectPage(new Page<>(curr, limit), new EntityWrapper<AgvWrkDetl>()
                        .eq("wrk_no", agvWrkMast.getWrkNo()));
@@ -210,6 +221,7 @@
    任务完成
     */
    @RequestMapping(value = "/basDevp/visualized/container/moveOut")
    @ManagerAuth(memo = "确认出库")
    public R visualiZedContainerMoveOut(@RequestBody Map<String,Object> map) {

        String barcode = map.get("barcode").toString();
@@ -228,6 +240,7 @@
   任务完成
    */
    @RequestMapping(value = "/basDevp/visualized/container/moveOut2")
    @ManagerAuth(memo = "确认出库2")
    public R visualiZedContainerMoveOut2(@RequestBody Map<String,Object> map) {

        String barcode = map.get("barcode").toString();
@@ -246,6 +259,7 @@
    拣料/盘点入库
     */
    @RequestMapping(value = "/basDevp/visualized/container/pickIn")
    @ManagerAuth(memo = "再次拣料")
    public R visualiZedPickIn(@RequestBody Map<String,Object> map){
        List<AgvWrkMast> agvWrkMastList = new ArrayList<>();
        String devNo = map.get("devNo").toString();