From c4b2cfbdc4b31a6e37a9b51c5f69620bd5e7841f Mon Sep 17 00:00:00 2001
From: pjb <pjb123456>
Date: 星期六, 23 八月 2025 08:38:58 +0800
Subject: [PATCH] wcs功能完善
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 51 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 3e6a6fb..40d0653 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -5,6 +5,7 @@
import HslCommunication.Profinet.Siemens.SiemensPLCS;
import HslCommunication.Profinet.Siemens.SiemensS7Net;
import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.SpringUtils;
@@ -18,6 +19,8 @@
import com.zy.core.model.protocol.StaProtocol;
import com.zy.entity.BasDevp;
import com.zy.service.BasDevpService;
+import com.zy.system.entity.Config;
+import com.zy.system.service.ConfigService;
import com.zy.utils.News;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
@@ -198,6 +201,25 @@
staProtocol.setPakMk(true);
}
}
+
+ // 鏍规嵁瀹炴椂淇℃伅鏇存柊鏁版嵁搴�
+ try {
+ List<BasDevp> basDevps = new ArrayList<>();
+ for (Integer siteId2 : staNos) {
+ StaProtocol staProtocol2 = station.get(siteId2);
+ basDevps.add(staProtocol2.toSqlModel());
+ }
+
+ BasDevpService basDevpService = SpringUtils.getBean(BasDevpService.class);
+ if(basDevps.size() > 0) {
+ if (null != basDevpService && !basDevpService.updateBatchById(basDevps)) {
+ throw new Exception("鏇存柊鏁版嵁搴撴暟鎹け璐�");
+ }
+ }
+
+ } catch (Exception e){
+
+ }
}
@Override
@@ -350,6 +372,35 @@
}
}
+ // 璇�1鍙疯緭閫佺嚎鍑哄叆搴撴ā寮�
+ if (slave.getId() == 1) {
+ OperateResultExOne<byte[]> inOrOutBoundModeResult = siemensS7Net.Read("DB101.1480", (short) 2);
+ if (inOrOutBoundModeResult.IsSuccess) {
+ // 鍑哄叆搴撴ā寮�
+ int inOrOutMode = siemensS7Net.getByteTransform().TransInt16(inOrOutBoundModeResult.Content, 0);
+ // 鏇存柊鍑哄叆搴撴ā寮忓��
+ ConfigService configService = SpringUtils.getBean(ConfigService.class);
+ Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", "inOrOutBoundMode"));
+ if (config != null) {
+ config.setValue(String.valueOf(inOrOutMode));
+ configService.updateById(config);
+ }
+ StaProtocol staProtocol1016 = station.get(1016);
+ StaProtocol staProtocol1043 = station.get(1016);
+ StaProtocol staProtocol1019 = station.get(1019);
+ if(staProtocol1016 != null) {
+ staProtocol1016.setInOrOutMode(inOrOutMode);
+ }
+ if(staProtocol1043 != null) {
+ staProtocol1043.setInOrOutMode(inOrOutMode);
+ }
+ if(staProtocol1019 != null) {
+ staProtocol1019.setInOrOutMode(inOrOutMode);
+ }
+// log.info("璇诲彇鍒板嚭鍏ュ簱妯″紡鍊间负锛歿}",inOrOutMode);
+ }
+ }
+
// 璇荤┖妗朵俊鎭弽棣�
if (slave.getId() == 1) {
OperateResultExOne<byte[]> emptyBucketsResult = siemensS7Net.Read("DB101.1320", (short) (staNosErrList1.size() * 6));
--
Gitblit v1.9.1