Merge remote-tracking branch 'origin/mdqdwcs' into mdqdwcs
| | |
| | | && basDevp.getWrkNo() == 0 && basDevp.getCanining().equals("Y")){ |
| | | // 更新站点信息 且 下发plc命令 |
| | | staProtocol.setWorkNo((short) 9997); |
| | | staProtocol.setStaNo(basDevp.getDevNo().shortValue()); |
| | | staProtocol.setStaNo((short) (basDevp.getDevNo()==1004?1003:1013)); |
| | | // staProtocol.setStaNo((short) 1013); |
| | | devpThread.setPakMk(staProtocol.getSiteId(), false); |
| | | boolean result = MessageQueue.offer(SlaveType.Devp, devpThread.getSlave().getId(), new Task(2, staProtocol)); |
| | |
| | | staProtocol.setOutEnable(status[3]);// 可出 |
| | | staProtocol.setForce(status[4]); |
| | | staProtocol.setAmount(count); |
| | | staProtocol.setLow(true); |
| | | |
| | | |
| | | if (!staProtocol.isPakMk() && !staProtocol.isLoading()) { |