# 明细历史优化+打印

cl

昨天 c664c49f8e211b7b791a5ff1e63cda53c1b1264e

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

@@ -3,14 +3,13 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.zy.asrs.entity.WaitPakin;
import com.zy.asrs.entity.WrkDetl;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
import com.zy.common.model.OrderDto;
import com.zy.common.service.erp.ErpService;
import com.zy.common.service.erp.entity.Goods;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -30,21 +29,21 @@
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
    private WaitPakinLogService waitPakinLogService;
    @Autowired
    private OrderService orderService;
    @Autowired
    private ErpService erpService;

    // update asr_wrk_mast set inv_wh = 'Y', ove_mk = 'Y' where wrk_no =
    @Transactional
@@ -66,21 +65,6 @@

            // 入库 --------------------------------------------------------------------------------
            if (wrkMast.getWrkSts() == 10) {

                // 搜索对应入库条码在erp数据库中的状态
                List<WrkDetl> wrkDetls0 = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
                for (WrkDetl wrkDetl : wrkDetls0) {
                    Goods goods = erpService.selectGoodsOne(wrkDetl.getMatnr());
                    if (!Cools.isEmpty(goods)) {
                        if (!erpService.updateStateAndLocForGoods(goods.getBarCode(), 3, wrkMast.getLocNo())) {
                            log.error("{}条码在erp数据库中更新失败！", goods.getBarCode());
                        }
                    } else {
                        log.error("{}条码不在erp数据库中！", wrkDetl.getMatnr());
                    }
                }


                // 全板入库
                if (wrkMast.getIoType() == 1) {
                    // 入库通知单
@@ -89,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 (!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());
//                        }
//                    }
                    // 拣料再入库
                } else if (wrkMast.getIoType() == 53) {
                    if (!Cools.isEmpty(wrkDetls)) {
@@ -110,30 +95,55 @@
                }

                // 出库 --------------------------------------------------------------------------------
            } 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())) {