#

luxiaotao1123

2022-03-12 cf72f14140e41ac9532e8e1d4956131f1e07de38

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

@@ -8,7 +8,6 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.mapper.BasCrnErrorMapper;
import com.zy.asrs.mapper.WaitPakinMapper;
import com.zy.asrs.mapper.WrkMastMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.Utils;
@@ -16,7 +15,6 @@
import com.zy.common.model.MatDto;
import com.zy.common.model.SearchLocParam;
import com.zy.common.model.StartupDto;
import com.zy.common.service.CommonService;
import com.zy.common.utils.CollectionUtils;
import com.zy.common.utils.HttpHandler;
import com.zy.core.CrnThread;
@@ -58,18 +56,14 @@
@Transactional
public class MainServiceImpl {

    public static final long COMMAND_TIMEOUT = 5 * 1000;

    @Autowired
    private CommonService commonService;
    @Value("${wms.url}")
    private String wmsUrl;
    @Autowired
    private SlaveProperties slaveProperties;
    @Autowired
    private WrkMastMapper wrkMastMapper;
    @Autowired
    private WrkDetlService wrkDetlService;
    @Autowired
    private WaitPakinMapper waitPakinMapper;
    @Autowired
    private LocMastService locMastService;
    @Autowired
@@ -79,15 +73,11 @@
    @Autowired
    private BasDevpService basDevpService;
    @Autowired
    private LocDetlService locDetlService;
    @Autowired
    private BasErrLogService basErrLogService;
    @Autowired
    private BasCrnErrorMapper basCrnErrorMapper;
    @Autowired
    private BasSteService basSteService;
    @Value("${wms.url}")
    private String wmsUrl;

    /**
     * 组托
@@ -686,7 +676,7 @@
                        }
                        return true;
                    }
                    // 不是最外层库位，需要使用穿梭车搬运后，再堆垛机出库
                // 不是最外层库位，需要使用穿梭车搬运后，再堆垛机出库
                } else {
                    // 当前组库位是否有穿梭车
                    Integer steNo = this.hasCarOfIdle(wrkMast.getLocNo());
@@ -754,7 +744,7 @@
                            }
                        }

                        // 没有小车
                    // 没有小车
                    } else {
                        if (wrkMast.getWrkSts() == 11L && wrkMast.getStaNo() == null) {
                            // 寻找最近的小车