#

luxiaotao1123

2020-07-08 477c2b30e529089d8d5f5e5a5bce8284a0824767

#

 src/main/java/com/zy/asrs/mapper/WrkMastMapper.java

@@ -14,6 +14,6 @@
//    @Select("select * from asr_wrk_mast where ((wrk_sts = 4 Or wrk_sts = 14 ) and io_type <> 103 and io_type <> 104 and io_type <> 107 ) or (wrk_sts = 2 and io_type=6) order by upd_mk,io_time,wrk_no")
    List<WrkMast> selectToBeCompleteData();

    WrkMast selectToBeHistoryData();
    List<WrkMast> selectToBeHistoryData();

}

 src/main/java/com/zy/asrs/service/WrkMastService.java

@@ -11,6 +11,6 @@

    List<WrkMast> selectToBeCompleteData();

    WrkMast selectToBeHistoryData();
    List<WrkMast> selectToBeHistoryData();

}

 src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java

@@ -23,7 +23,7 @@
    }

    @Override
    public WrkMast selectToBeHistoryData() {
    public List<WrkMast> selectToBeHistoryData() {
        return this.baseMapper.selectToBeHistoryData();
    }


 src/main/java/com/zy/asrs/task/WorkLogScheduler.java

@@ -10,6 +10,8 @@
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;

import java.util.List;

/**
 * Created by vincent on 2020/7/7
 */
@@ -25,13 +27,15 @@

    @Scheduled(cron = "0/3 * * * * ? ")
    private void execute(){
        WrkMast wrkMast = wrkMastService.selectToBeHistoryData();
        if (null == wrkMast) {
        List<WrkMast> wrkMasts = wrkMastService.selectToBeHistoryData();
        if (wrkMasts.isEmpty()) {
            return;
        }
        ReturnT<String> result = workLogHandler.start(wrkMast);
        if (!result.isSuccess()) {
            log.error("工作档[workNo={}]历史档处理失败", wrkMast.getWrkNo());
        for (WrkMast wrkMast : wrkMasts) {
            ReturnT<String> result = workLogHandler.start(wrkMast);
            if (!result.isSuccess()) {
                log.error("工作档[workNo={}]历史档处理失败", wrkMast.getWrkNo());
            }
        }
    }


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

@@ -37,7 +37,7 @@
                exceptionHandle("保存工作历史档[workNo={0}]失败", wrkMast.getWrkNo());
            }
            // 删除工作主档
            if (wrkMastService.deleteById(wrkMast)) {
            if (!wrkMastService.deleteById(wrkMast)) {
                exceptionHandle("删除工作主档[workNo={0}]失败", wrkMast.getWrkNo());
            }
            // 保存工作明细档历史档

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

@@ -113,7 +113,7 @@
                                , new EntityWrapper<WaitPakin>().eq("barcode", wrkDetl.getZpallet())
                                        .eq("matnr", wrkDetl.getMatnr())
                                        .eq("anfme", wrkDetl.getAnfme()));
                        if (!updateRes) {
                        if (!updateRes && updateRes) {
                            exceptionHandle("全板入库 ===>> 更新入库通知档失败；[workNo={0}]", wrkMast.getWrkNo());
                        }
                    }