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

Junjie

2024-11-22 bb748f7f3dc15af31953a20200b1564fb77bfd7a

 src/main/java/com/zy/asrs/utils/Utils.java

@@ -491,6 +491,10 @@
                    continue;
                }

                if (distLocMast.getLocSts().equals("X")) {
                    continue;//调过禁用库位
                }

                //判断该库位是否存在工作档
                EntityWrapper<WrkMast> wrapper = new EntityWrapper<>();
                wrapper.eq("loc_no", locNo);