From 9d82e56ee05e2be1150b98da80b720b4f93f6afd Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期六, 11 四月 2026 09:56:48 +0800
Subject: [PATCH] 1
---
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/service/JobService.java | 2 +-
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/ConveyorOperationExecutor.java | 3 +--
version/doc/conveyor/中扬WCS与输送PLC通讯协议(OPC)3.0_20260226.docx | 0
zy-asc-conveyor/src/main/resources/mapper/JobMapper.xml | 1 -
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/AppleLocOperationHandler.java | 7 ++-----
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/service/impl/JobServiceImpl.java | 4 ++--
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/ConveyorBackgroundService.java | 2 +-
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/thread/SiemensDevpThread.java | 16 +++++++++++++++-
8 files changed, 22 insertions(+), 13 deletions(-)
diff --git "a/version/doc/conveyor/\344\270\255\346\211\254WCS\344\270\216\350\276\223\351\200\201PLC\351\200\232\350\256\257\345\215\217\350\256\256\050OPC\0513.0_20260226.docx" "b/version/doc/conveyor/\344\270\255\346\211\254WCS\344\270\216\350\276\223\351\200\201PLC\351\200\232\350\256\257\345\215\217\350\256\256\050OPC\0513.0_20260226.docx"
new file mode 100644
index 0000000..0b6f1cf
--- /dev/null
+++ "b/version/doc/conveyor/\344\270\255\346\211\254WCS\344\270\216\350\276\223\351\200\201PLC\351\200\232\350\256\257\345\215\217\350\256\256\050OPC\0513.0_20260226.docx"
Binary files differ
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/ConveyorBackgroundService.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/ConveyorBackgroundService.java
similarity index 98%
rename from zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/ConveyorBackgroundService.java
rename to zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/ConveyorBackgroundService.java
index 381166b..bdf444c 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/ConveyorBackgroundService.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/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;
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/ConveyorOperationExecutor.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/ConveyorOperationExecutor.java
similarity index 95%
rename from zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/ConveyorOperationExecutor.java
rename to zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/ConveyorOperationExecutor.java
index d4581ed..8393115 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/ConveyorOperationExecutor.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/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;
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/AppleLocOperationHandler.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/AppleLocOperationHandler.java
index 6ec79e6..8b32d3a 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/AppleLocOperationHandler.java
+++ b/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;
}
}
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/thread/SiemensDevpThread.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/thread/SiemensDevpThread.java
index c425337..0c9d2ee 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/thread/SiemensDevpThread.java
+++ b/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);
}
}
}
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/service/JobService.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/service/JobService.java
index 3ff0a1b..903e82e 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/service/JobService.java
+++ b/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);
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/service/impl/JobServiceImpl.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/service/impl/JobServiceImpl.java
index 7d1124f..c42e50d 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/service/impl/JobServiceImpl.java
+++ b/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
diff --git a/zy-asc-conveyor/src/main/resources/mapper/JobMapper.xml b/zy-asc-conveyor/src/main/resources/mapper/JobMapper.xml
index 3d9012c..e41af27 100644
--- a/zy-asc-conveyor/src/main/resources/mapper/JobMapper.xml
+++ b/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>
--
Gitblit v1.9.1