From 1498da813428be4e35423b6cf26fc45a203e73ab Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 13 八月 2025 16:44:06 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/service/impl/CtuMainServiceImpl.java | 66 ++++++++++++++++++++++++++++++++-
src/main/java/com/zy/core/CtuMainProcess.java | 6 ++
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 32 ++++++++++++++++
src/main/resources/application.yml | 2
4 files changed, 102 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/CtuMainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/CtuMainServiceImpl.java
index db82921..c61aa25 100644
--- a/src/main/java/com/zy/asrs/service/impl/CtuMainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/CtuMainServiceImpl.java
@@ -1,6 +1,7 @@
package com.zy.asrs.service.impl;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.mapper.WrkMastMapper;
@@ -20,7 +21,9 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.util.ArrayList;
import java.util.Date;
+import java.util.List;
/**
* 绔嬩綋浠撳簱WCS绯荤粺涓绘祦绋嬩笟鍔�
@@ -97,7 +100,7 @@
LocMast locMast = locMastService.selectById(wrkMast.getSourceLocNo());
locMast.setLocSts("S");
locMast.setModiTime(new Date());
- locMastService.selectById(locMast);
+ locMastService.updateById(locMast);
}
}
}
@@ -130,7 +133,7 @@
News.warnNoLog("" + mark + " - 0" + " - 寮�濮嬫墽琛�");
// 鍒ゆ柇閲嶅宸ヤ綔妗�
// 106涔熺畻涓婏紝浠ュ悗106-銆�107鐢ㄤ簬鏇存柊搴撳瓨
- WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("loc_no", "1001").in("wrk_sts", 106,107));
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("loc_no", "1001").in("wrk_sts", 106, 107));
if (wrkMast == null) {
continue;
}
@@ -161,4 +164,63 @@
}
}
+ public static final ArrayList<Integer> staNos2 = new ArrayList<Integer>() {{
+
+ add(101);
+ add(102);
+ add(103);
+ add(104);
+ add(105);
+ add(106);
+ add(107);
+ add(108);
+ }};
+
+ public synchronized void in(Integer mark) {
+ // 閬嶅巻鍏ュ簱鍙�
+ for (Integer inSta : staNos2) {
+ // 鑾峰彇鍏ュ簱绔欎俊鎭�
+ SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
+ StaProtocol staProtocol = devpThread.getStation().get(inSta);
+ if (staProtocol == null) {
+ continue;
+ } else {
+ staProtocol = staProtocol.clone();
+ }
+ // 鍒ゆ柇鏄惁婊¤冻鏉′欢
+ if (!staProtocol.isAutoing() && !staProtocol.isLoading()) {
+ continue;
+ }
+ // && staProtocol.isInEnable()
+ if (staProtocol.isInEnable()) {
+ getWrk(staProtocol, "-2");
+ }
+ if (staProtocol.isOutEnable()) {
+ getWrk(staProtocol, "-3");
+ }
+ }
+ }
+
+ private void getWrk(StaProtocol staProtocol, String lev) {
+ List<WrkMast> sourceLocNo = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("source_loc_no", staProtocol.getSiteId() + lev));
+ if (!Cools.isEmpty(sourceLocNo) && !sourceLocNo.isEmpty()) {
+ return;
+ }
+ WrkMast in = new WrkMast();
+ in.setSourceLocNo(staProtocol.getSiteId() + lev);
+ in.setLocNo("");
+ in.setIoType(10);
+ in.setIoTime(new Date());
+ in.setWrkSts(1L); // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
+ in.setIoPri(13D); // 浼樺厛绾э細13
+ in.setFullPlt("Y"); // 婊℃澘锛歒
+ in.setPicking("N"); // 鎷ｆ枡
+ in.setExitMk("N"); // 閫�鍑�
+ in.setEmptyMk("Y"); // 绌烘澘
+ in.setLinkMis("N");
+ in.setAppeTime(new Date());
+ in.setModiTime(new Date());
+ wrkMastService.insert(in);
+ }
+
}
diff --git a/src/main/java/com/zy/core/CtuMainProcess.java b/src/main/java/com/zy/core/CtuMainProcess.java
index 10ca97f..693743c 100644
--- a/src/main/java/com/zy/core/CtuMainProcess.java
+++ b/src/main/java/com/zy/core/CtuMainProcess.java
@@ -47,7 +47,11 @@
ctuMainService.generateStoreWrkFile(1);
// 鍑哄簱
- ctuMainService.out(1);
+ ctuMainService.out(2);
+
+ // 101-108鎸夐挳鍏ュ簱
+ ctuMainService.in(3);
+
} catch (Exception e) {
e.printStackTrace();
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 9dc5f37..ea0532e 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -52,6 +52,10 @@
add(1006);
add(1007);
+ }};
+
+ public static final ArrayList<Integer> staNos2 = new ArrayList<Integer>() {{
+
add(101);
add(102);
add(103);
@@ -218,6 +222,34 @@
}
}
}
+ ArrayList<Integer> staNosxx = staNos2;
+ int size = staNosxx.size();
+ OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB101.14", (short) (size * 2));
+ if (result3.IsSuccess) {
+ for (int i = 0; i < size; i++) {
+ Integer siteId = staNosxx.get(i); // 绔欑偣缂栧彿
+ StaProtocol staProtocol = station.get(siteId);
+ if (null == staProtocol) {
+ staProtocol = new StaProtocol();
+ staProtocol.setSiteId(siteId);
+ station.put(siteId, staProtocol);
+ }
+ boolean[] status = null;
+ status = siemensS7Net.getByteTransform().TransBool(result3.Content, i * 2, 2);
+ staProtocol.setAutoing(status[0]); // 鑷姩
+ staProtocol.setLoading(status[1]); // 鏈夌墿
+ staProtocol.setInEnable(status[2]); // 鍙叆,浜屽眰
+ staProtocol.setOutEnable(status[3]);// 鍙嚭锛屼笁灞�
+ staProtocol.setEmptyMk(status[4]); // 绌烘澘淇″彿
+ staProtocol.setFullPlt(status[5]); // 婊℃墭鐩�
+ staProtocol.setHigh(status[6]); // 楂樺簱浣�
+ staProtocol.setLow(status[7]); // 浣庡簱浣�
+
+ if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
+ staProtocol.setPakMk(true);
+ }
+ }
+ }
//鏉＄爜鎵弿鍣�
// ArrayList<Integer> barcodeList = BarcodeList;
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 7266381..c18b0d6 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,7 +8,7 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://127.0.0.1:1433;databasename=whxrasrs
+ url: jdbc:sqlserver://10.10.10.247:1433;databasename=whxrasrs
username: sa
password: sa@123
mvc:
--
Gitblit v1.9.1