#1

lsh

2024-05-31 c22edcc5e29212dfa3e7b629c45ba00c30f310f8

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

@@ -578,6 +578,10 @@
        if(wrkMast.getIoType() == 110){
            agvBasDevpService.updateLocStsAndBarcodeByDevNo(wrkMast.getLocNo(),"F",wrkMast.getBarcode(),wrkMast.getWhsType().shortValue());
        }
        if (wrkMast.getIoType() == 10) {
            agvBasDevpService.updateLocStsAndBarcodeByDevNo(wrkMast.getSourceLocNo(),"O",wrkMast.getBarcode(),wrkMast.getWhsType().shortValue());
            agvLocMastService.updateLocStsByLocNo(wrkMast.getLocNo(),"F",wrkMast.getBarcode(),(short)getContainerTypeByloc(wrkMast.getLocNo()));
        }

    }

@@ -647,7 +651,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 +665,15 @@
                    agvLocMastService.updateLocStsByLocNo(targetLocNo,"O","",null);
                }
            } else {
                if (wrkMast.getWrkSts() != 22) {
                    agvBasDevpService.updateLocStsAndBarcodeByDevNo(targetLocNo,"O","",wrkMast.getWhsType().shortValue());
                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));