1

zhang

2025-09-10 5ceb1fc9be10e20d1f6e59382b2d14c8034485cf

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

@@ -1,9 +1,13 @@
package com.zy.asrs.task.handler;

import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.common.Cools;
import com.zy.asrs.entity.*;
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.core.ReturnT;
@@ -36,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;
@@ -59,6 +63,9 @@
                case 10:
                    // 修改库位状态=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);
@@ -81,40 +88,33 @@
                    }
                    // 遍历工作明细，更新库存明细和入库通知档
                    for (WrkDetl wrkDetl : wrkDetls) {

                        LocDetl locDetl = locDetlService.selectItem(locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
                        if (null != locDetl) {
                            if (!locDetlService.updateAnfme(wrkDetl.getAnfme(), wrkMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch())) {
                                exceptionHandle("全板入库 ===>> 更新库存明细失败；[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
                            }
                        } else {
                            locDetl = new LocDetl();
                            LocDetl locDetl = new LocDetl();
                            locDetl.sync(wrkDetl);
                            locDetl.setLocNo(wrkMast.getLocNo()); // 库位号
                            locDetl.setAnfme(wrkDetl.getAnfme()); // 数量
                            locDetl.setZpallet(wrkDetl.getZpallet()); // 托盘条码
                            locDetl.setZpallet(wrkDetl.getZpallet()); // 货架条码
                            locDetl.setModiTime(now);
                            locDetl.setAppeTime(now);
                            if (!locDetlService.insert(locDetl)) {
                                exceptionHandle("全板入库 ===>> 添加库存明细失败；[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
                            }
                        }


                        // 更新入库通知档 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);
//                            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){}

                    }
@@ -136,11 +136,19 @@
                    if (wrkDetls53.isEmpty()) {
                        exceptionHandle("拣料入库 ===>> 工作明细档为空；[workNo={0}]", wrkMast.getWrkNo());
                    }
                    log.info("工作号：" + wrkMast.getWrkNo() + "，货架码：" + wrkMast.getBarcode() + "，工作档明细列表：" + JSON.toJSONString(wrkDetls53));
                    for (WrkDetl wrkDetl : wrkDetls53) {

                        LocDetl locDetl = locDetlService.selectItem(locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
                        LocDetl locDetl = locDetlService.selectItem(locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(),wrkDetl.getSuppCode());
                        if (null != locDetl) {
                            if (!locDetlService.updateAnfme(locDetl.getAnfme() - wrkDetl.getAnfme(), locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch())) {
                            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());
                            }
                        }
@@ -154,7 +162,24 @@
                        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:
@@ -166,9 +191,9 @@
                    // 修改库存明细数量，如无库存，曾新增
                    for (WrkDetl wrkDetl:wrkDetls54) {

                        LocDetl locDetl = locDetlService.selectItem(locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
                        LocDetl locDetl = locDetlService.selectItem(locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(),wrkDetl.getSuppCode());
                        if (null != locDetl) {
                            if (!locDetlService.updateAnfme(wrkDetl.getAnfme(), locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch())) {
                            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 {
@@ -176,7 +201,7 @@
                            locDetl.sync(wrkDetl);
                            locDetl.setLocNo(wrkMast.getLocNo()); // 库位号
                            locDetl.setAnfme(wrkDetl.getAnfme()); // 数量
                            locDetl.setZpallet(wrkDetl.getZpallet()); // 托盘条码
                            locDetl.setZpallet(wrkDetl.getZpallet()); // 货架条码
                            locDetl.setModiTime(now);
                            locDetl.setAppeTime(now);
                            if (!locDetlService.insert(locDetl)) {
@@ -202,8 +227,21 @@
                    if (wrkDetls57.isEmpty()) {
                        exceptionHandle("盘点入库 ===>> 工作明细档为空；[workNo={0}]", wrkMast.getWrkNo());
                    }
                    // 修改库位状态 Q ====>> F
                    if (locMast.getLocSts().equals("Q")) {
                    // 遍历工作明细，更新库存明细和入库通知档
                    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);
@@ -249,7 +287,7 @@
                    break;
            }
            // 修改工作主档状态
            wrkMast.setWrkSts(5L);
            wrkMast.setWrkSts(10L);//10.库存更新完成
            wrkMast.setModiTime(now);
            if (!wrkMastService.updateById(wrkMast)) {
                exceptionHandle("更新入库完成状态失败;[workNo={0}]", wrkMast.getWrkNo());
@@ -274,6 +312,10 @@
            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()) {
@@ -297,6 +339,20 @@
                        }
                    }
                    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
@@ -314,7 +370,7 @@
                    break;
            }
            // 修改工作主档状态
            wrkMast.setWrkSts(15L);
            wrkMast.setWrkSts(30L);//35.库存更新完成
            wrkMast.setModiTime(now);
            if (!wrkMastService.updateById(wrkMast)) {
                exceptionHandle("更新出库完成状态失败;[workNo={0}]", wrkMast.getWrkNo());