#和得服务器

1

7 天以前 f0adc332d570cde0084bce7372ae7b9653b8c93b

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

@@ -364,9 +364,11 @@
            wrkMast.setEmptyMk("N"); // 空板
            wrkMast.setLinkMis("N");
            wrkMast.setBarcode(locMast.getBarcode());
            if (Boolean.parseBoolean(config.getValue()) && locMastRgv.getLocNo() != null && ioType != 107) {  //若有空库位且配置允许则绑定其备料库位号
                wrkMast.setLocNo(locMastRgv.getLocNo());
                wrkMast.setTakeNone("0");  //0rgv未取，1rgv已取货
            if(locMastRgv !=null){
                if (Boolean.parseBoolean(config.getValue()) && locMastRgv.getLocNo() != null && ioType != 107) {  //若有空库位且配置允许则绑定其备料库位号
                    wrkMast.setLocNo(locMastRgv.getLocNo());
                    wrkMast.setTakeNone("0");  //0rgv未取，1rgv已取货
                }
            }
            wrkMast.setAppeUser(userId); // 操作人员数据
            wrkMast.setAppeTime(now);
@@ -393,15 +395,20 @@
                    throw new CoolException("保存工作档明细失败");
                }
            }
            //修改agv备料区状态
            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());
            if(locMastRgv !=null){
                if (Boolean.parseBoolean(config.getValue()) && locMastRgv.getLocNo() != null && ioType != 107) {  //若有空库位且配置允许则绑定其备料库位号
                    //修改agv备料区状态
                    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());
                        }
                    }
                }
            }

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