Merge branch 'klswcs2' of http://47.97.1.152:5880/r/zy-wcs into klswcs2

18516761980

2022-05-26 57a7240d24ce7e6e07e704a7b82916a1c8a93c9b

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

@@ -407,19 +407,23 @@
                            throw new CoolException("保存工作主档历史档失败");
                        }

                        Date now = new Date();
                        // 堆垛机站点(目标站)
                        Integer staNo = staDesc.getCrnStn();
                        // 更新工作档数据状态
                        wrkMast.setIoTime(now);
                        wrkMast.setIoType(wrkMast.getIoType() - 50); // 入出库类型: 103->53,104->54,107->57
                        wrkMast.setWrkSts(2L); // 工作状态: 2.设备上走
                        wrkMast.setSourceStaNo(wrkMast.getStaNo()); // 源站
                        wrkMast.setStaNo(staNo); // 目标站
                        wrkMast.setLocNo(wrkMast.getSourceLocNo()); // 目标库位 = 出库时的源库位
                        wrkMast.setSourceLocNo(""); // 源库位清空
                        wrkMast.setModiTime(new Date());
                        wrkMast.setModiTime(now);
                        if (wrkMastMapper.updateById(wrkMast) == 0) {
                            throw new CoolException("更新工作档数据状态失败");
                        }
                        // 更新明细档io_time (历史档关联使用）
                        wrkDetlService.updateIoTime(wrkMast.getWrkNo(), now);
                        // 修改库位状态 Q.拣料/盘点/并板再入库
                        LocMast locMast = locMastService.selectById(wrkMast.getLocNo());
                        locMast.setLocSts("Q");
@@ -553,12 +557,12 @@
            // 库位移转
            this.locToLoc(crn, crnProtocol);

            if (crnBackHp) {

                //堆垛机没有执行中任务，设备存在入库任务时叫回原点
                this.crnRebackHp(crnProtocol);

            }
//            if (crnBackHp) {
//
//                //堆垛机没有执行中任务，设备存在入库任务时叫回原点
//                this.crnRebackHp(crnProtocol);
//
//            }
        }
    }

@@ -687,8 +691,9 @@
                        if (wrkMastMapper.updateById(waitWrkMast) == 0) {
                            log.error("调整工作档优先级失败！工作号={}", waitWrkMast.getWrkNo());
                        }
                        continue;
                    }
                    continue;

                } else if (shallowLoc.getLocSts().equals("F") || shallowLoc.getLocSts().equals("D")) {
                    // 此标记避免多次执行移库任务
                    if (Cools.isEmpty(wrkMast.getUpdMk()) || "N".equals(wrkMast.getUpdMk())) {