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

zc

2024-09-03 f392d5e620f5c182281e7b8f3166d4a6a93d3090

 src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java

@@ -67,10 +67,8 @@
            boolean sign = true;
            for (Integer crnNo : crns){
                sign = true;
                //宜科专用  大小托盘
                short locType1= staNo==112? (short)1 : (short)2;//1:"小托盘"、2:"大托盘"
                // 获取库位
                LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts",locStsTarget).eq("crn_no",crnNo).eq("loc_type1",locType1));

                LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts",locStsTarget).eq("crn_no",crnNo));

                if (Cools.isEmpty(locMast)) {
//                    throw new CoolException("库中无空板！！！");