dubin
2025-08-23 153ab7259290179957c1cfa36b5c2e6b6da587c4
联调
2个文件已修改
21 ■■■■■ 已修改文件
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/core/MainProcess.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1554,7 +1554,9 @@
                // 入库 + 库位转移  ==> 4.入库完成
                if (wrkMast.getWrkSts() == 3 || (wrkMast.getWrkSts() == 12 && wrkMast.getIoType() == 11)) {
                    wrkMast.setWrkSts(4L);
                } else {
                } else if (wrkMast.getIoType()==120 && wrkMast.getWrkSts()==2){
                    wrkMast.setWrkSts(5L);
                }else {
                    continue;
                }
                Date now = new Date();
@@ -3242,6 +3244,21 @@
                CrnSlave.CrnStn crnStn = crn.getCrnInStn().get(0);
                News.info("堆垛机无任务自动回入库口待机==>>" + crnProtocol.getCrnNo() + "号堆垛机");
                //生成回原点工作档  余姚锐麒
                WrkMast wrkMast=new WrkMast();
                wrkMast.setWrkNo(9999);//工作号
                wrkMast.setIoTime(new Date());
                wrkMast.setWrkSts(2L);//工作状态
                wrkMast.setIoType(120);//任务类型  120.堆垛机回原点
                wrkMast.setIoPri(13.0);//优先级
                wrkMast.setCrnNo(1);//堆垛机号
                wrkMast.setSourceStaNo(0);//源站
                wrkMast.setStaNo(0);//目标站
                wrkMast.setSourceLocNo("");//源库位
                wrkMast.setLocNo("");//目标库位
                if (wrkMastMapper.insert(wrkMast)==0){
                    throw new CoolException("保存工作档数据状态失败");
                }
                // 命令下发区 --------------------------------------------------------------------------
                CrnCommand crnCommand = new CrnCommand();
//                if (crnProtocol.getCrnNo()==3 || crnProtocol.getCrnNo()==4){
src/main/java/com/zy/core/MainProcess.java
@@ -77,7 +77,7 @@
//                        News.info("输入成功");
//                    }
                    //堆垛机无任务回入库口待机
                    mainService.crnMove();
//                    mainService.crnMove();
                    // 其他  ===>> LED显示器复位,显示默认信息
                    mainService.ledReset();