自动化立库仓库-WCS系统
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
#
TQS
2022-11-19 5b23a55528e6bae48c56ac0d216da6196a5ca729 
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java


@@ -792,6 +792,7 @@


                        crnCommand.setCrnNo(slave.getId()); // 堆垛机编号


                        crnCommand.setTaskNo(wrkMast.getWrkNo().shortValue()); // 工作号


                        crnCommand.setAckFinish((short) 0);  // 任务完成确认位


                        crnCommand.setCommand((short) 0);


                        crnCommand.setTaskMode(CrnTaskModeType.LOC_MOVE); // 任务模式:  库位移转


                        crnCommand.setSourcePosX(crnStn.getRow().shortValue());     // 源库位排


                        crnCommand.setSourcePosY(crnStn.getBay().shortValue());     // 源库位列


@@ -846,6 +847,7 @@


                            crnCommand.setCrnNo(slave.getId()); // 堆垛机编号


                            crnCommand.setTaskNo(wrkMast.getWrkNo().shortValue()); // 工作号


                            crnCommand.setAckFinish((short) 0);  // 任务完成确认位


                            crnCommand.setCommand((short) 0);


                            crnCommand.setTaskMode(CrnTaskModeType.LOC_MOVE); // 任务模式:  库位移转


                            crnCommand.setSourcePosX(crnStn.getRow().shortValue());     // 源库位排


                            crnCommand.setSourcePosY(crnStn.getBay().shortValue());     // 源库位列


@@ -1032,6 +1034,7 @@


                    crnCommand.setCrnNo(slave.getId()); // 堆垛机编号


                    crnCommand.setTaskNo(wrkMast.getWrkNo().shortValue()); // 工作号


                    crnCommand.setAckFinish((short) 0);  // 任务完成确认位


                    crnCommand.setCommand((short) 0);


                    crnCommand.setTaskMode(CrnTaskModeType.LOC_MOVE); // 任务模式:  库位移转


                    crnCommand.setSourcePosX(sourceSta.getRow1().shortValue());     // 源库位排


                    crnCommand.setSourcePosY(sourceSta.getBay1().shortValue());     // 源库位列


@@ -1102,6 +1105,7 @@


                            crnCommand.setCrnNo(slave.getId()); // 堆垛机编号


                            crnCommand.setTaskNo(wrkMast.getWrkNo().shortValue()); // 工作号


                            crnCommand.setAckFinish((short) 0);  // 任务完成确认位


                            crnCommand.setCommand((short) 0);


                            crnCommand.setTaskMode(CrnTaskModeType.LOC_MOVE); // 任务模式:  库位移转


                            crnCommand.setSourcePosX(Utils.getGroupRow(sourceSta.getRow1()).shortValue());     // 源库位排


                            crnCommand.setSourcePosY(sourceSta.getBay1().shortValue());     // 源库位列


@@ -1219,6 +1223,7 @@


                crnCommand.setCrnNo(slave.getId()); // 堆垛机编号


                crnCommand.setTaskNo(wrkMast.getWrkNo().shortValue()); // 工作号


                crnCommand.setAckFinish((short) 0);  // 任务完成确认位


                crnCommand.setCommand((short) 0);


                crnCommand.setTaskMode(CrnTaskModeType.LOC_MOVE); // 任务模式:  库位移转


                crnCommand.setSourcePosX(sourceLoc.getRow1().shortValue());     // 源库位排


                crnCommand.setSourcePosY(sourceLoc.getBay1().shortValue());     // 源库位列


@@ -1290,6 +1295,7 @@


                    crnCommand.setCrnNo(slave.getId()); // 堆垛机编号


                    crnCommand.setTaskNo(wrkMast.getWrkNo().shortValue()); // 工作号


                    crnCommand.setAckFinish((short) 0);  // 任务完成确认位


                    crnCommand.setCommand((short) 0);


                    crnCommand.setTaskMode(CrnTaskModeType.LOC_MOVE); // 任务模式:  库位移转


                    crnCommand.setSourcePosX(Utils.getGroupRow(sourceLoc.getRow1()).shortValue());     // 源库位排


                    crnCommand.setSourcePosY(sourceLoc.getBay1().shortValue());     // 源库位列


