Merge remote-tracking branch 'origin/mdqdwcs' into mdqdwcs

cp

2024-01-17 b81d0dbcf5f0899a1bf8f2b9185afdcbc5d270ac

 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);