bug修复

pang.jiabao

5 天以前 b48ab507b4cbbe3cf1cf11ac12b1d945478cc662

 src/main/java/com/zy/controller/SiteController.java

@@ -50,8 +50,6 @@
            SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
            Map<String, Object> map2 = new HashMap<>();
            map2.put("floor", 2);
            map2.put("modeVal", devpThread.ioModeOf2F.id);
            map2.put("modeDesc", devpThread.ioModeOf2F.desc);
            res.add(map2);
        }
        return R.ok().add(res);
@@ -83,6 +81,7 @@
            vo.setPakMk(staProtocol.isPakMk()?"Y":"N");       // 入库标记
            vo.setEmptyMk(staProtocol.isEmptyMk()?"Y":"N");     // 空板信号
            vo.setStaNo(staProtocol.getStaNo());                // 目标站
            vo.setWorkNo(staProtocol.getWorkNo());
//            vo.setLocType1(staProtocol.isHigh() != staProtocol.isLow() && staProtocol.isLow() ? "低" : "高");     //高低库位
            vo.setLocType1(devp.getDevNo()==102 ? "高" : "低");
        }
@@ -179,6 +178,17 @@
                    }
                    boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                    if (result) {
                        int devId = 0;
                        switch (siteId) {
                            case 1081: devId = 4;break;
                            case 1084: devId = 5;break;
                            case 1087: devId = 6;break;
                            default:
                        }
                        if(devId != 0){ // 同时给罐装线写可出
                            staProtocol.setPlaceableFlag(1);
                            MessageQueue.offer(SlaveType.Devp, devId, new Task(5, staProtocol));
                        }
                        return R.ok();
                    } else {
                        return R.error("下发命令失败");