#

gtctu

7 天以前 d029518fd1ce9170fcf276b28d76d8d7b4f3a948

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

@@ -615,7 +615,7 @@
        }
    }

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

        try {
@@ -690,8 +690,7 @@
                throw new CoolException("移转失败");
            }
        } catch (Exception e) {
            e.printStackTrace();
            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
            throw new CoolException(e);
        }
    }

@@ -1186,6 +1185,8 @@
        // 出库
        } else if (wrkMast.getIoType() >100  && wrkMast.getWrkSts() > 10) {
            wrkMast.setWrkSts(14L);
        }else if (wrkMast.getIoType() == 200) {
            wrkMast.setWrkSts(5L);
        }
        Date now = new Date();
        wrkMast.setCrnStrTime(DateUtils.calculate(now, 1L, TimeUnit.SECONDS, true));
@@ -1713,7 +1714,7 @@



    @Transactional
    @Transactional(rollbackFor = Exception.class)
    public void stockOutSXK(BasDevp staNo, List<LocDetlDto> locDetlDtos, IoWorkType ioWorkType, Long userId) {
        Date now = new Date();
        // 合并同类项
@@ -1762,6 +1763,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;