#

whycq

2023-03-22 3184d2cec86f033cbe91e3f299f708ca408ee18b

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

@@ -16,6 +16,7 @@
import com.zy.core.model.protocol.StaProtocol;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.DevpThread;
import com.zy.core.thread.SiemensDevpThread;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

@@ -36,6 +37,68 @@
    private SlaveProperties slaveProperties;
    @Autowired
    private BasDevpService basDevpService;

    @GetMapping("/io/mode/info/site")
    @ManagerAuth(memo = "入出库模式")
    public R ioMode(){
        List<Map<String, Object>> res = new ArrayList<>();
        for (DevpSlave devp : slaveProperties.getDevp()) {
            SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
            if (devp.getId() == 1) {
                Map<String, Object> map1 = new HashMap<>();
                map1.put("floor", 1);
                map1.put("modeVal", devpThread.ioModeOf1F1.id);
                map1.put("modeDesc", devpThread.ioModeOf1F1.desc);
                res.add(map1);

                Map<String, Object> map2 = new HashMap<>();
                map2.put("floor", 2);
                map2.put("modeVal", devpThread.ioModeOf1F2.id);
                map2.put("modeDesc", devpThread.ioModeOf1F2.desc);
                res.add(map2);
            } else {
                Map<String, Object> map3 = new HashMap<>();
                map3.put("floor", 3);
                map3.put("modeVal", devpThread.ioModeOf1F3.id);
                map3.put("modeDesc", devpThread.ioModeOf1F3.desc);
                res.add(map3);

                Map<String, Object> map4 = new HashMap<>();
                map4.put("floor", 4);
                map4.put("modeVal", devpThread.ioModeOf1F4.id);
                map4.put("modeDesc", devpThread.ioModeOf1F4.desc);
                res.add(map4);

                Map<String, Object> map5 = new HashMap<>();
                map5.put("floor", 5);
                map5.put("modeVal", devpThread.ioModeOf2F1.id);
                map5.put("modeDesc", devpThread.ioModeOf2F1.desc);
                res.add(map5);

                Map<String, Object> map6 = new HashMap<>();
                map6.put("floor", 6);
                map6.put("modeVal", devpThread.ioModeOf2F2.id);
                map6.put("modeDesc", devpThread.ioModeOf2F2.desc);
                res.add(map6);

                Map<String, Object> map7 = new HashMap<>();
                map7.put("floor", 7);
                map7.put("modeVal", devpThread.ioModeOf3F1.id);
                map7.put("modeDesc", devpThread.ioModeOf3F1.desc);
                res.add(map7);

                Map<String, Object> map8 = new HashMap<>();
                map8.put("floor", 8);
                map8.put("modeVal", devpThread.ioModeOf3F2.id);
                map8.put("modeDesc", devpThread.ioModeOf3F2.desc);
                res.add(map8);
            }



        }
        return R.ok().add(res);
    }

    @PostMapping("/table/site")
    @ManagerAuth(memo = "站点信息表")
@@ -63,6 +126,8 @@
            vo.setPakMk(staProtocol.isPakMk()?"Y":"N");       // 入库标记
            vo.setEmptyMk(staProtocol.isEmptyMk()?"Y":"N");     // 空板信号
            vo.setStaNo(staProtocol.getStaNo());                // 目标站
            vo.setLocType1(staProtocol.isHigh() != staProtocol.isLow() && staProtocol.isLow() ? "小" : "大");     //高低库位
//            vo.setLocType1(devp.getDevNo()==102 ? "高" : "低");
        }
        return R.ok().add(list);
    }
@@ -137,6 +202,7 @@
                    vo.setPakMk(staProtocol.isPakMk()?"Y":"N");       // 需求1
                    vo.setEmptyMk(staProtocol.isEmptyMk()?"Y":"N");     // 空板信号
                    vo.setStaNo(staProtocol.getStaNo());                // 目标站
                    vo.setLocType1(staProtocol.isHigh() != staProtocol.isLow() && staProtocol.isLow() ? "低" : "高");     //高低库位
                    return R.ok().add(vo);
                }
            }
@@ -156,6 +222,11 @@
            for (Map.Entry<Integer, StaProtocol> entry : station.entrySet()) {
                if (siteId.equals(entry.getKey())) {
                    StaProtocol staProtocol = entry.getValue();
                    if (staProtocol == null) {
                        continue;
                    } else {
                        staProtocol = staProtocol.clone();
                    }
                    if (workNo != null) {
                        staProtocol.setWorkNo(workNo);
                    }