#

18516761980

2021-08-20 03ef11b551dfd2c62e9f1a45676c44b1d18af150

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

@@ -6,6 +6,8 @@
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.interceptor.TransactionAspectSupport;
@@ -29,6 +31,8 @@
    private LocDetlService locDetlService;
    @Autowired
    private WaitPakinService waitPakinService;
    @Autowired
    private WaitMatinService waitMatinService;

    public ReturnT<String> start(WrkMast wrkMast) {
        // 4.入库完成
@@ -77,7 +81,7 @@
                    for (WrkDetl wrkDetl : wrkDetls) {
                        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.getQty(), wrkMast.getLocNo(), wrkDetl.getMatNo());
                            boolean res = locDetlService.updateAnfme(wrkDetl.getQty()+locDetl.getQty(), wrkMast.getLocNo(), wrkDetl.getMatNo());
                            if (!res) {
                                exceptionHandle("全板入库 ===>> 更新库存明细失败；[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
                            }
@@ -91,18 +95,31 @@
                                exceptionHandle("全板入库 ===>> 添加库存明细失败；[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
                            }
                        }
                        // 更新入库通知档 ioStatus ===>> Y
                        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());
                        // 更新入库通知档 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());
                                }
                            }
                        } catch (Exception ignore){}
                        }

                        //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
@@ -130,7 +147,7 @@
                            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
@@ -155,7 +172,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(), locMast.getLocNo(), wrkDetl.getMatNo())) {
                            if (!locDetlService.updateAnfme(wrkDetl.getQty()+locDetl.getQty(), locMast.getLocNo(), wrkDetl.getMatNo())) {
                                exceptionHandle("并板入库 ===>> 修改库存明细数量失败；[workNo={0}],[matNo={1}]", wrkMast.getWrkNo(), wrkDetl.getMatNo());
                            }
                        } else {