1

zhang

2025-08-02 669942128d3242f21391636e2c41c09d646ca402

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

@@ -39,6 +39,7 @@
import com.zy.core.thread.BarcodeThread;
import com.zy.core.thread.LedThread;
import com.zy.core.thread.SiemensDevpThread;
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;
@@ -92,6 +93,9 @@
    @Value("${wms.url}")
    private String wmsUrl;
    public short wrkNo = 9999;
    @Autowired
    private ConfigServiceImpl configService;

    /**
     * 组托
     * 入库站，根据条码扫描生成入库工作档，工作状态 2
@@ -854,7 +858,9 @@
     */
    public synchronized void crnStnToLoc(CrnSlave slave, CrnThread crnThread,Integer mark) {
        CrnProtocol crnProtocol = crnThread.getCrnProtocol();
        if (crnProtocol == null) { return; }
        if (crnProtocol == null) {
            return;
        }
        // 只有当堆垛机空闲 并且 无任务时才继续执行
        if (crnProtocol.getStatusType() == CrnStatusType.IDLE && crnProtocol.getTaskNo() == 0 && crnProtocol.getModeType() == CrnModeType.AUTO
                && crnThread.isCmdFlag()) {
@@ -1015,7 +1021,9 @@
     */
    public synchronized void locToCrnStn(CrnSlave slave, CrnThread crnThread,Integer mark) {
        CrnProtocol crnProtocol = crnThread.getCrnProtocol();
        if (crnProtocol == null) { return; }
        if (crnProtocol == null) {
            return;
        }
        // 只有当堆垛机空闲 并且 无任务时才继续执行
        if (crnProtocol.getStatusType() == CrnStatusType.IDLE && crnProtocol.getTaskNo() == 0 && crnProtocol.getModeType() == CrnModeType.AUTO
                && crnThread.isCmdFlag()) {
@@ -2044,7 +2052,9 @@
                if (!crn.getDemo()) {
                    continue;
                }   // 必须为演示状态

                if (crn.getId() != 4) {
                    continue;
                }
                CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
                CrnProtocol crnProtocol = crnThread.getCrnProtocol();
                if (crnProtocol == null) {
@@ -2346,6 +2356,7 @@

    /**
     *  接收超宽超高没扫到条码报警
     *
     * @param mark
     */
    public synchronized void DevpCallThePolice(Integer mark){
@@ -2360,34 +2371,48 @@
                    boolean fig=false;
                    for (int i=0;i<8;i++){
                        switch (i){
                            case 0: if(devpThread.startSignal[i]){
                            case 0:
                                if (devpThread.startSignal[i]) {
                                        log.error("前超报警");
                                        fig=true;
                                    };
                            case 1: if(devpThread.startSignal[i]){
                                }
                                ;
                            case 1:
                                if (devpThread.startSignal[i]) {
                                log.error("后超报警");
                                fig=true;
                            };
                            case 2: if(devpThread.startSignal[i]){
                                }
                                ;
                            case 2:
                                if (devpThread.startSignal[i]) {
                                log.error("高超报警");
                                fig=true;
                            };
                            case 3: if(devpThread.startSignal[i]){
                                }
                                ;
                            case 3:
                                if (devpThread.startSignal[i]) {
                                log.error("左超报警");
                                fig=true;
                            };
                            case 4: if(devpThread.startSignal[i]){
                                }
                                ;
                            case 4:
                                if (devpThread.startSignal[i]) {
                                log.error("右超报警");
                                fig=true;
                            };
                            case 5: if(devpThread.startSignal[i]){
                                }
                                ;
                            case 5:
                                if (devpThread.startSignal[i]) {
                                log.error("超重报警");
                                fig=true;
                            };
                            case 6: if(devpThread.startSignal[i]){
                                }
                                ;
                            case 6:
                                if (devpThread.startSignal[i]) {
                                log.error("未扫到码报警");
                                fig=true;
                            };
                                }
                                ;

                        }
                    }