字段添加完成，测试完成

wang..123

2022-02-15 7182f72ba4781c620eebdf501ca46b3f69f5585d

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

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

import com.baomidou.mybatisplus.mapper.EntityWrapper;
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.LocDetlService;
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.WrkDetlService;
import com.zy.asrs.service.WrkMastService;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.common.Cools;
import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.utils.VersionUtils;
@@ -19,6 +15,7 @@
import com.zy.ints.service.WaitMatinService;
import com.zy.ints.service.WaitMatoutService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.interceptor.TransactionAspectSupport;

@@ -45,6 +42,15 @@
    private WaitMatoutService waitMatoutService;
    @Autowired
    private IoCompleteService ioCompleteService;
    @Autowired
    private PltBarcodeService pltBarcodeService;
    @Autowired
    private  MatCodeService matCodeService;
    /**
     * ERP接口是否启用
     */
    @Value("${erp.enabled}")
    private Boolean erpEnabled;

    public ReturnT<String> start(WrkMast wrkMast) {
        // 4.入库完成
@@ -69,6 +75,7 @@
                case 10:
                    // 修改库位状态=D
                    if (locMast.getLocSts().equals("S") || locMast.getLocSts().equals("Q")) {
                        locMast.setFullPlt(wrkMast.getFullPlt());
                        locMast.setLocSts("D");
                        locMast.setIoTime(now);
                        locMast.setModiTime(now);
@@ -91,25 +98,55 @@
                    }
                    // 遍历工作明细，更新库存明细和入库通知档
                    for (WrkDetl wrkDetl : wrkDetls) {
                        LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", wrkMast.getLocNo()).eq("mat_no", wrkDetl.getMatNo()));
                        LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", wrkMast.getLocNo()).eq("mat_no", wrkDetl.getMatNo()).eq("supplier", wrkDetl.getSupplier()));
                        if (null != locDetl) {
                            boolean res = locDetlService.updateAnfme(wrkDetl.getQty()+locDetl.getQty(), wrkMast.getLocNo(), wrkDetl.getMatNo());
                            boolean res = locDetlService.updateAnfme(wrkDetl.getQty()+locDetl.getQty(), wrkMast.getLocNo(), wrkDetl.getMatNo(),wrkDetl.getSupplier());


                            if (!res) {
                                exceptionHandle("全板入库 ===>> 更新库存明细失败；[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
                            }
                        } else {
                            WrkDetl wrk_no = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>()
                                    .eq("wrk_no", wrkMast.getWrkNo()).eq("mat_no",wrkDetl.getMatNo()).eq("supplier",wrkDetl.getSupplier()));

                            MatCode matCode = matCodeService.selectOne(new EntityWrapper<MatCode>().eq("mat_no", wrkDetl.getMatNo()));
                            locDetl = new LocDetl();
                            
                            locDetl.setLocNo(wrkMast.getLocNo()); // 库位号
                            locDetl.setMemo(wrkMast.getMemo());
                            VersionUtils.setLocDetl(locDetl, wrkDetl); // 版本控制
                            locDetl.setModiTime(now);
                            locDetl.setAppeTime(now);
                            locDetl.setAllQty(wrk_no.getAllQty());
                            locDetl.setAllWeight(wrk_no.getAllWeight());
                            locDetl.setSource(wrk_no.getSource());
                            locDetl.setVendor(wrk_no.getVendor());
                            locDetl.setWeight(matCode.getWeight());
                            locDetl.setQtyBox(matCode.getStr6());
                            if (!Cools.isEmpty(wrk_no)){
                                locDetl.setMemo(wrk_no.getMemo());
                                locDetl.setSupplier(wrk_no.getSupplier());
                            }
                            if (!locDetlService.insert(locDetl)) {
                                exceptionHandle("全板入库 ===>> 添加库存明细失败；[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
                            }
                        }

                        // 更新入库通知档 ioStatus ====>> 2
                        WaitMatin waitMatin = waitMatinService.selectOne(new EntityWrapper<WaitMatin>().eq("bill_no",wrkDetl.getBillNo()).eq("seq_no",wrkDetl.getSeqNo()));
                    //更新组托数据状态为入库完成 IoStatus ====>> 2
                    Wrapper<PltBarcode> wrapper = new EntityWrapper<PltBarcode>().eq("barcode", wrkDetl.getZpallet())
                            .eq("bill_no", wrkDetl.getBillNo()).eq("seq_no", wrkDetl.getSeqNo()).eq("mat_no", wrkDetl.getMatNo());
                    PltBarcode pltBarcode = pltBarcodeService.selectOne(wrapper);
                    if(null != pltBarcode) {
                        pltBarcode.setIoStatus(2);//入库完成
                        boolean res = pltBarcodeService.update(pltBarcode, wrapper);
                        if(!res){
//                                exceptionHandle("全板入库 ===>> 更新组托数据失败；[workNo={0}],[billNo={1}],[seqNo={2}]", wrkMast.getWrkNo(),wrkDetl.getBillNo(),wrkDetl.getSeqNo());
                        }
                    }

                    // 更新入库通知档 ioStatus ====>> 2
                    WaitMatin waitMatin = waitMatinService.selectOne(new EntityWrapper<WaitMatin>().eq("bill_no",wrkDetl.getBillNo()).eq("seq_no",wrkDetl.getSeqNo()));
                        if(null != waitMatin && waitMatin.getInQty() >= waitMatin.getQty()){
                            waitMatin.setIoStatus(2);
                            waitMatin.setModiTime(now);
@@ -120,7 +157,7 @@
                        }

                        //插入回报档 insert ====>> io_complete
                        if("Y".equals(wrkMast.getLinkMis())){
                        if(erpEnabled && "Y".equals(wrkMast.getLinkMis())){
                            IoComplete ioComplete = new IoComplete();
                            ioComplete.setBillNo(wrkDetl.getBillNo());
                            ioComplete.setSeqNo(wrkDetl.getSeqNo());
@@ -142,6 +179,7 @@
                    }
                    // 修改库位状态 S ====>> F
                    if (locMast.getLocSts().equals("S")) {
                        locMast.setFullPlt(wrkMast.getFullPlt());
                        locMast.setLocSts("F");
                        locMast.setBarcode(wrkMast.getBarcode());
                        locMast.setIoTime(now);
@@ -162,7 +200,7 @@
                        // 修改库存明细数量，如果工作明细数量为0时，删除库存明细
                        LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()).eq("mat_no", wrkDetl.getMatNo()));
                        if (null != locDetl) {
                            if (!locDetlService.updateAnfme(locDetl.getQty() - wrkDetl.getQty(), locMast.getLocNo(), wrkDetl.getMatNo())) {
                            if (!locDetlService.updateAnfme(locDetl.getQty() - wrkDetl.getQty(), locMast.getLocNo(), wrkDetl.getMatNo(),wrkDetl.getSupplier())) {
                                exceptionHandle("拣料入库 ===>> 修改库存明细数量失败；[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
                            }

@@ -178,7 +216,7 @@
                            }

                            //插入回报档 insert ====>> io_complete
                            if("Y".equals(wrkMast.getLinkMis())){
                            if(erpEnabled && "Y".equals(wrkMast.getLinkMis())){
                                IoComplete ioComplete = new IoComplete();
                                ioComplete.setBillNo(wrkDetl.getBillNo());
                                ioComplete.setSeqNo(wrkDetl.getSeqNo());
@@ -200,6 +238,7 @@
                    }
                    // 修改库位状态 Q ====>> F
                    if (locMast.getLocSts().equals("Q")) {
                        locMast.setFullPlt(wrkMast.getFullPlt());
                        locMast.setLocSts("F");
                        locMast.setBarcode(wrkMast.getBarcode());
                        locMast.setIoTime(now);
@@ -220,7 +259,7 @@
                    for (WrkDetl wrkDetl:wrkDetls54) {
                        LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()).eq("mat_no", wrkDetl.getMatNo()));
                        if (null != locDetl) {
                            if (!locDetlService.updateAnfme(wrkDetl.getQty()+locDetl.getQty(), locMast.getLocNo(), wrkDetl.getMatNo())) {
                            if (!locDetlService.updateAnfme(wrkDetl.getQty()+locDetl.getQty(), locMast.getLocNo(), wrkDetl.getMatNo(),wrkDetl.getSupplier())) {
                                exceptionHandle("并板入库 ===>> 修改库存明细数量失败；[workNo={0}],[matNo={1}]", wrkMast.getWrkNo(), wrkDetl.getMatNo());
                            }
                        } else {
@@ -246,7 +285,7 @@
                        }

                        //插入回报档 insert ====>> io_complete
                        if("Y".equals(wrkMast.getLinkMis())){
                        if(erpEnabled && "Y".equals(wrkMast.getLinkMis())){
                            IoComplete ioComplete = new IoComplete();
                            ioComplete.setBillNo(wrkDetl.getBillNo());
                            ioComplete.setSeqNo(wrkDetl.getSeqNo());
@@ -268,6 +307,7 @@
                    }
                    // 修改库位状态 Q ====>> F
                    if (locMast.getLocSts().equals("Q")) {
                        locMast.setFullPlt(wrkMast.getFullPlt());
                        locMast.setLocSts("F");
                        locMast.setBarcode(wrkMast.getBarcode());
                        locMast.setIoTime(now);
@@ -286,6 +326,7 @@
                    }
                    // 修改库位状态 Q ====>> F
                    if (locMast.getLocSts().equals("Q")) {
                        locMast.setFullPlt(wrkMast.getFullPlt());
                        locMast.setLocSts("F");
                        locMast.setBarcode(wrkMast.getBarcode());
                        locMast.setIoTime(now);
@@ -309,7 +350,9 @@
                    }
                    // 修改源库位状态 ==> O
                    LocMast sourceLoc = locMastService.selectById(wrkMast.getSourceLocNo());
                    String fullPlt = sourceLoc.getFullPlt();
                    if (null != sourceLoc) {
                        sourceLoc.setFullPlt("N");
                        sourceLoc.setBarcode("");
                        sourceLoc.setLocSts("O");
                        sourceLoc.setModiTime(now);
@@ -319,6 +362,7 @@
                        }
                    }
                    // 修改目标库位状态 ==> .locSts
                    locMast.setFullPlt(fullPlt);
                    locMast.setLocSts(locSts);
                    locMast.setBarcode(wrkMast.getBarcode());
                    locMast.setIoTime(now);
@@ -371,7 +415,7 @@
                        }

                        //插入回报档 insert ====>> io_complete
                        if("Y".equals(wrkMast.getLinkMis())){
                        if(erpEnabled && "Y".equals(wrkMast.getLinkMis())){
                            IoComplete ioComplete = new IoComplete();
                            ioComplete.setBillNo(wrkDetl.getBillNo());
                            ioComplete.setSeqNo(wrkDetl.getSeqNo());
@@ -396,6 +440,7 @@
                    }
                    // 修改源库位状态 R ===>> O
                    if (locMast.getLocSts().equals("R")) {
                        locMast.setFullPlt("N");
                        locMast.setLocSts("O");
                        locMast.setBarcode("");
                        locMast.setModiTime(now);
@@ -409,6 +454,7 @@
                case 110:
                    // 修改库位状态 R ===>> O
                    if (locMast.getLocSts().equals("R")) {
                        locMast.setFullPlt("N");
                        locMast.setLocSts("O");
                        locMast.setBarcode("");
                        locMast.setModiTime(now);