#

whycq

2024-05-31 816dd2c85762f5430842e61f17c467c29bfdc76e

#

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

@@ -27,6 +27,8 @@
@RequestMapping("agvMobile")
public class AgvMobileController extends BaseController  {



    @Autowired
    private AgvMobileService agvMobileService;
    @Autowired
@@ -432,6 +434,10 @@
            if (!Cools.isEmpty(source_loc_no)) {
                throw new CoolException("当前库位已生成任务！");
            }
            AgvLocMast locMastS = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", locNo).eq("loc_sts","F"));
            if (Cools.isEmpty(locMastS)) {
                throw new CoolException("当前库位非在库状态！库位号="+locNo);
            }
            AgvWrkMast wrkMast = createWrkMast(ioType, 22L, locNo, "", barcode, now, getUserId(), 30,floor);
            // 同步调拨单
            List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo));

 src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java

@@ -647,7 +647,10 @@
                }
            }
            // 自动调拨出库取消
        } else if(wrkMast.getIoType() == 108 || wrkMast.getIoType() == 111) {
        } else if(wrkMast.getIoType() == 108 || wrkMast.getIoType() == 111 || wrkMast.getIoType() == 112) {
            if (wrkMast.getIoType() == 112) {
                throw new CoolException("当前作业不能取消！");
            }
            // 源库位
            String locNo = wrkMast.getSourceLocNo();
            // 目标库位
@@ -658,9 +661,15 @@
                    agvLocMastService.updateLocStsByLocNo(targetLocNo,"O","",null);
                }
            } else {
                if (wrkMast.getWrkSts() != 207L && wrkMast.getWrkSts() != 205L) {
                if (wrkMast.getWrkSts() != 22) {
                    agvBasDevpService.updateLocStsAndBarcodeByDevNo(targetLocNo,"O","",wrkMast.getWhsType().shortValue());
                }
                } else {
                    throw new CoolException("当前作业不能取消！");
                }


            }

            List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo));