Merge remote-tracking branch 'origin/jxhcwcs-version1.0' into jxhcwcs-versi...

zwl

2 天以前 3efe34fdc1dfe58e16c8689faf086b38b2d73e83

Merge remote-tracking branch 'origin/jxhcwcs-version1.0' into jxhcwcs-version1.0

# Conflicts:
#	src/main/java/com/zy/core/network/real/ZyCrnRealConnect.java

 src/main/java/com/zy/core/network/real/ZyCrnRealConnect.java

@@ -237,23 +237,6 @@
                    return response;
                }

                if (!Cools.isEmpty(command.getLocNo())){
                    OperateResult resultAck = siemensNet.Write("DB110." + command.getIndex() * 2, command.getValue());
                    if (resultAck.IsSuccess) {
                        Integer index = command.getIndex()*2 + 200;
                        OperateResult resultAck1 = siemensNet.Write("DB110." + index, command.getValue());
                        if (resultAck1.IsSuccess) {
                            News.info("库位橙色按钮命令下发[locNo:{}] >>>>> {}", command.getLocNo(), command.getValue());
                        } else {
                            News.error("库位白色灯命令下发失败[locNo:{}] >>>>> {}", command.getLocNo(), command.getValue());
                        }
                        News.info("库位白色灯命令下发[locNo:{}] >>>>> {}", command.getLocNo(), command.getValue());
                    } else {
                        News.error("库位白色灯命令下发失败[locNo:{}] >>>>> {}", command.getLocNo(), command.getValue());
                    }
                }
            }

            int writeConfirmIdx = 0;
            boolean commandConfirmResult = false;
            do {
@@ -279,6 +262,7 @@
                response.setMessage("堆垛机写入确认数据失败");
                return response;
            }
            }

            News.info("堆垛机命令下发[id:{}] >>>>> {}", command.getCrnNo(), JSON.toJSON(command));
            OutputQueue.CRN.offer(MessageFormat.format("【{0}】[id:{1}] >>>>> 命令下发： {2}", DateUtils.convert(new Date()), command.getCrnNo(), JSON.toJSON(command)));