WCS功能完善

pang.jiabao

7 天以前 bdd676ea0246acd555fff9c98c8d0bf24865437c

 src/main/java/com/zy/core/thread/SiemensCrnThread.java

@@ -109,6 +109,7 @@
        if (null == crnProtocol) {
            crnProtocol = new CrnProtocol();
        }
        crnProtocol.setCrnNo(slave.getId());
        crnProtocol.setMode((short) -1);
//        crnProtocol.setTaskNo((short)0);
        crnProtocol.setStatus((short) -1);
@@ -170,8 +171,8 @@
            if (result.IsSuccess) {
                if (null == crnProtocol) {
                    crnProtocol = new CrnProtocol();
                    crnProtocol.setCrnNo(slave.getId());
                }
                crnProtocol.setCrnNo(slave.getId());
                crnProtocol.setMode(siemensNet.getByteTransform().TransInt16(result.Content, 0));
                crnProtocol.setTaskNo(siemensNet.getByteTransform().TransInt16(result.Content, 2));
                crnProtocol.setStatus(siemensNet.getByteTransform().TransInt16(result.Content, 4));
@@ -198,7 +199,7 @@

                // 复位信号
                if (!Cools.isEmpty(crnProtocol.getStatusType()) && crnProtocol.getStatusType().equals(CrnStatusType.WAITING)) {
                    News.info("{}号堆垛机，收到任务{}完成信号",crnProtocol.getCrnNo(),crnProtocol.getTaskNo());
                    News.info("{}号堆垛机，收到任务{}完成信号,resetFlag:{}",crnProtocol.getCrnNo(),crnProtocol.getTaskNo(),resetFlag);
                    if (resetFlag) {
                        if(crnProtocol.getTaskNo()==9999){
                            backHpFlag = false;
@@ -216,6 +217,8 @@
                    BasCrnpService basCrnpService = SpringUtils.getBean(BasCrnpService.class);
                    BasCrnp basCrnp = new BasCrnp();
                    basCrnp.setCrnNo(slave.getId());
                    basCrnp.setHpMk(String.valueOf(crnProtocol.getYSpeed())); // 垂直速度
                    basCrnp.setRetrieveMk(String.valueOf(crnProtocol.getXSpeed())); // 水平速度
                    basCrnp.setCrnSts((int)crnProtocol.getMode());
                    if (!basCrnpService.updateById(crnProtocol.toSqlModel(basCrnp))){
                        News.error("SiemensCrn"+" - 3"+" - 堆垛机plc数据库更新失败 ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
@@ -297,7 +300,7 @@
        }

        //堆垛机任务写入后，回读一次，看是否成功
        Thread.sleep(200);
        Thread.sleep(500);
        try{
            OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.0", (short) 24);
            if (resultRead.IsSuccess) {