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

zyx

2024-01-22 39823cc541903490dbfa93fd68a629b90f5aafb2

 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;
@@ -428,6 +429,11 @@
            throw new CoolException(dto.getLocNo() + "目标库位已被占用");
        }

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

        //获取回库提升机目标站
        Integer staNo = liftNo * 100 + locMast.getLev1();
        // 更新工作档数据状态
@@ -441,11 +447,6 @@
        wrkMast.setModiTime(new Date());
        if (!wrkMastService.updateById(wrkMast)) {
            throw new CoolException(wrkMast.getWrkNo() + "更新工作档数据状态失败");
        }

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

        return dto;
@@ -479,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() + "目标库位已被占用");
        }
@@ -493,16 +497,27 @@
            }
        }

        //清空源库位数据
        //检查目标库位，库存明细是否添加成功
        List<LocDetl> checkLocDetls = locDetlService.selectByLocNo(dto.getLocNo());
        if (checkLocDetls.isEmpty()) {
            throw new CoolException("库存明细迁移失败");
        }

//        //清空源库位数据
        LocMast locMast1 = locMastService.selectByLoc(wrkMast.getSourceLocNo());
        if (locMast1.getLocSts().equals("P")) {
            locMast1.setLocSts("O"); // 清空库位
            locMast1.setModiTime(new Date());
            if (!locMastService.updateById(locMast1)) {
                throw new CoolException("改变库位状态失败");
            }
        } else {
            throw new CoolException("源库位状态异常");
//        if (locMast1.getLocSts().equals("P")) {
//            locMast1.setLocSts("O"); // 清空库位
//            locMast1.setModiTime(new Date());
//            if (!locMastService.updateById(locMast1)) {
//                throw new CoolException("改变库位状态失败");
//            }
//        } else {
//            throw new CoolException("源库位状态异常");
//        }

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

        //获取回库提升机目标站
@@ -519,11 +534,6 @@
        wrkMast.setModiTime(new Date());
        if (!wrkMastService.updateById(wrkMast)) {
            throw new CoolException(wrkMast.getWrkNo() + "更新工作档数据状态失败");
        }

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

        return dto;