*

lsh

1 天以前 b36dbce34e28fadfe7080f28f0612b8239ca6cb5

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

@@ -341,6 +341,10 @@

            // 获取路径
            StaDesc staDesc = staDescService.queryCrnStn(ioType, locMast.getCrnNo(), outSta);
            if(ioType.equals(107)){
                staDesc = staDescService.queryCrnStnCheck(ioType, locMast.getCrnNo(), outSta);
            }

            // 生成工作号
            int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType));
            // 生成工作档
@@ -360,7 +364,7 @@
            wrkMast.setEmptyMk("N"); // 空板
            wrkMast.setLinkMis("N");
            wrkMast.setBarcode(locMast.getBarcode());
            if (Boolean.parseBoolean(config.getValue()) && locMastRgv.getLocNo() != null) {  //若有空库位且配置允许则绑定其备料库位号
            if (Boolean.parseBoolean(config.getValue()) && locMastRgv.getLocNo() != null && ioType != 107) {  //若有空库位且配置允许则绑定其备料库位号
                wrkMast.setLocNo(locMastRgv.getLocNo());
                wrkMast.setTakeNone("0");  //0rgv未取，1rgv已取货
            }
@@ -390,16 +394,13 @@
                }
            }
            //修改agv备料区状态
            if(locMastRgv.getLocSts().equals("O")){
            if(locMastRgv.getLocSts().equals("O") && ioType != 107){
                locMastRgv.setLocSts("S");
                locMastRgv.setModiUser(userId);
                locMastRgv.setModiTime(now);
                if (!locMastService.updateById(locMastRgv)) {
                    throw new CoolException("预约agv备料区库位状态失败，库位号："+locMastRgv.getLocNo());
                }
            }else{
                throw new CoolException(locMastRgv.getLocNo() + "备料区不是空库位状态");

            }
            // 修改库位状态:   F.在库 ====>>> R.出库预约/P.拣料/盘点/并板出库中
            locMast = locMastService.selectById(dto.getLocNo());