无空库位时，不做空板入库操作

zyx

2024-04-16 45d602719964509214d06ec5173f23e5307d5dfe

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

@@ -1,10 +1,17 @@
package com.zy.asrs.task.handler;

import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.zy.asrs.entity.*;
import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.WrkDetl;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.ReturnT;
import com.zy.asrs.task.core.ReturnT;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -16,6 +23,7 @@
/**
 * Created by vincent on 2020/7/4
 */
@Slf4j
@Service
@Transactional
public class WorkMastHandler extends AbstractHandler<String> {
@@ -32,11 +40,11 @@
    private WaitPakinService waitPakinService;

    public ReturnT<String> start(WrkMast wrkMast) {
        // 4.入库完成
        if (wrkMast.getWrkSts() == 4) {
        // 9.入库完成
        if (wrkMast.getWrkSts() == 9) {
            return doIn(wrkMast);
        // 14.出库完成
        } else  if (wrkMast.getWrkSts() == 14) {
            // 29.出库完成
        } else  if (wrkMast.getWrkSts() == 29) {
            return doOut(wrkMast);
        }
        return SUCCESS;
@@ -49,12 +57,16 @@
            if (null == locMast) {
                exceptionHandle("工作档[workNo={0}]库位号错误[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
            }
            assert locMast != null;
            switch (wrkMast.getIoType()) {
                // 空板入库
                case 10:
                    // 修改库位状态=D
                    if (locMast.getLocType().equals("S") || locMast.getLocType().equals("Q")) {
                        locMast.setLocType("D");
                    if (locMast.getLocSts().equals("S") || locMast.getLocSts().equals("Q")) {
                        if (!Cools.isEmpty(wrkMast.getBarcode())) {
                            locMast.setBarcode(wrkMast.getBarcode());
                        }
                        locMast.setLocSts("D");
                        locMast.setIoTime(now);
                        locMast.setModiTime(now);
                        if (!locMastService.updateById(locMast)) {
@@ -76,50 +88,39 @@
                    }
                    // 遍历工作明细，更新库存明细和入库通知档
                    for (WrkDetl wrkDetl : wrkDetls) {
                        LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", wrkMast.getLocNo()).eq("matnr", wrkDetl.getMatnr()));
                        if (null != locDetl) {
                            boolean res = locDetlService.updateAnfme(wrkDetl.getAnfme(), wrkMast.getLocNo(), wrkDetl.getMatnr());
                            if (!res) {
                                exceptionHandle("全板入库 ===>> 更新库存明细失败；[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
                            }
                        } else {
                            locDetl = new LocDetl(
                                    wrkMast.getLocNo(), // 库位号
                                    wrkDetl.getMatnr(), // 物料号
                                    null,    // 仓库号
                                    null,    // 转储请求编号
                                    null,    // 行项目
                                    null,    // 物料标签ID
                                    wrkDetl.getMaktx(),    // 物料描述
                                    null,    // 工厂
                                    wrkDetl.getAnfme(),    // 数量
                                    wrkDetl.getAltme(),    // 单位
                                    wrkDetl.getZpallet(),    // 托盘条码
                                    null,    // 用户ID
                                    null,    // 备注
                                    null,    // 修改人员
                                    now,    // 修改时间
                                    null,    // 创建者
                                    now    // 添加时间
                            );
                            LocDetl locDetl = new LocDetl();
                            locDetl.sync(wrkDetl);
                            locDetl.setLocNo(wrkMast.getLocNo()); // 库位号
                            locDetl.setAnfme(wrkDetl.getAnfme()); // 数量
                            locDetl.setZpallet(wrkDetl.getZpallet()); // 托盘条码
                            locDetl.setModiTime(now);
                            locDetl.setAppeTime(now);
                            if (!locDetlService.insert(locDetl)) {
                                exceptionHandle("全板入库 ===>> 添加库存明细失败；[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
                            }
                        }
                        // 更新入库通知档 status ===>> Y
                        WaitPakin setParam = new WaitPakin();
                        setParam.setStatus("Y");
                        boolean updateRes = waitPakinService.update(setParam
                                , new EntityWrapper<WaitPakin>().eq("barcode", wrkDetl.getZpallet())
                                        .eq("matnr", wrkDetl.getMatnr())
                                        .eq("anfme", wrkDetl.getAnfme()));
                        if (!updateRes) {
                            exceptionHandle("全板入库 ===>> 更新入库通知档失败；[workNo={0}]", wrkMast.getWrkNo());
                        }


                        // 更新入库通知档 ioStatus ===>> Y
                        try {
//                            Wrapper<WaitPakin> wrapper = new EntityWrapper<WaitPakin>()
//                                    .eq("zpallet", wrkDetl.getZpallet())
//                                    .eq("matnr", wrkDetl.getMatnr())
//                                    .eq("anfme", wrkDetl.getAnfme());
//                            if (Cools.isEmpty(wrkDetl.getBatch())) {
//                                wrapper.eq("batch", wrkDetl.getBatch());
//                            } else {
//                                wrapper.isNull("batch").or().eq("batch", "");
//                            }
//                            WaitPakin setParam = new WaitPakin();
//                            setParam.setIoStatus("Y");
//                            setParam.setModiTime(now);
//                            waitPakinService.update(setParam, wrapper);
                        } catch (Exception ignore){}

                    }
                    // 修改库位状态 S ====>> F
                    if (locMast.getLocType().equals("S")) {
                        locMast.setLocType("F");
                    if (locMast.getLocSts().equals("S")) {
                        locMast.setLocSts("F");
                        locMast.setBarcode(wrkMast.getBarcode());
                        locMast.setIoTime(now);
                        locMast.setModiTime(now);
@@ -135,26 +136,50 @@
                    if (wrkDetls53.isEmpty()) {
                        exceptionHandle("拣料入库 ===>> 工作明细档为空；[workNo={0}]", wrkMast.getWrkNo());
                    }
                    for (WrkDetl wrkDetl:wrkDetls53) {
                        // 修改库存明细数量，如果工作明细数量为0时，删除库存明细
                        LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()).eq("matnr", wrkDetl.getMatnr()));
                    log.info("工作号：" + wrkMast.getWrkNo() + "，托盘码：" + wrkMast.getBarcode() + "，工作档明细列表：" + JSON.toJSONString(wrkDetls53));
                    for (WrkDetl wrkDetl : wrkDetls53) {

                        LocDetl locDetl = locDetlService.selectItem(locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(),wrkDetl.getSuppCode());
                        if (null != locDetl) {
                            if (!locDetlService.updateAnfme(wrkDetl.getAnfme(), locMast.getLocNo(), wrkDetl.getMatnr())) {
                            log.info("工作号：" + wrkMast.getWrkNo() + "，托盘码：" + wrkMast.getBarcode() + "，工作档明细：" + JSON.toJSONString(wrkDetl) + "，库存明细：" + JSON.toJSONString(locDetl));
                            if (!locDetlService.updateAnfme(locDetl.getAnfme() - wrkDetl.getAnfme(),
                                    locMast.getLocNo(),
                                    wrkDetl.getMatnr(),
                                    wrkDetl.getBatch(),
                                    wrkDetl.getSuppCode(),
                                    wrkDetl.getThreeCode(),
                                    wrkDetl.getDeadTime())) {
                                exceptionHandle("拣料入库 ===>> 修改库存明细数量失败；[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
                            }
                            // todo:luxiaotao 3)修改出库通知档 status ==> Y
                        }
                    }
                    // 修改库位状态 Q ====>> F
                    if (locMast.getLocType().equals("Q")) {
                        locMast.setLocType("F");
                    if (locMast.getLocSts().equals("Q")) {
                        locMast.setLocSts("F");
                        locMast.setBarcode(wrkMast.getBarcode());
                        locMast.setIoTime(now);
                        locMast.setModiTime(now);
                        if (!locMastService.updateById(locMast)) {
                            exceptionHandle("拣料入库 ===>> 修改库位状态失败；[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
                        }

                        List<LocDetl> locDetls1 = locDetlService.selectByLocNo(locMast.getLocNo());
                        log.info("工作号：" + wrkMast.getWrkNo() + "，托盘码：" + wrkMast.getBarcode() + "，修改库位状态Q=>F成功，库存明细：" + JSON.toJSONString(locDetls1));
                    }

                    //清空源库位数据 P ====>> O
                    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("改变库位状态失败");
                        }
                        locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no",locMast1.getLocNo()));
                    } else {
                        throw new CoolException("源库位状态异常");
                    }

                    break;
                // 并板入库
                case 54:
@@ -165,40 +190,28 @@
                    }
                    // 修改库存明细数量，如无库存，曾新增
                    for (WrkDetl wrkDetl:wrkDetls54) {
                        LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()).eq("matnr", wrkDetl.getMatnr()));

                        LocDetl locDetl = locDetlService.selectItem(locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(),wrkDetl.getSuppCode());
                        if (null != locDetl) {
                            if (!locDetlService.updateAnfme(wrkDetl.getAnfme(), locMast.getLocNo(), wrkDetl.getMatnr())) {
                            if (!locDetlService.updateAnfme(wrkDetl.getAnfme(), locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(),wrkDetl.getSuppCode(),wrkDetl.getThreeCode(),wrkDetl.getDeadTime())) {
                                exceptionHandle("并板入库 ===>> 修改库存明细数量失败；[workNo={0}],[matnr={1}]", wrkMast.getWrkNo(), wrkDetl.getMatnr());
                            }
                        } else {
                            locDetl = new LocDetl(
                                    wrkMast.getLocNo(), // 库位号
                                    wrkDetl.getMatnr(), // 物料号
                                    null,    // 仓库号
                                    null,    // 转储请求编号
                                    null,    // 行项目
                                    null,    // 物料标签ID
                                    wrkDetl.getMaktx(),    // 物料描述
                                    null,    // 工厂
                                    wrkDetl.getAnfme(),    // 数量
                                    wrkDetl.getAltme(),    // 单位
                                    wrkDetl.getZpallet(),    // 托盘条码
                                    null,    // 用户ID
                                    null,    // 备注
                                    null,    // 修改人员
                                    now,    // 修改时间
                                    null,    // 创建者
                                    now    // 添加时间
                            );
                            locDetl = new LocDetl();
                            locDetl.sync(wrkDetl);
                            locDetl.setLocNo(wrkMast.getLocNo()); // 库位号
                            locDetl.setAnfme(wrkDetl.getAnfme()); // 数量
                            locDetl.setZpallet(wrkDetl.getZpallet()); // 托盘条码
                            locDetl.setModiTime(now);
                            locDetl.setAppeTime(now);
                            if (!locDetlService.insert(locDetl)) {
                                exceptionHandle("并板入库 ===>> 新增库存明细失败；[workNo={0}],[matnr={1}]", wrkMast.getWrkNo(), wrkDetl.getMatnr());
                            }
                        }
                        // todo:luxiaotao 3)修改出库通知档 status ==> Y
                    }
                    // 修改库位状态 Q ====>> F
                    if (locMast.getLocType().equals("Q")) {
                        locMast.setLocType("F");
                    if (locMast.getLocSts().equals("Q")) {
                        locMast.setLocSts("F");
                        locMast.setBarcode(wrkMast.getBarcode());
                        locMast.setIoTime(now);
                        locMast.setModiTime(now);
@@ -212,63 +225,75 @@
                    // 根据工作号，查询工作明细档
                    List<WrkDetl> wrkDetls57 = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
                    if (wrkDetls57.isEmpty()) {
                        exceptionHandle(""); // todo
                        exceptionHandle("盘点入库 ===>> 工作明细档为空；[workNo={0}]", wrkMast.getWrkNo());
                    }
                    // todo:luxiaotao 3)修改盘点通知档 status ==> Y
                    // 修改库位状态 Q ====>> F
                    if (locMast.getLocType().equals("Q")) {
                        locMast.setLocType("F");
                    // 遍历工作明细，更新库存明细和入库通知档
                    for (WrkDetl wrkDetl : wrkDetls57) {
                        LocDetl locDetl = new LocDetl();
                        locDetl.sync(wrkDetl);
                        locDetl.setLocNo(wrkMast.getLocNo()); // 库位号
                        locDetl.setAnfme(wrkDetl.getAnfme()); // 数量
                        locDetl.setZpallet(wrkDetl.getZpallet()); // 托盘条码
                        locDetl.setModiTime(now);
                        locDetl.setAppeTime(now);
                        if (!locDetlService.insert(locDetl)) {
                            exceptionHandle("盘点入库 ===>> 添加库存明细失败；[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
                        }
                    }
                    // 修改库位状态 S ====>> F
                    if (locMast.getLocSts().equals("S")) {
                        locMast.setLocSts(wrkMast.getFullPlt().equals("Y")?"F":"D");
                        locMast.setBarcode(wrkMast.getBarcode());
                        locMast.setIoTime(now);
                        locMast.setModiTime(now);
                        if (!locMastService.updateById(locMast)) {
                            exceptionHandle(""); // todo
                            exceptionHandle("盘点入库 ===>> 修改库位状态失败；[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
                        }
                    }
                    break;
                // 库位移转
                case 11:
                    // 默认目标库位是空板
                    String locType = "D";
                    String locSts = "D";
                    // 库位移转判断是否为空板移转
                    if (wrkMast.getEmptyMk().equals("N")) {
                        locType = "F";
                        locSts = "F";
                        // 转移库存明细数据: 库存号 由工作档源库位变为目标库位
                        if (!locDetlService.updateLocNo(wrkMast.getLocNo(), wrkMast.getSourceLocNo())) {
                            exceptionHandle(""); // todo
                            exceptionHandle("库位移转 ===>> 转移库存明细数据失败；[源库位={0}],[目标库位={1}]", wrkMast.getSourceLocNo(), wrkMast.getLocNo());
                        }
                    }
                    // todo:luxiaotao 3)修改盘点通知档 status ==> Y
                    // 修改源库位状态 ==> O
                    LocMast sourceLoc = locMastService.selectById(wrkMast.getSourceLocNo());
                    if (null != sourceLoc) {
                        sourceLoc.setBarcode("");
                        sourceLoc.setLocType("O");
                        sourceLoc.setLocSts("O");
                        sourceLoc.setModiTime(now);
                        sourceLoc.setIoTime(now);
                        if (!locMastService.updateById(sourceLoc)) {
                            exceptionHandle(""); // todo
                            exceptionHandle("库位移转 ===>> 修改源库位状态失败；[workNo={0}],[sourceLoc={1}]", wrkMast.getWrkNo(), wrkMast.getSourceLocNo());
                        }
                    }
                    // 修改目标库位状态 ==> .locType
                    locMast.setLocType(locType);
                    // 修改目标库位状态 ==> .locSts
                    locMast.setLocSts(locSts);
                    locMast.setBarcode(wrkMast.getBarcode());
                    locMast.setIoTime(now);
                    locMast.setModiTime(now);
                    if (!locMastService.updateById(locMast)) {
                        exceptionHandle(""); // todo
                        exceptionHandle("库位移转 ===>> 修改目标库位状态失败；[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
                    }
                    break;
                default:
                    break;
            }
            // 修改工作主档状态
            wrkMast.setWrkSts(5L);
            wrkMast.setWrkSts(10L);//10.库存更新完成
            wrkMast.setModiTime(now);
            if (!wrkMastService.updateById(wrkMast)) {
                exceptionHandle(""); // todo
                exceptionHandle("更新入库完成状态失败;[workNo={0}]", wrkMast.getWrkNo());
            }
        } catch (Exception e) {
            log.error("fail", e);
            e.printStackTrace();
            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
            return FAIL.setMsg(e.getMessage());
@@ -279,78 +304,84 @@
    private ReturnT<String> doOut(WrkMast wrkMast){
        Date now = new Date();
        LocMast locMast = locMastService.selectById(wrkMast.getSourceLocNo());
        if (null == locMast) {
            exceptionHandle(""); // todo
            return;
        }
        switch (wrkMast.getIoType()) {
            // 全板出库
            case 101:
                // 根据工作号，查询工作明细档
                List<WrkDetl> wrkDetls101 = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
                if (wrkDetls101.isEmpty()) {
                    exceptionHandle(""); // todo
                }
                for (WrkDetl wrkDetl : wrkDetls101) {
                    // todo:luxiaotao 3)修改出库通知档 status ==> Y
                }
                // 删除工作档源库位的库存明细
                if (!locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no", wrkMast.getSourceLocNo()))) {
                    exceptionHandle(""); // todo
                }
                // 修改库位状态 R ===>> O
                if (locMast.getLocType().equals("R")) {
                    locMast.setLocType("O");
                    locMast.setBarcode("");
                    locMast.setModiTime(now);
                    locMast.setIoTime(now);
                    if (!locMastService.updateById(locMast)) {
                        exceptionHandle(""); // todo
                    }
                }
                break;
            // 空板出库
            case 110:
                // 修改库位状态 R ===>> O
                if (locMast.getLocType().equals("R")) {
                    locMast.setLocType("O");
                    locMast.setBarcode("");
                    locMast.setModiTime(now);
                    locMast.setIoTime(now);
                    if (!locMastService.updateById(locMast)) {
                        exceptionHandle(""); // todo
                    }
                }
                break;
            default:
                break;
        }
        // 修改工作主档状态
        wrkMast.setWrkSts(15L);
        wrkMast.setModiTime(now);
        if (!wrkMastService.updateById(wrkMast)) {
            exceptionHandle(""); // todo
        }
    }

    public static void main(String[] args) {
        for (int i = 0;i<10;i++) {

            try {

                System.out.println("====" + i);
                if (i == 5){
                    throw new Exception("dsa");
                }
                System.out.println("----" + i);

            } catch (Exception e) {
                e.printStackTrace();
        try {
            if (null == locMast) {
                exceptionHandle("工作档[workNo={0}]库位号错误[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
            }



            assert locMast != null;
            switch (wrkMast.getIoType()) {
                // 全板出库
                case 101:
                    // 出库确认信号位
//                    if (Cools.isEmpty(wrkMast.getInvWh()) || wrkMast.getInvWh().equals("N")) {
//                        return SUCCESS;
//                    }
                    // 根据工作号，查询工作明细档
                    List<WrkDetl> wrkDetls101 = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
                    if (wrkDetls101.isEmpty()) {
                        exceptionHandle("全板出库 ===>> 工作明细档为空；[workNo={0}]", wrkMast.getWrkNo());
                    }
                    for (WrkDetl wrkDetl : wrkDetls101) {
                        // todo:luxiaotao 3)修改出库通知档 status ==> Y
                    }
                    // 删除工作档源库位的库存明细
                    if (!locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no", wrkMast.getSourceLocNo()))) {
                        exceptionHandle("全板出库 ===>> 删除库存明细失败；[workNo={0}],[sourceLocNo={1}]", wrkMast.getWrkNo(), wrkMast.getSourceLocNo());
                    }
                    // 修改源库位状态 R ===>> O
                    if (locMast.getLocSts().equals("R")) {
                        locMast.setLocSts("O");
                        locMast.setBarcode("");
                        locMast.setModiTime(now);
                        locMast.setIoTime(now);
                        if (!locMastService.updateById(locMast)) {
                            exceptionHandle("全板出库 ===>> 修改源库位状态失败；[workNo={0}],[sourceLocNo={1}]", wrkMast.getWrkNo(), wrkMast.getSourceLocNo());
                        }
                    }
                    break;
                //盘点出库
                case 107:
                    // 修改库位状态 R ===>> O
                    if (locMast.getLocSts().equals("P")) {
                        locMast.setLocSts("O");
                        locMast.setBarcode("");
                        locMast.setModiTime(now);
                        locMast.setIoTime(now);
                        if (!locMastService.updateById(locMast)) {
                            exceptionHandle("盘点出库 ===>> 修改源库位状态失败；[workNo={0}],[sourceLocNo={1}]", wrkMast.getWrkNo(), wrkMast.getSourceLocNo());
                        }
                        locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no",locMast.getLocNo()));
                    }
                    return SUCCESS;//盘点只处理库存数据不改变工作档状态
                // 空板出库
                case 110:
                    // 修改库位状态 R ===>> O
                    if (locMast.getLocSts().equals("R")) {
                        locMast.setLocSts("O");
                        locMast.setBarcode("");
                        locMast.setModiTime(now);
                        locMast.setIoTime(now);
                        if (!locMastService.updateById(locMast)) {
                            exceptionHandle("空板出库 ===>> 修改源库位状态失败；[workNo={0}],[sourceLocNo={1}]", wrkMast.getWrkNo(), wrkMast.getSourceLocNo());
                        }
                    }
                    break;
                default:
                    break;
            }
            // 修改工作主档状态
            wrkMast.setWrkSts(30L);//35.库存更新完成
            wrkMast.setModiTime(now);
            if (!wrkMastService.updateById(wrkMast)) {
                exceptionHandle("更新出库完成状态失败;[workNo={0}]", wrkMast.getWrkNo());
            }
        } catch (Exception e) {
            log.error("fail", e);
            e.printStackTrace();
            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
            return FAIL.setMsg(e.getMessage());
        }
        return SUCCESS;
    }

}