Merge branch 'tzskasrs-1' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-1

zyx

2023-12-25 6f7a815b2d6e4f30e7ccf901b24d5103aaa72078

 src/main/java/com/zy/common/web/WcsController.java

@@ -1,5 +1,6 @@
package com.zy.common.web;

import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.R;
@@ -59,6 +60,8 @@
    private AgvWrkMastService agvWrkMastService;
    @Autowired
    private WrkMastMapper wrkMastMapper;
    @Autowired
    private WrkMastLogService wrkMastLogService;
//    @Autowired
//    private ErpService erpService;

@@ -426,6 +429,11 @@
            throw new CoolException(dto.getLocNo() + "目标库位已被占用");
        }

        // 保存工作主档历史档
        if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
            throw new CoolException(wrkMast.getWrkNo() + "保存工作主档历史档失败");
        }

        //获取回库提升机目标站
        Integer staNo = liftNo * 100 + locMast.getLev1();
        // 更新工作档数据状态
@@ -437,7 +445,7 @@
        wrkMast.setShuttleNo(null); // 穿梭车清空
        wrkMast.setLiftNo(null);// 提升机清空
        wrkMast.setModiTime(new Date());
        if (wrkMastService.update(wrkMast, new EntityWrapper<WrkMast>().eq("wrk_no", wrkMast.getWrkNo()))) {
        if (!wrkMastService.updateById(wrkMast)) {
            throw new CoolException(wrkMast.getWrkNo() + "更新工作档数据状态失败");
        }

@@ -472,6 +480,9 @@
            if (!locMastService.updateById(locMast)) {
                throw new CoolException("改变库位状态失败");
            }

            List<LocDetl> locDetls1 = locDetlService.selectByLocNo(locMast.getLocNo());
            log.info("工作号：" + wrkMast.getWrkNo() + "，托盘码：" + wrkMast.getBarcode() + "，修改库位状态O=>Q成功，库存明细：" + JSON.toJSONString(locDetls1));
        } else {
            throw new CoolException(dto.getLocNo() + "目标库位已被占用");
        }
@@ -498,6 +509,11 @@
            throw new CoolException("源库位状态异常");
        }

        // 保存工作主档历史档
        if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
            throw new CoolException(wrkMast.getWrkNo() + "保存工作主档历史档失败");
        }

        //获取回库提升机目标站
        Integer staNo = liftNo * 100 + locMast1.getLev1();

@@ -510,7 +526,7 @@
        wrkMast.setShuttleNo(null); // 穿梭车清空
        wrkMast.setLiftNo(null);// 提升机清空
        wrkMast.setModiTime(new Date());
        if (wrkMastService.update(wrkMast, new EntityWrapper<WrkMast>().eq("wrk_no", wrkMast.getWrkNo()))) {
        if (!wrkMastService.updateById(wrkMast)) {
            throw new CoolException(wrkMast.getWrkNo() + "更新工作档数据状态失败");
        }