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

zyx

2023-12-22 9b3eeec64465760a4f351f63335f6693c30dda73

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

@@ -5,6 +5,7 @@
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.mapper.WrkMastMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.Utils;
import com.zy.common.CodeRes;
@@ -56,6 +57,10 @@
    private AgvBasDevpService agvBasDevpService;
    @Autowired
    private AgvWrkMastService agvWrkMastService;
    @Autowired
    private WrkMastMapper wrkMastMapper;
    @Autowired
    private WrkMastLogService wrkMastLogService;
//    @Autowired
//    private ErpService erpService;

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

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

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

@@ -495,6 +505,11 @@
            throw new CoolException("源库位状态异常");
        }

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

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

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