#

18516761980

2022-06-14 908c197ea5259441b12902349896a962dd6ca4d0

#

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

@@ -787,7 +787,6 @@
//            // 入出库模式判断
//            if (devpThread.ioMode != IoModeType.PAKOUT_MODE) { continue; }


                // 查询站点详细信息
                BasDevp staDetl = basDevpService.selectById(crnStn.getStaNo());
                if (staDetl == null) {
@@ -1519,10 +1518,11 @@

        // 获取工作号
        int workNo = commonService.getWorkNo(0);
        Date now = new Date();
        // 保存工作档
        WrkMast wrkMast = new WrkMast();
        wrkMast.setWrkNo(workNo);
        wrkMast.setIoTime(new Date());
        wrkMast.setIoTime(now);
        wrkMast.setWrkSts(11L); // 工作状态：11.生成出库ID
        wrkMast.setIoType(11); // 入出库状态： 11.库格移载
        wrkMast.setIoPri(15D);
@@ -1536,8 +1536,8 @@
        wrkMast.setBarcode(shallowLoc.getBarcode()); // 托盘码
        wrkMast.setLinkMis("N");
        wrkMast.setCtnNo("Y");  // 入库阻塞库位移转标记
        wrkMast.setAppeTime(new Date());
        wrkMast.setModiTime(new Date());
        wrkMast.setAppeTime(now);
        wrkMast.setModiTime(now);
        int res = wrkMastMapper.insert(wrkMast);
        if (res == 0) {
            throw new CoolException("保存工作档失败");
@@ -1548,11 +1548,11 @@
            for (LocDetl locDetl : locDetls) {
                WrkDetl wrkDetl = new WrkDetl();
                wrkDetl.setWrkNo(workNo);
                wrkDetl.setIoTime(new Date());
                wrkDetl.setIoTime(now);
                wrkDetl.setQty(locDetl.getQty());
                VersionUtils.setWrkDetl(wrkDetl, locDetl); // 版本控制
                wrkDetl.setAppeTime(new Date());
                wrkDetl.setModiTime(new Date());
                wrkDetl.setAppeTime(now);
                wrkDetl.setModiTime(now);
                if (!wrkDetlService.insert(wrkDetl)) {
                    throw new CoolException("保存工作档明细失败");
                }
@@ -1561,7 +1561,7 @@
        // 修改源库位状态
        if (shallowLoc.getLocSts().equals("D") || shallowLoc.getLocSts().equals("F")) {
            shallowLoc.setLocSts("S"); // S.入库预约，入库阻塞库位移转
            shallowLoc.setModiTime(new Date());
            shallowLoc.setModiTime(now);
            if (!locMastService.updateById(shallowLoc)){
                throw new CoolException("更新源库位状态失败");
            }
@@ -1612,7 +1612,13 @@
                if (Utils.isShallowLoc(slaveProperties, row)) {
                    loc = locMastService.queryFreeLocMast(row, shallowLoc.getLocType1());


                    if(null != loc){//对应深库位非在库状态,不能移库
                        String deepLoc = Utils.getDeepLoc(slaveProperties,loc.getLocNo());
                        LocMast deepLoc1 = locMastService.selectById(deepLoc);
                        if(!deepLoc1.getLocSts().equals("F") && !deepLoc1.getLocSts().equals("D")){
                            loc = null;
                        }
                    }

                    if (null != loc) { break; }
                }