#

18516761980

2021-08-20 03ef11b551dfd2c62e9f1a45676c44b1d18af150

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

@@ -6,9 +6,10 @@
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.utils.VersionUtils;
import com.zy.ints.entity.WaitMatin;
import com.zy.ints.service.WaitMatinService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;

import java.util.Date;
@@ -18,7 +19,6 @@
 * Created by vincent on 2020/7/4
 */
@Service
@Transactional
public class WorkMastHandler extends AbstractHandler<String> {

    @Autowired
@@ -31,6 +31,8 @@
    private LocDetlService locDetlService;
    @Autowired
    private WaitPakinService waitPakinService;
    @Autowired
    private WaitMatinService waitMatinService;

    public ReturnT<String> start(WrkMast wrkMast) {
        // 4.入库完成
@@ -54,8 +56,8 @@
                // 空板入库
                case 10:
                    // 修改库位状态=D
                    if (locMast.getLocType().equals("S") || locMast.getLocType().equals("Q")) {
                        locMast.setLocType("D");
                    if (locMast.getLocSts().equals("S") || locMast.getLocSts().equals("Q")) {
                        locMast.setLocSts("D");
                        locMast.setIoTime(now);
                        locMast.setModiTime(now);
                        if (!locMastService.updateById(locMast)) {
@@ -77,9 +79,9 @@
                    }
                    // 遍历工作明细，更新库存明细和入库通知档
                    for (WrkDetl wrkDetl : wrkDetls) {
                        LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", wrkMast.getLocNo()).eq("matnr", wrkDetl.getMatnr()));
                        LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", wrkMast.getLocNo()).eq("mat_no", wrkDetl.getMatNo()));
                        if (null != locDetl) {
                            boolean res = locDetlService.updateAnfme(wrkDetl.getAnfme(), wrkMast.getLocNo(), wrkDetl.getMatnr());
                            boolean res = locDetlService.updateAnfme(wrkDetl.getQty()+locDetl.getQty(), wrkMast.getLocNo(), wrkDetl.getMatNo());
                            if (!res) {
                                exceptionHandle("全板入库 ===>> 更新库存明细失败；[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
                            }
@@ -93,20 +95,36 @@
                                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 && updateRes) {
                            exceptionHandle("全板入库 ===>> 更新入库通知档失败；[workNo={0}]", wrkMast.getWrkNo());
                        // 更新入库通知档 ioStatus ===>> 2
                        if(!"0".equals(wrkDetl.getBillNo()) || !"0".equals(wrkDetl.getSeqNo())){
                            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(new Date());
                                boolean res = waitMatinService.update(waitMatin, new EntityWrapper<WaitMatin>().eq("bill_no",wrkDetl.getBillNo()).eq("seq_no",wrkDetl.getSeqNo()));
                                if(!res){
                                    exceptionHandle("全板入库 ===>> 更新入库通知档失败；[workNo={0}],[billNo={1}]", wrkMast.getWrkNo(),wrkDetl.getBillNo());
                                }
                            }
                        }

                        //todo:插入回报档
//                        try {
//                            WaitPakin setParam = new WaitPakin();
//                            setParam.setIoStatus("Y");
//                            boolean updateRes = waitPakinService.update(setParam
//                                    , new EntityWrapper<WaitPakin>().eq("zpallet", wrkDetl.getZpallet())
//                                            .eq("mat_no", wrkDetl.getMatNo())
//                                            .eq("qty", wrkDetl.getQty()));
//                            if (!updateRes && updateRes) {
//                                exceptionHandle("全板入库 ===>> 更新入库通知档失败；[workNo={0}]", wrkMast.getWrkNo());
//                            }
//                        } 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);
@@ -124,17 +142,17 @@
                    }
                    for (WrkDetl wrkDetl:wrkDetls53) {
                        // 修改库存明细数量，如果工作明细数量为0时，删除库存明细
                        LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()).eq("matnr", wrkDetl.getMatnr()));
                        LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()).eq("mat_no", wrkDetl.getMatNo()));
                        if (null != locDetl) {
                            if (!locDetlService.updateAnfme(locDetl.getAnfme() - wrkDetl.getAnfme(), locMast.getLocNo(), wrkDetl.getMatnr())) {
                            if (!locDetlService.updateAnfme(locDetl.getQty() - wrkDetl.getQty(), locMast.getLocNo(), wrkDetl.getMatNo())) {
                                exceptionHandle("拣料入库 ===>> 修改库存明细数量失败；[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
                            }
                            // todo:luxiaotao 3)修改出库通知档 status ==> Y
                            // todo:luxiaotao 3)修改出库通知档 iostatus ==> 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);
@@ -152,10 +170,10 @@
                    }
                    // 修改库存明细数量，如无库存，曾新增
                    for (WrkDetl wrkDetl:wrkDetls54) {
                        LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()).eq("matnr", wrkDetl.getMatnr()));
                        LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()).eq("mat_no", wrkDetl.getMatNo()));
                        if (null != locDetl) {
                            if (!locDetlService.updateAnfme(wrkDetl.getAnfme(), locMast.getLocNo(), wrkDetl.getMatnr())) {
                                exceptionHandle("并板入库 ===>> 修改库存明细数量失败；[workNo={0}],[matnr={1}]", wrkMast.getWrkNo(), wrkDetl.getMatnr());
                            if (!locDetlService.updateAnfme(wrkDetl.getQty()+locDetl.getQty(), locMast.getLocNo(), wrkDetl.getMatNo())) {
                                exceptionHandle("并板入库 ===>> 修改库存明细数量失败；[workNo={0}],[matNo={1}]", wrkMast.getWrkNo(), wrkDetl.getMatNo());
                            }
                        } else {
                            locDetl = new LocDetl();
@@ -164,14 +182,14 @@
                            locDetl.setModiTime(now);
                            locDetl.setAppeTime(now);
                            if (!locDetlService.insert(locDetl)) {
                                exceptionHandle("并板入库 ===>> 新增库存明细失败；[workNo={0}],[matnr={1}]", wrkMast.getWrkNo(), wrkDetl.getMatnr());
                                exceptionHandle("并板入库 ===>> 新增库存明细失败；[workNo={0}],[matNo={1}]", wrkMast.getWrkNo(), wrkDetl.getMatNo());
                            }
                        }
                        // 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);
@@ -189,8 +207,8 @@
                    }
                    // 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);
@@ -202,10 +220,10 @@
                // 库位移转
                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("库位移转 ===>> 转移库存明细数据失败；[源库位={0}],[目标库位={1}]", wrkMast.getSourceLocNo(), wrkMast.getLocNo());
@@ -216,15 +234,15 @@
                    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("库位移转 ===>> 修改源库位状态失败；[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);
@@ -272,8 +290,8 @@
                        exceptionHandle("全板出库 ===>> 删除库存明细失败；[workNo={0}],[sourceLocNo={1}]", wrkMast.getWrkNo(), wrkMast.getSourceLocNo());
                    }
                    // 修改源库位状态 R ===>> O
                    if (locMast.getLocType().equals("R")) {
                        locMast.setLocType("O");
                    if (locMast.getLocSts().equals("R")) {
                        locMast.setLocSts("O");
                        locMast.setBarcode("");
                        locMast.setModiTime(now);
                        locMast.setIoTime(now);
@@ -285,8 +303,8 @@
                // 空板出库
                case 110:
                    // 修改库位状态 R ===>> O
                    if (locMast.getLocType().equals("R")) {
                        locMast.setLocType("O");
                    if (locMast.getLocSts().equals("R")) {
                        locMast.setLocSts("O");
                        locMast.setBarcode("");
                        locMast.setModiTime(now);
                        locMast.setIoTime(now);