zwl
6 小时以前 db88462ae6850a42d58c6e04b500975c8d9806c9
堆垛机连续出库
1个文件已修改
13 ■■■■ 已修改文件
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -38,6 +38,8 @@
import com.zy.core.thread.BarcodeThread;
import com.zy.core.thread.LedThread;
import com.zy.core.thread.SiemensDevpThread;
import com.zy.system.entity.Config;
import com.zy.system.service.impl.ConfigServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -88,6 +90,8 @@
    private String wmsUrl;
    @Autowired
    private WrkMastServiceImpl wrkMastService;
    @Autowired
    private ConfigServiceImpl configService;
    /**
     * 组托
@@ -857,9 +861,14 @@
                    break;
//                    continue;
                }
                Config config = configService.selectOne(new EntityWrapper<Config>().eq("ContinuousOutboundShipment","Y"));
                boolean flag = false;
                if (!Cools.isEmpty(config)||!staProtocol.isLoading() && staProtocol.isOutEnable()){
                    flag = true;
                }
                // 判断堆垛机出库站状态
                if (staProtocol.isAutoing() && !staProtocol.isLoading() && staDetl.getCanouting() !=null && staDetl.getCanouting().equals("Y")
                        && staProtocol.getWorkNo() == 0 && staProtocol.isOutEnable()) {
                if (staProtocol.isAutoing() && flag && staDetl.getCanouting() !=null && staDetl.getCanouting().equals("Y")
                        && staProtocol.getWorkNo() == 0 ) {
                    // 命令下发区 --------------------------------------------------------------------------
                    // 堆垛机控制过滤