999

zhangc

2025-04-21 7bb2a6b7edf31c7552377daed26c8ac2fbade7b9

999

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

@@ -26,17 +26,17 @@
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.*;
import com.zy.core.model.*;
import com.zy.core.model.CrnSlave;
import com.zy.core.model.DevpSlave;
import com.zy.core.model.LedSlave;
import com.zy.core.model.Task;
import com.zy.core.model.command.CrnCommand;
import com.zy.core.model.command.LedCommand;
import com.zy.core.model.command.RgvCommand;
import com.zy.core.model.protocol.CrnProtocol;
import com.zy.core.model.protocol.RgvProtocol;
import com.zy.core.model.protocol.StaProtocol;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.thread.BarcodeThread;
import com.zy.core.thread.LedThread;
import com.zy.core.thread.RgvThread;
import com.zy.core.thread.SiemensDevpThread;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -45,9 +45,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;

import java.io.IOException;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;

/**
@@ -114,6 +112,9 @@
        for (DevpSlave devp : slaveProperties.getDevp()) {
            // 遍历入库口
            for (DevpSlave.Sta inSta : devp.getInSta()) {
                if (inSta.getStaNo() == 1035) {
                    continue;
                }
                // 获取条码扫描仪信息
                BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcode());
                BarcodeThread barcodeThreadMat = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcodeMat());
@@ -287,6 +288,9 @@
        for (DevpSlave devp : slaveProperties.getDevp()) {
            // 遍历入库口
            for (DevpSlave.Sta inSta : devp.getInSta()) {
                if (inSta.getStaNo() != 1035) {
                    continue;
                }
                // 获取入库站信息
                SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
                StaProtocol staProtocol = devpThread.getStation().get(inSta.getStaNo());
@@ -1670,7 +1674,9 @@
                    }
                    // 获取工作档数据
                    WrkMast wrkMast = wrkMastMapper.selectById(staProtocol.getWorkNo());
                    if (null == wrkMast) { continue; }
                    if (null == wrkMast) {
                        continue;
                    }
                    wrkMasts.add(wrkMast);
                    // 组装命令
                    LedCommand ledCommand = new LedCommand();
@@ -1743,7 +1749,9 @@
                    }
                    // 获取工作档数据
                    WrkMast wrkMast = wrkMastMapper.selectById(staProtocol.getWorkNo());
                    if (null == wrkMast) { continue; }
                    if (null == wrkMast) {
                        continue;
                    }
                    wrkMasts.add(wrkMast);
                    // 组装命令
                    LedCommand ledCommand = new LedCommand();
@@ -1859,7 +1867,9 @@
                for (Integer staNo : staArr) {
                    // 获取叉车站点
                    StaProtocol staProtocol = devpThread.getStation().get(staNo);
                    if (staProtocol == null) { continue; }
                    if (staProtocol == null) {
                        continue;
                    }
                    if (staProtocol.getWorkNo() != 0 || staProtocol.isErr()) {
                        reset = false;
                        break;
@@ -1870,7 +1880,9 @@
                for (Integer staNo : staArr) {
                    // 获取叉车站点
                    StaProtocol staProtocol = devpThread.getStation().get(staNo);
                    if (staProtocol == null) { continue; }
                    if (staProtocol == null) {
                        continue;
                    }
                    if (staProtocol.isLoading() || staProtocol.isErr()) {
                        reset = false;
                        break;
@@ -2331,9 +2343,11 @@
    public synchronized void autoEmptyOut() {
        SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
        List<Integer> list = new ArrayList<>();
        list.add(101);list.add(112);
        list.add(101);
        list.add(112);
        Map<Integer,Integer> map = new HashMap<>();
        map.put(101,102);map.put(112,111);
        map.put(101, 102);
        map.put(112, 111);
        for (Integer site:list){
            WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("sta_no", map.get(site)));
            if (!Cools.isEmpty(wrkMast)){

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

@@ -56,7 +56,7 @@

                    // 入库  ===>> 入库站到堆垛机站，根据条码扫描生成入库工作档
                    mainService.generateStoreWrkFile(1); // 组托
//                    mainService.generateStoreWrkFile0(2); // WMS入库
                    mainService.generateStoreWrkFile0(2); // 2.5F
                    Thread.sleep(500);

                    // 出库  ===>>  堆垛机出库站到出库站

 src/main/resources/application.yml

@@ -126,6 +126,7 @@
      row: 3
      bay: 30
      lev: 8

  # 输送线1
  devp[0]:
    id: 1
@@ -157,6 +158,7 @@
      barcode: ${wcs-slave.barcode[0].id}
      backSta: 1123
      led: ${wcs-slave.led[3].id}

    outSta[0]:
      staNo: 1111
      led: ${wcs-slave.led[0].id}