*

lsh

3 天以前 fc6a73660fb4c76a2b0479bb8108768b7ff0d146

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

@@ -40,6 +40,15 @@
    private WrkMastStaService wrkMastStaService;
    @Autowired
    private WrkMastStaLogService wrkMastStaLogService;
    @Autowired
    private WrkMastSplitTwinService wrkMastSplitTwinService;
    @Autowired
    private WrkMastSplitTwinLogService wrkMastSplitTwinLogService;
    @Autowired
    private WrkMastCrnService wrkMastCrnService;
    @Autowired
    private WrkMastCrnLogService wrkMastCrnLogService;


    @Transactional
    public ReturnT<String> start(WrkMast wrkMast) {
@@ -74,12 +83,14 @@
                            log.error("删除入库通知档[workNo={"+wrkMast.getWrkNo()+"}]失败");
                        }
                    }
//                    // 手动入库生成单据 【 上报三方平台 】
//                    if (!Cools.isEmpty(wrkDetls)) {
//                        if (!orderService.saveHandlerOrder(Boolean.TRUE, wrkMast, wrkDetls)) {
//                            exceptionHandle("生成手动入库单据[workNo={0}]失败", wrkMast.getWrkNo());
//                        }
//                    }
                    if (wrkMast.getCrnNo()>2 && wrkMast.getCrnNo()<6){
                        // 手动入库生成单据 【 上报三方平台 】
                        if (!Cools.isEmpty(wrkDetls)) {
                            if (!orderService.saveHandlerOrder(Boolean.TRUE, wrkMast, wrkDetls)) {
                                exceptionHandle("生成手动入库单据[workNo={0}]失败", wrkMast.getWrkNo());
                            }
                        }
                    }
                // 拣料再入库
                } else if (wrkMast.getIoType() == 53) {
//                    if (!Cools.isEmpty(wrkDetls)) {
@@ -152,4 +163,47 @@
        return SUCCESS;
    }

    @Transactional
    public ReturnT<String> start(WrkMastSplitTwin wrkMastSplitTwin) {
        try {
            WrkMastSplitTwinLog wrkMastSplitTwinLog = new WrkMastSplitTwinLog();
            wrkMastSplitTwinLog.sync(wrkMastSplitTwin);
            // 保存工作主档历史档
            if (!wrkMastSplitTwinLogService.insert(wrkMastSplitTwinLog)) {
                exceptionHandle("保存wrkMastSplitTwinLog工作历史档[workNo={0}]失败", wrkMastSplitTwin.getWrkNo());
            }
            // 删除工作主档
            if (!wrkMastSplitTwinService.deleteById(wrkMastSplitTwin)) {
                exceptionHandle("删除wrkMastSplitTwin工作主档[workNo={0}]失败", wrkMastSplitTwin.getWrkNo());
            }
        } catch (Exception e) {
            log.error("fail", e);
            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
            return FAIL.setMsg(e.getMessage());
        }
        return SUCCESS;
    }

    @Transactional
    public ReturnT<String> start(WrkMastCrn wrkMastCrn) {
        try {
            WrkMastCrnLog wrkMastCrnLog = new WrkMastCrnLog();
            wrkMastCrnLog.sync(wrkMastCrn);
            // 保存工作主档历史档
            if (!wrkMastCrnLogService.insert(wrkMastCrnLog)) {
                exceptionHandle("保存wrkMastCrnLog工作历史档[workNo={0}]失败", wrkMastCrn.getWrkNo());
            }
            // 删除工作主档
            if (!wrkMastCrnService.deleteById(wrkMastCrn)) {
                exceptionHandle("删除wrkMastCrn工作主档[workNo={0}]失败", wrkMastCrn.getWrkNo());
            }
        } catch (Exception e) {
            log.error("fail", e);
            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
            return FAIL.setMsg(e.getMessage());
        }
        return SUCCESS;
    }


}