Merge remote-tracking branch 'origin/glccwcs' into glccwcs

Administrator

3 天以前 f18dee1034da10cdd537f4cef94a6bcbe141c6a8

 src/main/java/com/zy/core/MainProcess.java

@@ -5,11 +5,9 @@
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;

import javax.annotation.PreDestroy;
import java.util.ArrayList;

/**
 * WCS主流程
@@ -30,11 +28,10 @@
    /**
     * =====>>  开始工作
     */
    public void start(){
    public void start() {
        thread = new Thread(() -> {
            while (!Thread.currentThread().isInterrupted()) {
                try {

                    // 间隔
                    Thread.sleep(1000);

@@ -42,36 +39,32 @@
                    if (!SystemProperties.WCS_RUNNING_STATUS.get()) {
                        continue;
                    }
                    // 跑库程序.未调试测试
                    //mainService.debug("F");
                    //独立输送线任务.未调试测试
                    //mainService.transferTaskStart();
                    //mainService.transferTaskEnd();

                    // 演示
//                    mainService.crnDemoOfLocMove1();

                    // 入库  ===>> 入库站到堆垛机站，根据条码扫描生成入库工作档
                    mainService.generateStoreWrkFile(); // 组托
                    // 出库  ===>>  堆垛机出库站到出库站
                    mainService.crnStnToOutStn();
                    // 入出库  ===>>  堆垛机入出库作业下发
                    mainService.crnIoExecute();
                    // 入库  ===>> 执行对工作档的完成操作
                    // 执行对工作档的完成操作
                    mainService.storeFinished();

                    // 堆垛机异常信息记录
                    mainService.recCrnErr();
                    // 入库  ===>> 空栈板初始化入库,叉车入库站放货
//                    mainService.storeEmptyPlt();

//                    mainService.outOfDevp();

                    // 其他  ===>> // 入出库模式切换函数
                    i++;
                    if (i > 1) {
//                    i++;
//                    if (i > 1) {
//                        mainService.ioConvert();
                        i = 0;
                    }
//                        i = 0;
//                    }

                    //自动派发任务
                    mainService.autoDistribute();
                    //自动完成任务
                    mainService.autoCompleteTask();

                } catch (Exception e) {
                    e.printStackTrace();
@@ -82,7 +75,7 @@
    }

    @PreDestroy
    public void shutDown(){
    public void shutDown() {
        if (thread != null) thread.interrupt();
    }