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

zjj

2025-07-29 a5e6584d1363b6d2754bd3abd9e7d288a05330df

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

 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java

@@ -181,8 +181,13 @@
        if (!locDetlDtos.isEmpty()) {
            LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetlDtos.get(0).getLocDetl().getLocNo()));
            if (locMast.getLocSts().equals("F") || locMast.getLocSts().equals("D") ){
                // 启动出库开始 101.出库
                stockOut(staNo, locDetlDtos, null, userId);
                if (locMast.getCrnNo() == 7){
                    stockOutSXK(staNo, locDetlDtos, null, userId);
                }else {
                    // 启动出库开始 101.出库
                    stockOut(staNo, locDetlDtos, null, userId);
                }

            }else {
                throw new CoolException("所选库位存在状态不为F、D的库位，库位号："+locMast.getLocNo()+" 、当前状态："+locMast.getLocSts()+"-"+locMast.getLocSts$());
            }