#

zjj

2024-12-25 5e99301887e7e7e2a2218dbfa3b395a7847f7a82

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

@@ -89,7 +89,7 @@
//            vo.setLocType1(staProtocol.isHigh() != staProtocol.isLow() && staProtocol.isLow() ? "小" : "大");     //高低库位
            vo.setLocType1(devp.getLocType1$());
            vo.setAutoIn(staProtocol.isEmptyInPalletRequire()?"Y":"N");
            vo.setAutoIn(staProtocol.isEmptyOutPalletRequire()?"Y":"N");
            vo.setAutoOut(staProtocol.isEmptyOutPalletRequire()?"Y":"N");
//            vo.setLocType1(devp.getDevNo()==102 ? "高" : "低");
        }
        return R.ok().add(list);
@@ -232,7 +232,8 @@
                        staProtocol.setStaNo(staNo);
                    }
                    if (pakMk != null) {
                        staProtocol.setPakMk(pakMk.equals("Y"));
                        devpThread.setPakMk(staProtocol.getSiteId(),pakMk.equals("Y"));
//                        staProtocol.setPakMk(pakMk.equals("Y"));
                    }
                    boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                    if (result) {