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

zjj

2024-04-23 c80d68ee7d5ceb5f93289220a410737da3a7bf9f

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

@@ -93,6 +93,7 @@
                        jsonObject.put("value", 10);//将禁用库位进行设置
                    }
                    jsonObject.put("locNo", locMast.getLocNo());//设置库位号
                    jsonObject.put("locNo$", locMast.getLocNo$());//设置库位号
                    jsonObject.put("locSts", locMast.getLocSts());//库位状态
                    jsonObject.put("barcode", Optional.ofNullable(locMast.getBarcode()).orElse("无"));//托盘号