1

zhang

2026-01-27 f681705ebffb690d25e0e2bea922617a01ea30af

1

 zy-acs-cv/src/main/java/com/zy/core/enums/ConveyorStateType.java

@@ -3,8 +3,9 @@
public enum ConveyorStateType {

    OUTBOUND,
    FAKEWMS,
    FAKEUSER,
    INBOUND,
    FAKEWMS,
    FAKETASK,
    CLEARSIGNAL,
    SENDTASK;

 zy-acs-cv/src/main/java/com/zy/core/operation/handler/ClearOperationHandler.java

@@ -69,6 +69,7 @@
                    if (staProtocol.getWorkNo() > 0 && staProtocol.isAutoing()) {
                        Job job = jobService.getJobByJobNo(staProtocol.getWorkNo());
                        if (job != null && job.getJobSts() >= 5) {
                            String s = ctuMainService.checkStationStatus(takeSta.getStaNo());
                            staProtocol.setWorkNo(0);
                            staProtocol.setStaNo(0);
                            boolean result = MessageQueue.offer(SlaveType.Devp, 1, new Task(2, staProtocol));

 zy-acs-cv/src/main/java/com/zy/core/operation/handler/FakeUserOperationHandler.java

@@ -42,7 +42,7 @@

    @Override
    public ConveyorStateType getType() {
        return ConveyorStateType.FAKEWMS;
        return ConveyorStateType.FAKEUSER;
    }

    @Override

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

@@ -108,7 +108,7 @@
                    // 写数据 ID+目标站
                    case 2:
                        write((StaProtocol) task.getData());
                        log.info("输送线下发命令：" + ((StaProtocol) task.getData()).getWorkNo() + "," + ((StaProtocol) task.getData()).getStaNo());
                        //log.info("输送线下发命令：" + ((StaProtocol) task.getData()).getWorkNo() + "," + ((StaProtocol) task.getData()).getStaNo());
                        break;
                    // 写数据 ID+目标站
                    case 3:
@@ -319,7 +319,7 @@
            Thread.sleep(200);
            write1 = siemensS7Net.Write("DB100." + (index * 4 + 2), staProtocol.getStaNo().shortValue());    // 目标站
            if (write.IsSuccess && write1.IsSuccess) {
                log.error("写入输送线命令成功。输送线plc编号={}，站点数据={},写入次数={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
                log.info("写入输送线命令成功。输送线plc编号={}，站点数据={},写入次数={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
                break;
            } else {
                writeCount++;

 zy-acs-cv/src/main/resources/application.yml

@@ -29,6 +29,10 @@
        mark: 10
        max-retries: 3
        retry-delay: 500
      - type: FAKEUSER
        mark: 30
        max-retries: 2
        retry-delay: 300
      - type: FAKEWMS
        mark: 30
        max-retries: 2