#连续出库wms配置

lty

9 天以前 fe1bfbf474f9af9a75a987e2c90a92c30d8601c9

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

@@ -10,6 +10,7 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.mapper.*;
import com.zy.asrs.service.*;
import com.zy.system.service.*;
import com.zy.asrs.utils.RouteUtils;
import com.zy.asrs.utils.Utils;
import com.zy.asrs.utils.VersionUtils;
@@ -38,6 +39,9 @@
import com.zy.core.thread.LedThread;
import com.zy.core.thread.RgvThread;
import com.zy.core.thread.SiemensDevpThread;
import com.zy.system.entity.Config;
import com.zy.system.mapper.ConfigMapper;
import com.zy.system.service.ConfigService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -94,6 +98,8 @@
    private WrkMastService wrkMastService;
    @Autowired
    private BasRgvMapService basRgvMapService;
    @Autowired
    private ConfigService configService;

    @Value("${wms.url}")
    private String wmsUrl;
@@ -101,6 +107,8 @@
    private boolean isToOrigin;

    public Integer wrkNo = 10000;
    @Autowired
    private ConfigMapper configMapper;

    /**
     * 组托
@@ -1212,11 +1220,21 @@
                    break;
//                    continue;
                }
//                 && !staProtocol.isLoading() && staDetl.getCanouting() != null && staDetl.getCanouting().equals("Y")
//                        && staProtocol.getWorkNo() == 0 && staProtocol.isOutEnable()
                boolean canOut;
                Config config = configService.selectConfigByCode("C-OUT-OP");

                if (Cools.isEmpty(config) || config.getValue().equals("false") ){
                    canOut = staProtocol.isAutoing()
                            && !staProtocol.isLoading()
                            && "Y".equals(staDetl.getCanouting())
                            && staProtocol.getWorkNo() == 0
                            && staProtocol.isOutEnable();
                } else {
                    canOut = staProtocol.isAutoing();
                }

                // 判断堆垛机出库站状态
                if (staProtocol.isAutoing() && !staProtocol.isLoading() && staDetl.getCanouting() != null && staDetl.getCanouting().equals("Y")
                        && staProtocol.getWorkNo() == 0 && staProtocol.isOutEnable()) {
                if (canOut) {
                    // 命令下发区 --------------------------------------------------------------------------

                    // 堆垛机控制过滤