From d344ce3d537b9d149b8029f169cb52aba5753021 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期二, 13 五月 2025 15:23:11 +0800
Subject: [PATCH] 初始化
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 10 +++++-----
src/main/resources/mapper/LocMastMapper.xml | 2 +-
src/main/resources/mapper/WrkMastMapper.xml | 2 +-
src/main/resources/application-prod.yml | 14 +++++---------
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 2 +-
5 files changed, 13 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 43b8aaa..ac3afb1 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -131,14 +131,14 @@
if (crnProtocol == null) {
continue;
}
-
+ TaskWrk taskWrk1 = taskWrkService.selectOne(new EntityWrapper<TaskWrk>().eq("crn_no",crn.getCrnNo()).eq("io_type",3));
+ if (taskWrk1 != null) {
+ continue;
+ }
// 鍙湁褰撳爢鍨涙満绌洪棽 骞朵笖 鏃犱换鍔℃椂鎵嶇户缁墽琛�
if (crnProtocol.getStatusType() == CrnStatusType.IDLE && crnProtocol.getTaskNo() == 0 && crnProtocol.getModeType() == CrnModeType.AUTO) {
// 鑾峰彇绉诲簱宸ヤ綔妗ｄ俊鎭�
- WrkMast wrkMast = wrkMastMapper.selectLocMove(crn.getCrnNo());
- if (null != wrkMast) {
- continue;
- }
+
LocMast sourceLoc = locMastService.queryDemoSourceLoc(crn.getCrnNo());
LocMast loc = locMastService.queryDemoLoc(crn.getCrnNo(),sourceLoc.getLocType1());
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index edb52c5..1c7f818 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -287,7 +287,7 @@
if (result2.IsSuccess) {
for (int i = 0; i < 1; i++) {
String barcode = siemensS7Net.getByteTransform().TransString(result2.Content, i * 8, 8, "UTF-8");
- BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 1);
+ BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, slave.getId());
if (!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
barcodeThread.setBarcode(barcode);
}
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index 4a5af51..13b76ad 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -152,7 +152,7 @@
crnInStn[5]: #鍫嗗灈鏈哄叆搴撶珯鐐�1--2F杈撻�佺嚎 鍙栬揣鍙�
staNo: 2056
row: 7
- bay: 12
+ bay: 2
lev: 13
backSta: 106
devpPlcId: ${wcs-slave.devp[3].id}
@@ -210,7 +210,7 @@
staNo: 1053
devp[3]: #杈撻�佺嚎--鎴愬搧2F
id: 4
- ip: 192.168.110.70
+ ip: 192.168.110.40
rack: 0
port: 102
slot: 0
@@ -233,19 +233,15 @@
# 鎷ｆ枡鍏ュ簱鍙�1
pickSta[0]:
staNo: 2051
- barcode: ${wcs-slave.barcode[3].id}
# 鎷ｆ枡鍏ュ簱鍙�2
pickSta[1]:
staNo: 2052
- barcode: ${wcs-slave.barcode[3].id}
# 鎷ｆ枡鍏ュ簱鍙�3
pickSta[2]:
staNo: 2057
- barcode: ${wcs-slave.barcode[3].id}
# 鎷ｆ枡鍏ュ簱鍙�4
pickSta[3]:
staNo: 2058
- barcode: ${wcs-slave.barcode[3].id}
barcode[0]: #鏉＄爜鎵弿浠�
port: 51236
ip: 172.17.91.39
@@ -253,15 +249,15 @@
barcode[1]: #鏉＄爜鎵弿浠�
port: 51236
ip: 172.17.91.39
- id: 1
+ id: 2
barcode[2]: #鏉＄爜鎵弿浠�
port: 51236
ip: 172.17.91.39
- id: 1
+ id: 3
barcode[3]: #鏉＄爜鎵弿浠�
port: 51236
ip: 172.17.91.39
- id: 1
+ id: 4
# crn[0]: #鍫嗗灈鏈�1
# rack: 0
# offset: 2 #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index 16f72f9..731751e 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -57,7 +57,7 @@
<select id="queryDemoLoc" resultMap="BaseResultMap">
select top 1 * from asr_loc_mast where crn_no = #{crnNo} and loc_type1 = #{locType1} and loc_sts = 'O' and (ctn_kind=0 or ctn_kind is null)
- ORDER BY NEWID()
+ ORDER BY lev1 asc,bay1 asc
</select>
<select id="selectByLocNo" resultMap="BaseResultMap">
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 32279a3..c3e5f18 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -113,7 +113,7 @@
</select>
<select id="selectLocMove" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast where wrk_sts=11 and io_type=11 and crn_no=#{crnNo} order by io_time,wrk_no
+ select top 1 * from dbo.asr_wrk_mast where io_type=3 and crn_no=#{crnNo} order by io_time,wrk_no
</select>
<select id="selectLocMoving" resultMap="BaseResultMap">
--
Gitblit v1.9.1