From 7fb2fa2382a4de194c0e906a8b206f854a3de17f Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期二, 07 十月 2025 09:35:59 +0800
Subject: [PATCH] #和得服务器
---
src/main/java/com/zy/core/model/protocol/StaProtocol.java | 1
src/main/java/com/zy/asrs/controller/SiteController.java | 1
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 16 +++++++
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 4 +-
src/main/webapp/views/pipeline.html | 6 +++
src/main/java/com/zy/common/constant/ArmConstant.java | 10 ++--
src/main/java/com/zy/asrs/domain/vo/SiteTableVo.java | 1
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 4 +-
src/main/resources/application.yml | 38 +++++++++---------
9 files changed, 52 insertions(+), 29 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/SiteController.java b/src/main/java/com/zy/asrs/controller/SiteController.java
index 76ab637..3b841eb 100644
--- a/src/main/java/com/zy/asrs/controller/SiteController.java
+++ b/src/main/java/com/zy/asrs/controller/SiteController.java
@@ -86,6 +86,7 @@
vo.setStaNo(staProtocol.getStaNo()); // 鐩爣绔�
// vo.setLocType1(staProtocol.isHigh() != staProtocol.isLow() && staProtocol.isLow() ? "浣�" : "楂�"); //楂樹綆搴撲綅
vo.setLocType1(devp.getDevNo()==102 ? "楂�" : "浣�");
+ vo.setFull(staProtocol.isFull()?"Y":"N"); // 婊�
}
return R.ok().add(list);
diff --git a/src/main/java/com/zy/asrs/domain/vo/SiteTableVo.java b/src/main/java/com/zy/asrs/domain/vo/SiteTableVo.java
index 8512360..069b1c7 100644
--- a/src/main/java/com/zy/asrs/domain/vo/SiteTableVo.java
+++ b/src/main/java/com/zy/asrs/domain/vo/SiteTableVo.java
@@ -37,4 +37,5 @@
//楂樹綆搴撲綅
private String locType1 = "-";
+ private String full = "-";
}
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 1b70a6d..3192f64 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1348,7 +1348,7 @@
// continue;
}
// 鍒ゆ柇鍫嗗灈鏈哄嚭搴撶珯鐘舵��
-// if (staProtocol.isAutoing() && !staProtocol.isLoading() && staDetl.getCanouting() != null && staDetl.getCanouting().equals("Y")
+// if (staProtocol.isAutoing() && !staProtocol.isLoading() && staDetl.getCanouting() != null && staDetl.getCanouting().equals("Y")
// && staProtocol.getWorkNo() == 0 && staProtocol.isOutEnable()) {
if (staProtocol.isAutoing() && staDetl.getCanouting() != null && staDetl.getCanouting().equals("Y")
@@ -2612,7 +2612,7 @@
}
public synchronized void autoEmptyIn() {
- SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
+ SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
List<Integer> list = new ArrayList<>();
list.add(1038);
for (Integer site:list){
diff --git a/src/main/java/com/zy/common/constant/ArmConstant.java b/src/main/java/com/zy/common/constant/ArmConstant.java
index 2de0b91..1b94261 100644
--- a/src/main/java/com/zy/common/constant/ArmConstant.java
+++ b/src/main/java/com/zy/common/constant/ArmConstant.java
@@ -7,11 +7,11 @@
public static final String ARM_URL = "http://10.10.10.171:7002";
public static final String ARM_URL1 = "http://10.10.10.171:7002";
- public static final String ARM_URL2 = "http://10.10.10.172:7002";
- public static final String ARM_URL3 = "http://10.10.10.173:7002";
- public static final String ARM_URL4 = "http://10.10.10.174:7002";
- public static final String ARM_URL5 = "http://10.10.10.175:7002";
- public static final String ARM_URL6 = "http://10.10.10.176:7002";
+ public static final String ARM_URL2 = "http://10.10.10.174:7002";
+ public static final String ARM_URL3 = "http://10.10.10.177:7002";
+ public static final String ARM_URL4 = "http://10.10.10.180:7002";
+ public static final String ARM_URL5 = "http://10.10.10.183:7002";
+ public static final String ARM_URL6 = "http://10.10.10.186:7002";
public static final String ARM_ADAPTOR = "adaptor/api/wcs/order";//鍒涘缓璁㈠崟
diff --git a/src/main/java/com/zy/core/model/protocol/StaProtocol.java b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
index 9dd8082..5d578ad 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -132,6 +132,7 @@
basDevp.setLocType3((short) 0); // 杞婚噸绫诲瀷{0:鏈煡,1:杞诲簱浣�,2:閲嶅簱浣峿
basDevp.setLocType1(high != low && low ? (short) 1 : (short) 2);
basDevp.setInQty(inQty !=null ?(int)inQty : 0);
+ basDevp.setBarcode(this.getBarcode());
return basDevp;
}
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index 6cd2918..227c904 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -126,6 +126,18 @@
crnProtocol.setyDistance((short) 0);
crnProtocol.setxDuration((short) 0);
crnProtocol.setyDuration((short) 0);
+ try{
+ // 鏍规嵁瀹炴椂淇℃伅鏇存柊鏁版嵁搴�
+ BasCrnpService basCrnpService = SpringUtils.getBean(BasCrnpService.class);
+ BasCrnp basCrnp = new BasCrnp();
+ basCrnp.setCrnNo(slave.getId());
+ basCrnp.setCrnSts((int)crnProtocol.getMode());
+ if (!basCrnpService.updateById(crnProtocol.toSqlModel(basCrnp))){
+ News.error("SiemensCrn"+" - 3"+" - 鍫嗗灈鏈簆lc鏁版嵁搴撴洿鏂板け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
+ }
+ } catch (Exception e){
+
+ }
}
@Override
@@ -212,7 +224,9 @@
if (!basCrnpService.updateById(crnProtocol.toSqlModel(basCrnp))){
News.error("SiemensCrn"+" - 3"+" - 鍫嗗灈鏈簆lc鏁版嵁搴撴洿鏂板け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
}
- } catch (Exception ignore){}
+ } catch (Exception ignore){
+
+ }
} else {
initCrn();
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 7926c47..f146152 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -125,7 +125,7 @@
Arrays.asList(1051,1055,1057,1065,1067,1069,1077,1081,1083,1086,1089,1092,1095,1097,1100));
private static final Set<Integer> specialSites3 = new HashSet<>(//鏈烘鑷傜珯鐐�
- Arrays.asList(1098,1093,1087,1082,1074,1071,1062,1059));
+ Arrays.asList(1098,1093,1087,1082,1074,1071,1061,1058));
public static final ArrayList<Integer> BarcodeList = new ArrayList<Integer>() {{
@@ -367,7 +367,7 @@
// staProtocol.setHigh(status[6]); // 楂樺簱浣�
// staProtocol.setLow(status[7]); // 浣庡簱浣�
- if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
+ if (!staProtocol.isPakMk() && (!staProtocol.isLoading() || !staProtocol.isInEnable())) {
staProtocol.setPakMk(true);
}
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 10ca84f..51ba1fa 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -381,55 +381,55 @@
staNo: 1093
armNo: 1
sortingLine: 7
- staNoEnd: 1103
+ staNoEnd: 1093
barcode: ${wcs-slave.barcode[0].id}
led: ${wcs-slave.led[1].id}
# 鐮佸灈浣�
armSta[2]:
- staNo: 1044
+ staNo: 1087
armNo: 2
- sortingLine: 1044
- staNoEnd: 1044
+ sortingLine: 6
+ staNoEnd: 1087
barcode: ${wcs-slave.barcode[0].id}
led: ${wcs-slave.led[1].id}
# 鐮佸灈浣�
armSta[3]:
- staNo: 1044
+ staNo: 1082
armNo: 2
- sortingLine: 1044
- staNoEnd: 1044
+ sortingLine: 5
+ staNoEnd: 1082
barcode: ${wcs-slave.barcode[0].id}
led: ${wcs-slave.led[1].id}
# 鐮佸灈浣�
armSta[4]:
- staNo: 1044
+ staNo: 1074
armNo: 3
- sortingLine: 1044
- staNoEnd: 1044
+ sortingLine: 4
+ staNoEnd: 1074
barcode: ${wcs-slave.barcode[0].id}
led: ${wcs-slave.led[1].id}
# 鐮佸灈浣�
armSta[5]:
- staNo: 1044
+ staNo: 1071
armNo: 3
- sortingLine: 1044
- staNoEnd: 1044
+ sortingLine: 3
+ staNoEnd: 1071
barcode: ${wcs-slave.barcode[0].id}
led: ${wcs-slave.led[1].id}
# 鐮佸灈浣�
armSta[6]:
- staNo: 1044
+ staNo: 1061
armNo: 4
- sortingLine: 1044
- staNoEnd: 1044
+ sortingLine: 2
+ staNoEnd: 1061
barcode: ${wcs-slave.barcode[0].id}
led: ${wcs-slave.led[1].id}
# 鐮佸灈浣�
armSta[7]:
- staNo: 1044
+ staNo: 1058
armNo: 4
- sortingLine: 1044
- staNoEnd: 1044
+ sortingLine: 1
+ staNoEnd: 1058
barcode: ${wcs-slave.barcode[0].id}
led: ${wcs-slave.led[1].id}
# 鍏ュ簱鍙�1
diff --git a/src/main/webapp/views/pipeline.html b/src/main/webapp/views/pipeline.html
index c316cbd..95b2b56 100644
--- a/src/main/webapp/views/pipeline.html
+++ b/src/main/webapp/views/pipeline.html
@@ -116,6 +116,8 @@
<th>绌烘澘淇″彿</th>
<th>鐩爣绔�</th>
<th>楂樹綆搴撲綅</th>
+ <th>婊′俊鍙�</th>
+ <th>鏉＄爜</th>
</tr>
</thead>
<!-- 琛ㄦ牸鍐呭 -->
@@ -304,6 +306,8 @@
setVal(tr.children("td").eq(7), table[i-1].emptyMk);
setVal(tr.children("td").eq(8), table[i-1].staNo);
setVal(tr.children("td").eq(9), table[i-1].locType1);
+ setVal(tr.children("td").eq(10), table[i-1].full);
+ setVal(tr.children("td").eq(11), table[i-1].barcode);
}
} else if (res.code === 403){
window.location.href = baseUrl+"/login";
@@ -390,6 +394,8 @@
" <td></td>\n" +
" <td></td>\n" +
" <td></td>\n" +
+ " <td></td>\n" +
+ " <td></td>\n" +
" </tr>\n";
}
$('#site-table tbody').after(html);
--
Gitblit v1.9.1