#

lsh

2025-08-21 283e991f280136bc00e87ac688eb4b313e9b828f

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

@@ -615,14 +615,14 @@
        }
    }

    @Transactional
    @Transactional(rollbackFor = Exception.class)
    public void moveLocForDeepLoc(LocMast shallowLoc) {

        try {
            LocTypeDto locTypeDto = new LocTypeDto();
            locTypeDto.setLocType1(shallowLoc.getLocType1());
            locTypeDto.setLev1(shallowLoc.getLev1());
            StartupDto dto = commonService.getLocNo( 1, 31002, null,null,null, locTypeDto, false);
            StartupDto dto = commonService.getLocNo( 11, 31002, null,null,null, locTypeDto, false);
            if (Cools.isEmpty(dto)){
                throw new CoolException("移库未找到库位");
            }
@@ -690,8 +690,7 @@
                throw new CoolException("移转失败");
            }
        } catch (Exception e) {
            e.printStackTrace();
            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
            throw new CoolException(e);
        }
    }

@@ -1713,7 +1712,7 @@



    @Transactional
    @Transactional(rollbackFor = Exception.class)
    public void stockOutSXK(BasDevp staNo, List<LocDetlDto> locDetlDtos, IoWorkType ioWorkType, Long userId) {
        Date now = new Date();
        // 合并同类项
@@ -1762,6 +1761,9 @@
                        .eq("loc_type1",locMast.getLocType1())
                        .orderBy("bay1", true));
            }
            if (locMasts.isEmpty()){
                throw new CoolException("数据错误，未找到库位组");
            }
            for (LocMast locMast1 : locMasts) {
                if (locMast1.getLocNo().equals(dto.getLocNo())){
                    break;