@@ -1466,6 +1472,7 @@


                            crnCommand.setCrnNo(slave.getId()); // 堆垛机编号


                            crnCommand.setTaskNo(wrkMast.getWrkNo().shortValue()); // 工作号


                            crnCommand.setAckFinish((short) 0);  // 任务完成确认位


                            crnCommand.setCommand((short) 0);


                            crnCommand.setTaskMode(CrnTaskModeType.LOC_MOVE); // 任务模式:  库位移转


                            crnCommand.setSourcePosX(sourceLoc.getRow1().shortValue());     // 源库位排


                            crnCommand.setSourcePosY(sourceLoc.getBay1().shortValue());     // 源库位列


@@ -1571,6 +1578,7 @@


                crnCommand.setCrnNo(slave.getId()); // 堆垛机编号


                crnCommand.setTaskNo(wrkMast.getWrkNo().shortValue()); // 工作号


                crnCommand.setAckFinish((short) 0);  // 任务完成确认位


                crnCommand.setCommand((short) 0);


                crnCommand.setTaskMode(CrnTaskModeType.LOC_MOVE); // 任务模式:  库位移转


                crnCommand.setSourcePosX(sourceLoc.getRow1().shortValue());     // 源库位排


                crnCommand.setSourcePosY(sourceLoc.getBay1().shortValue());     // 源库位列


@@ -1621,6 +1629,7 @@


                            crnCommand.setCrnNo(slave.getId()); // 堆垛机编号


                            crnCommand.setTaskNo(wrkMast.getWrkNo().shortValue()); // 工作号


                            crnCommand.setAckFinish((short) 0);  // 任务完成确认位


                            crnCommand.setCommand((short) 0);


                            crnCommand.setTaskMode(CrnTaskModeType.LOC_MOVE); // 任务模式:  库位移转


                            crnCommand.setSourcePosX(Utils.getGroupRow(sourceLoc.getRow1()).shortValue());     // 源库位排


                            crnCommand.setSourcePosY(sourceLoc.getBay1().shortValue());     // 源库位列


@@ -1715,6 +1724,7 @@


                        crnCommand.setCrnNo(slave.getId()); // 堆垛机编号


                        crnCommand.setTaskNo(wrkMast.getWrkNo().shortValue()); // 工作号


                        crnCommand.setAckFinish((short) 0);  // 任务完成确认位


                        crnCommand.setCommand((short) 0);


                        crnCommand.setTaskMode(CrnTaskModeType.LOC_MOVE); // 任务模式:  库位移转


                        crnCommand.setSourcePosX(Utils.getGroupRow(sourceLoc.getRow1()).shortValue());     // 源库位排


                        crnCommand.setSourcePosY(sourceLoc.getBay1().shortValue());     // 源库位列


@@ -1761,6 +1771,7 @@


                                crnCommand.setCrnNo(slave.getId()); // 堆垛机编号


                                crnCommand.setTaskNo(wrkMast.getWrkNo().shortValue()); // 工作号


                                crnCommand.setAckFinish((short) 0);  // 任务完成确认位


                                crnCommand.setCommand((short) 0);


                                crnCommand.setTaskMode(CrnTaskModeType.LOC_MOVE); // 任务模式:  库位移转


                                crnCommand.setSourcePosX(Utils.getGroupRow(sourceLoc.getRow1()).shortValue());     // 源库位排


                                crnCommand.setSourcePosY(sourceLoc.getBay1().shortValue());     // 源库位列


@@ -2014,6 +2025,7 @@


                    crnCommand.setCrnNo(crnProtocol.getCrnNo()); // 堆垛机编号


                    crnCommand.setTaskNo(wrkMast.getWrkNo().shortValue()); // 工作号


                    crnCommand.setAckFinish((short) 0);  // 任务完成确认位


                    crnCommand.setCommand((short) 0);


                    crnCommand.setTaskMode(CrnTaskModeType.STE_MOVE); // 任务模式:  库位移转


                    crnCommand.setSourcePosX(Utils.getGroupRow(steProtocol.getRow().intValue()).shortValue());     // 源库位排


                    crnCommand.setSourcePosY(steProtocol.getBay());     // 源库位列


