Merge remote-tracking branch 'origin/phyzasrs' into phyzasrs

whycq

2024-05-27 de1a78dd2f4cfdb6663a1134083dd74f750faae5

Merge remote-tracking branch 'origin/phyzasrs' into phyzasrs

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

@@ -648,10 +648,14 @@
            } else {
                agvLocMastService.updateLocStsByLocNo(locNo,"F",wrkMast.getBarcode(),(short)getContainerTypeByloc(locNo));
            }
            agvBasDevpService.updateLocStsAndBarcodeByDevNo(devNo,"O","",null);
            if (wrkMast.getIoType() == 109){
                agvLocMastService.updateLocStsByLocNo(devNo,"O","",(short)getContainerTypeByloc(devNo));
            }else {
                agvBasDevpService.updateLocStsAndBarcodeByDevNo(devNo,"O","",null);
            }
        }

        if(wrkMast.getIoType() != 1 && wrkMast.getIoType() != 10){
        if(wrkMast.getIoType() != 1 && wrkMast.getIoType() != 10 && wrkMast.getIoType()!=111 && wrkMast.getIoType()!=108){
            //订单回滚
            //List<AgvWrkDetl> agvWrkDetlList = agvWrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
            List<AgvWrkDetl> agvWrkDetlList1 = agvWrkDetlService.selectList(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));