#

tqs

2022-12-22 dbeff5ad092f2e8b599950ebee1d3499e466d9a4

#

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

@@ -331,6 +331,7 @@
    /**
     * 拣料、并板、盘点再入库【第2阶段】
     */
    @Transactional
    public synchronized void stnToCrnStnPick1(){
        for (DevpSlave devp : slaveProperties.getDevp()) {
            // 遍历拣料入库口
@@ -454,7 +455,8 @@
                                throw new CoolException(wrkMast.getWrkNo() + "保存工作主档历史档失败");
                            }

                            String sourceLocNo = wrkMast.getSourceLocNo().trim();
//                            String sourceLocNo = wrkMast.getSourceLocNo().trim();

                            // 更新工作档数据状态
                            wrkMast.setIoType(wrkMast.getIoType() - 50); // 入出库类型: 103->53,104->54,107->57
                            wrkMast.setWrkSts(2L); // 工作状态: 2.设备上走
@@ -470,14 +472,8 @@
                            if (wrkMastMapper.setSteEmpty(wrkMast.getWrkNo()) == 0) {
                                throw new CoolException(wrkMast.getWrkNo() + "更新工作档数据状态失败");
                            }

                            LocMast locMast = null;
                            // 修改源库位状态 O.空库位
//                            locMast = locMastService.selectById(sourceLocNo);
//                            locMast.setLocSts("O");
//                            locMast.setModiTime(new Date());
//                            if (!locMastService.updateById(locMast)) {
//                                throw new CoolException(wrkMast.getWrkNo() + "修改源库位状态 O.空库位");
//                            }
                            // 修改目标库位状态 Q.拣料/盘点/并板再入库
                            locMast = locMastService.selectById(wrkMast.getLocNo());
                            locMast.setLocSts("Q");
@@ -485,10 +481,21 @@
                            if (!locMastService.updateById(locMast)) {
                                throw new CoolException(wrkMast.getWrkNo() + "修改目标库位状态 Q.拣料/盘点/并板再入库");
                            }
                            // 库存明细转移
//                            if (!locDetlService.updateLocNo(wrkMast.getLocNo(), sourceLocNo)) {
//                                throw new CoolException(wrkMast.getWrkNo() + "任务库存明细转移失败！！！");
//                            }
                            // 源库位库存明细转移到目标库位
                            if (!locDetlService.updateLocNo(wrkMast.getLocNo(), wrkMast.getSourceLocNo())) {
                                throw new CoolException(wrkMast.getLocNo() + "任务库存明细转移失败！！！");
                            }

                            // 修改源库位状态 O.空库位
                            LocMast sourceLocMast = locMastService.selectById(wrkMast.getSourceLocNo());
                            if (sourceLocMast.getLocSts().equals("P")) {
                                sourceLocMast.setLocSts("O");
                                sourceLocMast.setModiTime(new Date());
                                if (!locMastService.updateById(sourceLocMast)) {
                                    throw new CoolException(wrkMast.getWrkNo() + "修改源库位状态 O.空库位");
                                }
                                locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no", wrkMast.getSourceLocNo()));
                            }

                            // 条码设备处理
                            barcodeThread.setBarcode("");
@@ -544,16 +551,16 @@
    public synchronized void pickWrkCompleteStaNo() {
        List<WrkMast> wrkMasts = wrkMastMapper.selectPick17(null, null);
        for (WrkMast wrkMast : wrkMasts) {
            // 修改源库位状态 O.空库位
            LocMast locMast = locMastService.selectById(wrkMast.getSourceLocNo());
            if (locMast.getLocSts().equals("P")) {
                locMast.setLocSts("O");
                locMast.setModiTime(new Date());
                if (!locMastService.updateById(locMast)) {
                    throw new CoolException(wrkMast.getWrkNo() + "修改源库位状态 O.空库位");
                }
                locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no", wrkMast.getSourceLocNo()));
            }
//            // 修改源库位状态 O.空库位
//            LocMast locMast = locMastService.selectById(wrkMast.getSourceLocNo());
//            if (locMast.getLocSts().equals("P")) {
//                locMast.setLocSts("O");
//                locMast.setModiTime(new Date());
//                if (!locMastService.updateById(locMast)) {
//                    throw new CoolException(wrkMast.getWrkNo() + "修改源库位状态 O.空库位");
//                }
//                locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no", wrkMast.getSourceLocNo()));
//            }
            // 修改工作档
            wrkMast.setIoPri(13D);
            wrkMast.setModiTime(new Date());