1

zhang

21 小时以前 9d82e56ee05e2be1150b98da80b720b4f93f6afd

1

 version/doc/conveyor/ÖÐÑïWCSÓëÊäËÍPLCͨѶЭÒé(OPC)3.0_20260226.docx

Binary files differ

 zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/ConveyorBackgroundService.java

File was renamed from zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/ConveyorBackgroundService.java
@@ -1,4 +1,4 @@
package com.zy.acs.conveyor.core;
package com.zy.acs.conveyor.core.operation;

import com.zy.acs.common.utils.News;
import com.zy.acs.conveyor.core.properties.CtuOperationConfig;

 zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/ConveyorOperationExecutor.java

File was renamed from zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/ConveyorOperationExecutor.java
@@ -1,7 +1,6 @@
package com.zy.acs.conveyor.core;
package com.zy.acs.conveyor.core.operation;

import com.zy.acs.conveyor.core.enums.ConveyorStateType;
import com.zy.acs.conveyor.core.operation.OperationHandler;
import com.zy.acs.conveyor.core.properties.CtuOperationConfig;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;

 zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/AppleLocOperationHandler.java

@@ -84,12 +84,11 @@
                        String barcode = staProtocol.getBarcode();
                        if (Cools.isEmpty(barcode)) {
                            News.error("站点：{}，未扫到码值：{}", staProtocol.getSiteId(), barcode);
                            //log.error("站点：{}，未扫到码值：{}", staProtocol.getSiteId(), barcode);
                            return;
                        }
                        // 9991是空板，9992是满板
                        if (staProtocol.getWorkNo() >= 9991 && staProtocol.getWorkNo() <= 9992) {
                            Job job = jobService.getJobByBarcode(barcode, ConveyorStateType.INBOUND.getStatus());
                            Job job = jobService.getJobByBarcode(barcode);
                            // ç”³è¯·å…¥åº“
                            if (job == null || (job != null && job.getJobSts() == ConveyorStateType.CLEARSIGNAL.getStatus())) {
                                ApplyInRepsonseDto locOfWms = wmsMainService.getLocOfWms(applyIn(barcode, inSta.getStaNo() + "", staProtocol));
@@ -100,11 +99,9 @@
                                    redis.push(RedisConveyorConstant.CONVEYOR_TASK_FLAG, staProtocol);
                                    if (jobService.insert(initJob(locOfWms, barcode, workNo, inSta.getTargetSta() + ""))) {
                                        News.info("申请入库成功，条码：{},站点：{}", barcode, inSta.getStaNo());
                                        //log.info("申请入库成功，条码：{},站点：{}", barcode, inSta.getStaNo());
                                    }
                                } else {
                                    News.error("WMS未返回库位信息，条码：{},站点：{}", barcode, inSta.getStaNo());
                                    //log.info("WMS未返回库位信息，条码：{},站点：{}", barcode, inSta.getStaNo());
                                }
                            }
                        }
@@ -139,7 +136,7 @@
        ApplyInDto applyInDto = new ApplyInDto();
        applyInDto.setStaNo(staNo);
        applyInDto.setBarcode(barcode);
        applyInDto.setFull(staProtocol.getWorkNo() == 9992);
        applyInDto.setFull(staProtocol.isFullPlt());
        return applyInDto;
    }
}

 zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/thread/SiemensDevpThread.java

@@ -8,6 +8,8 @@
import com.zy.acs.conveyor.core.constant.StationStatusField;
import com.zy.acs.conveyor.core.model.StaProtocol;
import com.zy.acs.conveyor.core.properties.DevpSlave;
import com.zy.acs.conveyor.core.service.DevpS7Service;
import com.zy.acs.conveyor.core.service.StationService;
import com.zy.acs.conveyor.entity.Devp;
import com.zy.acs.conveyor.service.DevpService;
import com.zy.acs.conveyor.utils.SpringContextUtil;
@@ -74,7 +76,19 @@
     */
    private void read() throws InterruptedException {
        if (siemensS7Net == null) {
            DevpS7Service devpS7Service = SpringContextUtil.getBean(DevpS7Service.class);
            if (devpS7Service != null) {
                siemensS7Net = devpS7Service.get(slave.getId());
            }
            log.warn("PLC未连接，跳过读取 [id:{}]", slave.getId());
            return;
        }
        if (station == null) {
            StationService stationService = SpringContextUtil.getBean(StationService.class);
            if (stationService != null) {
                station = stationService.getStationMap(slave.getId());
            }
            log.warn("站点未连接，跳过读取 [id:{}]", slave.getId());
            return;
        }

@@ -162,7 +176,7 @@
            if (!Cools.isEmpty(barcode)) {
                StaProtocol staProtocol = station.get(barcodeArr.get(i));
                staProtocol.setBarcode(barcode);
                log.info("料箱码：{}", barcode);
                News.info("料箱码：{}", barcode);
            }
        }
    }

 zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/service/JobService.java

@@ -12,7 +12,7 @@

    Job getJobByBarcodeAndJobSts(String barcode, Integer jobSts);

    Job getJobByBarcode(String barcode, Integer jobSts);
    Job getJobByBarcode(String barcode);

    Job getJobByJobNo(Integer jobNo);


 zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/service/impl/JobServiceImpl.java

@@ -41,8 +41,8 @@
    }

    @Override
    public Job getJobByBarcode(String barcode, Integer jobSts) {
        return baseMapper.getJobByBarcodeAndJobSts(barcode, jobSts);
    public Job getJobByBarcode(String barcode) {
        return baseMapper.getJobByBarcode(barcode);
    }

    @Override

 zy-asc-conveyor/src/main/resources/mapper/JobMapper.xml

@@ -61,7 +61,6 @@
        select *
        from cv_job
        where barcode = #{barcode}
          and job_sts = #{jobSts}
        order by id desc limit 1
    </select>