1

zhang

2026-01-27 07f7728072de5998300cd9ec6a93fcc2c26b06cf

1

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

@@ -69,12 +69,18 @@
                        return;
                    }
                    if (staProtocol.getWorkNo() > 0 && staProtocol.isAutoing()) {
                        StaProtocol targetStaProtocol = devpThread.getStation().get(inSta.getTargetSta());
                        if (targetStaProtocol.getWorkNo() == 0 && targetStaProtocol.isAutoing() && !targetStaProtocol.isLoading()) {
                        //StaProtocol targetStaProtocol = devpThread.getStation().get(inSta.getTargetSta());
                        //if (targetStaProtocol.getWorkNo() == 0 && targetStaProtocol.isAutoing() && !targetStaProtocol.isLoading()) {
                            Job job = jobService.getJobByJobNoAndJobSts(staProtocol.getWorkNo(), 2);
                            if (job != null) {
                                staProtocol.setWorkNo(staProtocol.getWorkNo());
                                staProtocol.setStaNo(inSta.getTargetSta());
                                Integer workNo = staProtocol.getWorkNo();
                                Integer targetSta = inSta.getTargetSta();
                                staProtocol.setWorkNo(0);
                                staProtocol.setStaNo(0);
                                MessageQueue.offer(SlaveType.Devp, 1, new Task(2, staProtocol));
                                Thread.sleep(1500L);
                                staProtocol.setWorkNo(workNo);
                                staProtocol.setStaNo(targetSta);
                                boolean result = MessageQueue.offer(SlaveType.Devp, 1, new Task(2, staProtocol));
                                if (result) {
                                    job.setJobSts(4);
@@ -87,7 +93,7 @@
                            } else {
                                // 模拟操作逻辑
                            }
                        }
                        //}
                    }
                }
            }

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

@@ -29,10 +29,10 @@
        mark: 10
        max-retries: 3
        retry-delay: 500
#      - type: FAKEWMS
#        mark: 30
#        max-retries: 2
#        retry-delay: 300
      - type: FAKEWMS
        mark: 30
        max-retries: 2
        retry-delay: 300
      - type: INBOUND
        mark: 40
        max-retries: 3