# 明细历史优化+打印

cl

昨天 c664c49f8e211b7b791a5ff1e63cda53c1b1264e

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

@@ -29,13 +29,15 @@
public class WorkLogHandler extends AbstractHandler<String> {

    @Autowired
    private WrkMastService wrkMastService;
    @Autowired
    private WrkMastLogService wrkMastLogService;
    private WrkArchiveToLogService wrkArchiveToLogService;
//    @Autowired
//    private WrkMastService wrkMastService;
    @Autowired
    private WrkDetlService wrkDetlService;
    @Autowired
    private WrkDetlLogService wrkDetlLogService;
//    @Autowired
//    private WrkMastLogService wrkMastLogService;
//    @Autowired
//    private WrkDetlLogService wrkDetlLogService;
    @Autowired
    private WaitPakinService waitPakinService;
    @Autowired
@@ -71,17 +73,18 @@
                        if (!waitPakinLogService.save(wrkMast.getBarcode())) {
                            exceptionHandle("保存入库通知档历史档[workNo={0}]失败", wrkMast.getWrkNo());
                        }

                        // 删除入库通知档
                        if (!waitPakinService.delete(new EntityWrapper<WaitPakin>().eq("zpallet", wrkMast.getBarcode()))) {
                            exceptionHandle("删除入库通知档[workNo={0}]失败", wrkMast.getWrkNo());
                        }
                    }
                    // 手动入库生成单据 【 上报三方平台 】
                    if (!Cools.isEmpty(wrkDetls)) {
                        if (!orderService.saveHandlerOrder(Boolean.TRUE, wrkMast, wrkDetls)) {
                            exceptionHandle("生成手动入库单据[workNo={0}]失败", wrkMast.getWrkNo());
                        }
                    }
//                    // 手动入库生成单据 【 上报三方平台 】
//                    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)) {
@@ -92,33 +95,58 @@
                }

                // 出库 --------------------------------------------------------------------------------
            } else if (wrkMast.getWrkSts() == 18) {
            } else if (wrkMast.getWrkSts() == 30) {
                if (!Cools.isEmpty(wrkDetls)) {
                    if (!orderService.saveHandlerOrder(Boolean.FALSE, wrkMast, wrkDetls)) {
                        exceptionHandle("生成手动出库单据[workNo={0}]失败", wrkMast.getWrkNo());
                    }
                }
            }

            // 保存工作主档历史档
            if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
                exceptionHandle("保存工作历史档[workNo={0}]失败", wrkMast.getWrkNo());
            }
            // 删除工作主档
            if (!wrkMastService.deleteById(wrkMast)) {
                exceptionHandle("删除工作主档[workNo={0}]失败", wrkMast.getWrkNo());
            }
            // 保存工作明细档历史档
            if (!wrkDetlLogService.save(wrkMast.getWrkNo())) {
            wrkArchiveToLogService.archiveMastAndDetlToLogThenDeleteCurrent(wrkMast);
//            boolean printFullPltOutLog = !Cools.isEmpty(wrkMast)
//                    && Long.valueOf(30L).equals(wrkMast.getWrkSts())
//                    && "Y".equalsIgnoreCase(wrkMast.getFullPlt());
//            // 保存工作主档历史档
//            boolean wrkMastLogSaved = wrkMastLogService.save(wrkMast.getWrkNo());
//            if (printFullPltOutLog) {
//                System.out.println("[WorkLogHandler] save wrkMastLog, wrkNo=" + wrkMast.getWrkNo()
//                        + ", result=" + wrkMastLogSaved);
//            }
//            if (!wrkMastLogSaved) {
//                exceptionHandle("保存工作历史档[workNo={0}]失败", wrkMast.getWrkNo());
//            }
//
//            // 保存工作明细历史档
//            boolean wrkDetlLogSaved = wrkDetlLogService.save(wrkMast.getWrkNo());
//            if (printFullPltOutLog) {
//                System.out.println("[WorkLogHandler] save wrkDetlLog, wrkNo=" + wrkMast.getWrkNo()
//                        + ", result=" + wrkDetlLogSaved);
//            }
//            if (!wrkDetlLogSaved) {
//                exceptionHandle("保存工作明细历史档[workNo={0}]失败", wrkMast.getWrkNo());
            }
            // 删除工作明细档
            if (!wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()))) {
//            }
//            // 删除工作主档
//            boolean wrkMastDeleted = wrkMastService.deleteById(wrkMast);
//            if (printFullPltOutLog) {
//                System.out.println("[WorkLogHandler] delete wrkMast, wrkNo=" + wrkMast.getWrkNo()
//                        + ", result=" + wrkMastDeleted);
//            }
//            if (!wrkMastDeleted) {
//                exceptionHandle("删除工作主档[workNo={0}]失败", wrkMast.getWrkNo());
//            }
//
//            // 删除工作明细档
//            boolean wrkDetlDeleted = wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
//            if (printFullPltOutLog) {
//                System.out.println("[WorkLogHandler] delete wrkDetl, wrkNo=" + wrkMast.getWrkNo()
//                        + ", result=" + wrkDetlDeleted);
//            }
//            if (!wrkDetlDeleted) {
//                exceptionHandle("删除工作明细档[workNo={0}]失败", wrkMast.getWrkNo());
            }
//            }
            // 修改订单状态 作业中 ===>> 已完成
            for (WrkDetl wrkDetl : wrkDetlsKeyOrder) {
                if (BaseController.isJSON(wrkDetl.getOrderNo())) {
                if (!BaseController.isJSON(wrkDetl.getOrderNo())) {
                    orderService.checkComplete(wrkDetl.getOrderNo());
                } else {
                    // 订单合并出库