#

yxFwq

2024-11-24 a7f0ee46f5a1b0ec8cf7bd3d0701bde6c09de24f

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

@@ -39,6 +39,7 @@
    @Autowired
    private WrkMastService wrkMastService;

    @Transactional
    public ReturnT<String> start(WrkMast wrkMast,WrkMast wrkMastOther) {
        try {
            Date now = new Date();
@@ -73,7 +74,6 @@

            WrkMastCrn wrkMastCrn = new WrkMastCrn(wrkMast,wrkMastOther,now);

            wrkMastCrnService.insert(wrkMastCrn);

            // 更新目标库位状态
            LocMast locMast = locMastService.selectById(wrkMast.getLocNo());
@@ -87,7 +87,6 @@
                throw new CoolException(locMast1.getLocNo()+"目标库位已被占用");
            }

            wrkMastService.updateById(wrkMast);

            // 更新目标库位状态
            LocMast locMastOther = locMastService.selectById(wrkMastOther.getLocNo());
@@ -100,7 +99,10 @@
            } else {
                throw new CoolException(locMast1.getLocNo()+"目标库位已被占用");
            }
            wrkMastService.updateById(wrkMast);
            wrkMastService.updateById(wrkMastOther);

            wrkMastCrnService.insert(wrkMastCrn);

        }catch (Exception e){
            log.error("异常！！！"+e);
@@ -119,7 +121,7 @@
            if (Cools.isEmpty(deepLocOther)){
                return FAIL;
            }
            WrkMast wrkMastOther = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("source_loc_no", deepLocOther));
            WrkMast wrkMastOther = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("source_loc_no", deepLocOther).eq("wrk_sts", 11L));
            if (!Cools.isEmpty(wrkMastOther)){
                WrkMastCrn wrkMastCrn = new WrkMastCrn(wrkMast,wrkMastOther,now);
                wrkMastCrnService.insert(wrkMastCrn);