@@ -2043,6 +2055,7 @@


                    crnCommand.setCrnNo(crnProtocol.getCrnNo()); // 堆垛机编号


                    crnCommand.setTaskNo(wrkMast.getWrkNo().shortValue()); // 工作号


                    crnCommand.setAckFinish((short) 0);  // 任务完成确认位


                    crnCommand.setCommand((short) 0);


                    crnCommand.setTaskMode(CrnTaskModeType.STE_MOVE); // 任务模式:  库位移转


                    crnCommand.setSourcePosX(Utils.getGroupRow(steProtocol.getRow().intValue()).shortValue());     // 源库位排


                    crnCommand.setSourcePosY(steProtocol.getBay());     // 源库位列


@@ -2095,6 +2108,7 @@


                crnCommand.setCrnNo(crnProtocol.getCrnNo()); // 堆垛机编号


                crnCommand.setTaskNo(wrkMast.getWrkNo().shortValue()); // 工作号


                crnCommand.setAckFinish((short) 0);  // 任务完成确认位


                crnCommand.setCommand((short) 0);


                crnCommand.setTaskMode(CrnTaskModeType.STE_MOVE); // 任务模式:  库位移转


                crnCommand.setSourcePosX(Utils.getGroupRow(steProtocol.getRow().intValue()).shortValue());     // 源库位排


                crnCommand.setSourcePosY(steProtocol.getBay());     // 源库位列


@@ -2572,8 +2586,12 @@


            SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, ste.getId());


            SteProtocol steProtocol = steThread.getSteProtocol();


            if (steProtocol == null) { continue; }


            if (steProtocol.getWaiting() && steProtocol.getTaskNo() != 0) {


                log.info("ste[id={}] 执行工作档完成，任务号={}", steProtocol.getSteNo(), steProtocol.getTaskNo());


            if (steProtocol.getWaiting() && steProtocol.getTaskNo() == 0){


                log.info("ste[id={}] 收到等待WCS确认信号，但是任务号(地址V824)为0", steProtocol.getSteNo());


            }




            if (steProtocol.getWaiting() && steProtocol.getTaskNo() != 0 && steProtocol.getStatus() == 10) {


                log.info("ste[id={}] 执行工作档完成，任务号={}, 穿梭车状态={}", steProtocol.getSteNo(), steProtocol.getTaskNo(), steProtocol.getStatus());


                if (steProtocol.getTaskNo() == 9999) {


                    steThread.setResetFlag(true);


                } else {


@@ -3226,6 +3244,7 @@


                        crnCommand.setCrnNo(wrkCharge.getCrnNo()); // 堆垛机编号


                        crnCommand.setTaskNo(wrkCharge.getWrkNo().shortValue()); // 工作号


                        crnCommand.setAckFinish((short) 0);  // 任务完成确认位


                        crnCommand.setCommand((short) 0);


                        crnCommand.setTaskMode(CrnTaskModeType.STE_MOVE); // 任务模式:  库位移转


                        crnCommand.setSourcePosX(Utils.getGroupRow(steProtocol.getRow().intValue()).shortValue());     // 源库位排


                        crnCommand.setSourcePosY(steProtocol.getBay());     // 源库位列


@@ -3434,6 +3453,7 @@


                crnCommand.setCrnNo(crnProtocol.getCrnNo()); // 堆垛机编号


                crnCommand.setTaskNo(wrkCharge.getWrkNo().shortValue()); // 工作号


                crnCommand.setAckFinish((short) 0);  // 任务完成确认位


                crnCommand.setCommand((short) 0);


                crnCommand.setTaskMode(CrnTaskModeType.STE_MOVE); // 任务模式:  库位移转


                crnCommand.setSourcePosX(Utils.getGroupRow(steProtocol.getRow().intValue()).shortValue());     // 源库位排


                crnCommand.setSourcePosY(steProtocol.getBay());     // 源库位列