From 5ca920a3b369a3cdaf2b72f8fe844c26e5128e59 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期三, 14 五月 2025 14:52:35 +0800
Subject: [PATCH] #调试
---
src/main/java/com/zy/asrs/controller/ConsoleController.java | 3 +
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 43 ++++++++++++++++-----
src/main/java/com/zy/asrs/mapper/WrkMastMapper.java | 1
src/main/resources/mapper/WrkMastMapper.xml | 6 +++
src/main/java/com/zy/core/MainProcess.java | 2
src/main/resources/application.yml | 52 +++++++++++++++++++++++++-
6 files changed, 93 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index 5a2f5fc..44ad2dc 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -152,6 +152,9 @@
if(crnProtocol.getAlarm() == 10){
crnProtocol.setAlarm((short) 0);
}
+ if(crnProtocol.getAlarm() == 6){
+ crnProtocol.setAlarm((short) 0);
+ }
if (crnProtocol.getAlarm() > 0) {
vo.setCrnStatus(CrnStatusType.MACHINE_ERROR);
} else {
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
index 2e59546..bee4e81 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -40,6 +40,7 @@
// 鎷ｆ枡鍐嶅叆搴撴椂锛岀珯鐐规湁鐗╀笖闇�姹傛椂鏌ヨ
// @Select("select top 1 * from asr_wrk_mast where wrk_no=#{workNo} and wrk_sts=14 and (io_type=103 or io_type=107 or io_type=104)")
WrkMast selectPickStep(@Param("barcode")String barcode);
+ WrkMast selectPickStep3(@Param("workNo")Integer workNo);
// 鍑哄簱绗竴姝ワ紝浠庡簱浣嶅埌鍫嗗灈鏈哄嚭搴撶珯
// @Select("select top 1 * from dbo.asr_wrk_mast where crn_no=#{crnNo} and wrk_sts=11 and io_type>100 order by io_pri desc,io_time,wrk_no asc")
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 0aa5cf6..14f026d 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -240,6 +240,7 @@
LocTypeDto locTypeDto = new LocTypeDto(staProtocol);
SearchLocParam param = new SearchLocParam();
+ locTypeDto.setLocType1((short) 1);
param.setBarcode(barcode);
param.setIoType(1);
param.setSourceStaNo(inSta.getStaNo());
@@ -445,6 +446,9 @@
errMsg = "鎵爜澶辫触";
back = true;
}
+ if(staProtocol.getSiteId() > 400){
+ back = false;
+ }
// 閫�鍥�
if (back) {
@@ -472,23 +476,26 @@
}
continue;
}
- if (!Cools.isEmpty(barcode)) {
- News.infoNoLog("" + mark + " - 1" + " - {}鍙锋潯鐮佹壂鎻忓櫒妫�娴嬫潯鐮佷俊鎭細{}", pickSta.getBarcode(), barcode);
- if ("NG".endsWith(barcode) || "NoRead".equals(barcode)) {
+ if(staProtocol.getSiteId() < 400){
+ if (!Cools.isEmpty(barcode)) {
+ News.infoNoLog("" + mark + " - 1" + " - {}鍙锋潯鐮佹壂鎻忓櫒妫�娴嬫潯鐮佷俊鎭細{}", pickSta.getBarcode(), barcode);
+ if ("NG".endsWith(barcode) || "NoRead".equals(barcode)) {
+ continue;
+ }
+ } else {
continue;
}
- } else {
- continue;
- }
- if (!Cools.isEmpty(barcode)) {
+ if (!Cools.isEmpty(barcode)) {
// News.info(""+mark+" - 1"+" - {}鍙锋潯鐮佹壂鎻忓櫒妫�娴嬫潯鐮佷俊鎭細{}", pickSta.getBarcode(), barcode);
- if ("NG".endsWith(barcode) || "NoRead".equals(barcode)) {
+ if ("NG".endsWith(barcode) || "NoRead".equals(barcode)) {
+ continue;
+ }
+ } else {
continue;
}
- } else {
- continue;
+
}
@@ -504,6 +511,9 @@
if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable() && staProtocol.isPakMk()) {
News.warnNoLog("" + mark + " - 0" + " - 寮�濮嬫墽琛�");
WrkMast wrkMast = wrkMastMapper.selectPickStep(barcode);
+ if(staProtocol.getSiteId() > 400){
+ wrkMast = wrkMastMapper.selectPickStep3(staProtocol.getWorkNo());
+ }
// WrkMast wrkMast = wrkMastMapper.selectPakInStep3(staProtocol.getWorkNo().intValue());
if (wrkMast == null) {
// 鏃犳嫞鏂欐暟鎹�
@@ -588,7 +598,9 @@
// 鏇存柊绔欑偣淇℃伅 涓� 涓嬪彂plc鍛戒护
staProtocol.setWorkNo(wrkMast.getWrkNo());
- staProtocol.setStaNo(Short.valueOf(wrkMast.getStaNo().toString()));
+ if(staProtocol.getSiteId() < 400){
+ staProtocol.setStaNo(Short.valueOf(wrkMast.getStaNo().toString()));
+ }
devpThread.setPakMk(staProtocol.getSiteId(), false);
boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
log.error("杈撻�佺嚎涓嬪彂5锛�" + wrkMast.getWrkNo() + "," + wrkMast.getStaNo());
@@ -1005,6 +1017,9 @@
News.error("" + mark + " - 1" + " - 2" + " - 鍏ュ簱 ===>> 鍫嗗灈鏈虹珯鐐瑰湪鏁版嵁搴撲笉瀛樺湪, 绔欑偣缂栧彿={}", crnStn.getStaNo());
continue;
}
+// if(staProtocol.getWorkNo() == 9998){
+// continue;
+// }
if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.getWorkNo() > 0 && staProtocol.isInEnable()
&& staDetl.getCanining() != null && staDetl.getCanining().equals("Y")) {
flag = true;
@@ -1800,6 +1815,12 @@
case 10:
ledCommand.setTitle("绌烘澘鍏ュ簱");
break;
+ case 53:
+ ledCommand.setTitle("鎷ｆ枡鍐嶅叆搴�");
+ break;
+ case 57:
+ ledCommand.setTitle("鐩樼偣鍐嶅叆搴�");
+ break;
case 101:
ledCommand.setTitle("鍏ㄦ澘鍑哄簱");
break;
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 901f760..7e35314 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -60,7 +60,7 @@
// 鍏ュ簱 ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。
mainService.generateStoreWrkFile(1); // 缁勬墭
// mainService.generateStoreWrkFile0(2); // WMS鍏ュ簱
- Thread.sleep(400);
+ Thread.sleep(200);
// 鎷ｆ枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 3f8ad7c..22ec9b5 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -429,14 +429,14 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[5]:
devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 403
+ staNo: 404
row: 7
bay: 1
lev: 4
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[5]:
devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 403
+ staNo: 404
row: 7
bay: 1
lev: 4
@@ -515,6 +515,30 @@
barcode: ${wcs-slave.barcode[4].id}
led: ${wcs-slave.led[1].id}
backSta: 230
+ # 鎷ｆ枡鍏ュ簱鍙�1
+ pickSta[4]:
+ staNo: 411
+ barcode: ${wcs-slave.barcode[4].id}
+ led: ${wcs-slave.led[1].id}
+ backSta: 411
+ # 鎷ｆ枡鍏ュ簱鍙�1
+ pickSta[5]:
+ staNo: 412
+ barcode: ${wcs-slave.barcode[4].id}
+ led: ${wcs-slave.led[1].id}
+ backSta: 412
+ # 鎷ｆ枡鍏ュ簱鍙�1
+ pickSta[6]:
+ staNo: 413
+ barcode: ${wcs-slave.barcode[4].id}
+ led: ${wcs-slave.led[1].id}
+ backSta: 413
+ # 鎷ｆ枡鍏ュ簱鍙�1
+ pickSta[7]:
+ staNo: 414
+ barcode: ${wcs-slave.barcode[4].id}
+ led: ${wcs-slave.led[1].id}
+ backSta: 414
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
staNo: 123
@@ -655,6 +679,30 @@
barcode: ${wcs-slave.barcode[12].id}
led: ${wcs-slave.led[1].id}
backSta: 210
+ # 鎷ｆ枡鍏ュ簱鍙�1
+ pickSta[4]:
+ staNo: 401
+ barcode: ${wcs-slave.barcode[12].id}
+ led: ${wcs-slave.led[1].id}
+ backSta: 401
+ # 鎷ｆ枡鍏ュ簱鍙�1
+ pickSta[5]:
+ staNo: 402
+ barcode: ${wcs-slave.barcode[12].id}
+ led: ${wcs-slave.led[1].id}
+ backSta: 402
+ # 鎷ｆ枡鍏ュ簱鍙�1
+ pickSta[6]:
+ staNo: 403
+ barcode: ${wcs-slave.barcode[12].id}
+ led: ${wcs-slave.led[1].id}
+ backSta: 403
+ # 鎷ｆ枡鍏ュ簱鍙�1
+ pickSta[7]:
+ staNo: 404
+ barcode: ${wcs-slave.barcode[12].id}
+ led: ${wcs-slave.led[1].id}
+ backSta: 404
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
staNo: 102
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 7921056..3bca05f 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -106,6 +106,12 @@
select top 1 * from asr_wrk_mast where barcode=#{barcode} and wrk_sts=14 and (io_type=103 or io_type=107 or io_type=104)
</select>
+ <select id="selectPickStep3" resultMap="BaseResultMap">
+ select top 1 * from asr_wrk_mast where wrk_no=#{workNo} and wrk_sts=14 and io_type=107
+ </select>
+
+
+
<select id="selectPakOutStep1" resultMap="BaseResultMap">
select top 1 * from dbo.asr_wrk_mast where crn_no=#{crnNo} and source_sta_no=#{sourceStaNo} and wrk_sts=11 and io_type>100 order by io_pri desc,io_time,wrk_no asc
</select>
--
Gitblit v1.9.1