luxiaotao1123
2021-06-17 dd24a28b493ab8fccc9270f93dd5e690988d2932
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -1,6 +1,7 @@
package com.zy.asrs.task.handler;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
@@ -31,6 +32,8 @@
    private LocDetlService locDetlService;
    @Autowired
    private WaitPakinService waitPakinService;
    @Autowired
    private BasDevpService basDevpService;
    public ReturnT<String> start(WrkMast wrkMast) {
        // 4.入库完成
@@ -215,17 +218,21 @@
                        }
                    }
                    // todo:luxiaotao 3)修改盘点通知档 status ==> Y
                    // 修改源库位状态 ==> O
                    LocMast sourceLoc = locMastService.selectById(wrkMast.getSourceLocNo());
                    if (null != sourceLoc) {
                        sourceLoc.setBarcode("");
                        sourceLoc.setLocSts("O");
                        sourceLoc.setModiTime(now);
                        sourceLoc.setIoTime(now);
                        if (!locMastService.updateById(sourceLoc)) {
                            exceptionHandle("库位移转 ===>> 修改源库位状态失败;[workNo={0}],[sourceLoc={1}]", wrkMast.getWrkNo(), wrkMast.getSourceLocNo());
                    // 入库阻塞库位移转标记
                    if (Cools.isEmpty(wrkMast.getCtnNo()) || !wrkMast.getCtnNo().equals("Y")) {
                        // 修改源库位状态 ==> O
                        LocMast sourceLoc = locMastService.selectById(wrkMast.getSourceLocNo());
                        if (null != sourceLoc) {
                            sourceLoc.setBarcode("");
                            sourceLoc.setLocSts("O");
                            sourceLoc.setModiTime(now);
                            sourceLoc.setIoTime(now);
                            if (!locMastService.updateById(sourceLoc)) {
                                exceptionHandle("库位移转 ===>> 修改源库位状态失败;[workNo={0}],[sourceLoc={1}]", wrkMast.getWrkNo(), wrkMast.getSourceLocNo());
                            }
                        }
                    }
                    // 修改目标库位状态 ==> .locSts
                    locMast.setLocSts(locSts);
                    locMast.setBarcode(wrkMast.getBarcode());
@@ -284,6 +291,12 @@
                            exceptionHandle("全板出库 ===>> 修改源库位状态失败;[workNo={0}],[sourceLocNo={1}]", wrkMast.getWrkNo(), wrkMast.getSourceLocNo());
                        }
                    }
                    // 修改工作主档状态
                    wrkMast.setWrkSts(15L);
                    wrkMast.setModiTime(now);
                    if (!wrkMastService.updateById(wrkMast)) {
                        exceptionHandle("更新出库完成状态失败;[workNo={0}]", wrkMast.getWrkNo());
                    }
                    break;
                // 空板出库
                case 110:
@@ -297,16 +310,29 @@
                            exceptionHandle("空板出库 ===>> 修改源库位状态失败;[workNo={0}],[sourceLocNo={1}]", wrkMast.getWrkNo(), wrkMast.getSourceLocNo());
                        }
                    }
                    // 修改工作主档状态
                    wrkMast.setWrkSts(15L);
                    wrkMast.setModiTime(now);
                    if (!wrkMastService.updateById(wrkMast)) {
                        exceptionHandle("更新出库完成状态失败;[workNo={0}]", wrkMast.getWrkNo());
                    }
                    break;
                // 盘点出库
                case 107:
                    BasDevp basDevp = basDevpService.selectById(wrkMast.getStaNo());
                    if (basDevp.getWrkNo().equals(wrkMast.getWrkNo())) {
                        // 修改工作主档状态
                        wrkMast.setWrkSts(15L);
                        wrkMast.setModiTime(now);
                        if (!wrkMastService.updateById(wrkMast)) {
                            exceptionHandle("更新出库完成状态失败;[workNo={0}]", wrkMast.getWrkNo());
                        }
                    }
                    break;
                default:
                    break;
            }
            // 修改工作主档状态
            wrkMast.setWrkSts(15L);
            wrkMast.setModiTime(now);
            if (!wrkMastService.updateById(wrkMast)) {
                exceptionHandle("更新出库完成状态失败;[workNo={0}]", wrkMast.getWrkNo());
            }
        } catch (Exception e) {
            e.printStackTrace();
            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();