#
luxiaotao1123
2020-07-07 6aa54366fa3c46567875e7df66dab43f4b897792
#
4个文件已修改
55 ■■■■■ 已修改文件
src/main/java/com/zy/asrs/task/AbstractHandler.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/task/WcsDispatcher.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java 27 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/task/AbstractHandler.java
@@ -7,6 +7,13 @@
 */
public abstract class AbstractHandler {
    public void run(){
        boolean start = start();
        System.out.println(start);
    }
    protected abstract boolean start();
    protected void exceptionHandle(String errorMsg){
        throw new CoolException("231");
    }
src/main/java/com/zy/asrs/task/WcsDispatcher.java
@@ -2,6 +2,8 @@
import com.zy.asrs.task.handler.WorkLogHandler;
import com.zy.asrs.task.handler.WorkMastHandler;
import com.zy.system.entity.Config;
import com.zy.system.service.ConfigService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -24,6 +26,8 @@
    private WorkMastHandler workMastHandler;
    @Autowired
    private WorkLogHandler workLogHandler;
    @Autowired
    private ConfigService configService;
    @PostConstruct
    private void start(){
@@ -34,7 +38,17 @@
//                    workMastHandler.start();
                    workLogHandler.start();
                    if(!workLogHandler.start()) {
                        Config config = new Config(
                                "name",    // 名称[非空]
                                "code",    // 编码[非空]
                                "val",    // 对应值[非空]
                                (short)1,    // 类型[非空]
                                (short)1    // 状态[非空]
                        );
                        boolean insert = configService.insert(config);
                        System.out.println(insert);
                    }
                } catch (Exception e) {
                    log.error("Exception", e);
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -8,8 +8,6 @@
import com.zy.asrs.service.WrkMastLogService;
import com.zy.asrs.service.WrkMastService;
import com.zy.asrs.task.AbstractHandler;
import com.zy.system.entity.Config;
import com.zy.system.service.ConfigService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -29,19 +27,14 @@
    private WrkDetlService wrkDetlService;
    @Autowired
    private WrkDetlLogService wrkDetlLogService;
    @Autowired
    private ConfigService configService;
    public void run(){
    }
    @Transactional(rollbackFor = Exception.class)
    public void start() {
    @Override
    @Transactional
    public boolean start() {
        try {
            WrkMast wrkMast = wrkMastService.selectToBeHistoryData();
            if (null == wrkMast) {
                return;
                return true;
            }
            // 保存工作主档历史档
            if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
@@ -62,17 +55,9 @@
        } catch (Exception e) {
            e.printStackTrace();
            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
            Config config = new Config(
                    "name",    // 名称[非空]
                    "code",    // 编码[非空]
                    "val",    // 对应值[非空]
                    (short)1,    // 类型[非空]
                    (short)1    // 状态[非空]
            );
            boolean insert = configService.insert(config);
            System.out.println(insert);
            return false;
        }
        return true;
    }
}
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -29,10 +29,10 @@
    @Autowired
    private WaitPakinService waitPakinService;
    public void start() {
    public boolean start() {
        List<WrkMast> wrkMasts = wrkMastService.selectToBeCompleteData();
        if (wrkMasts.isEmpty()) {
            return;
            return true;
        }
        for (WrkMast wrkMast : wrkMasts) {
            // 4.入库完成
@@ -43,6 +43,7 @@
                doOut(wrkMast);
            }
        }
        return true;
    }
    private void doIn(WrkMast wrkMast){