#

18516761980

2021-09-29 15c8f00ab3a1e3d2d96b56bae0ec11efedd60231

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

@@ -31,14 +31,12 @@
    private LocDetlService locDetlService;
    @Autowired
    private WaitPakinService waitPakinService;
    @Autowired
    private BasDevpService basDevpService;

    public ReturnT<String> start(WrkMast wrkMast) {
        // 4.入库完成
        if (wrkMast.getWrkSts() == 4) {
            return doIn(wrkMast);
        // 14.出库完成
            // 14.出库完成
        } else  if (wrkMast.getWrkSts() == 14) {
            return doOut(wrkMast);
        }
@@ -286,12 +284,6 @@
                            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:
@@ -305,29 +297,16 @@
                            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();