From 02b0406395a71168cdda9a019874961ff86f5962 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 19 一月 2026 18:46:47 +0800
Subject: [PATCH] WCS功能完善
---
src/main/java/com/zy/service/impl/MainServiceImpl.java | 35 ++++++++++++++++++-----------------
1 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/zy/service/impl/MainServiceImpl.java b/src/main/java/com/zy/service/impl/MainServiceImpl.java
index f15f2e4..1ed4b1c 100644
--- a/src/main/java/com/zy/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/service/impl/MainServiceImpl.java
@@ -130,7 +130,7 @@
} else {
staProtocol = staProtocol.clone();
}
- if(staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.getWorkNo() != 0) {
+ if(staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.getWorkNo() != 0 && staProtocol.isInEnable()) {
WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", staProtocol.getWorkNo()));
if(wrkMast != null && Cools.isEmpty(wrkMast.getMk())) {
// log.info("璐х墿娴佸姩鍒颁綅106锛�"+wrkMast.getWrkNo());
@@ -216,7 +216,7 @@
&& staProtocol.isInEnable()
&& !staProtocol.isEmptyMk()
&& staProtocol.isPakMk() && staProtocol.getWorkNo() == 9998) { // 9997绌烘墭锛�9998婊℃墭/鎹℃枡锛�9999鍥為��
- if(Cools.isEmpty(barcode) || "NG".endsWith(barcode) || "NoRead".equals(barcode) || "00000000".equals(barcode)) {
+ if(Cools.isEmpty(barcode) || barcode.endsWith("NG") || "NoRead".equals(barcode) || barcode.startsWith("00000000")) {
News.info("{}鏉＄爜鎵弿閿欒锛歿}",barcodeThread.getSlave().getId(),barcode);
continue;
}
@@ -254,7 +254,7 @@
staProtocol.setStaNo(dto.getStaNo().shortValue());
devpThread.setPakMk(staProtocol.getSiteId(), false);
boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
- log.error("杈撻�佺嚎涓嬪彂2锛�"+dto.getWorkNo()+","+dto.getStaNo());
+ log.info("杈撻�佺嚎涓嬪彂2锛�"+dto.getWorkNo()+","+dto.getStaNo());
if (!result) {
News.error(methodName + ":鏇存柊plc绔欑偣淇℃伅澶辫触");
}else {
@@ -297,7 +297,7 @@
}
String barcode = barcodeThread.getBarcode();
if(!Cools.isEmpty(barcode)) {
- if("NG".endsWith(barcode) || "NoRead".equals(barcode)) {
+ if(barcode.endsWith("NG") || "NoRead".equals(barcode)) {
continue;
}
} else {
@@ -329,7 +329,7 @@
// 鑾峰彇鐩爣绔�
Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
.eq("type_no", wrkMast.getIoType() - 50)
- .eq("stn_no", pickSta.getStaNo() + 1) // 浣滀笟绔欑偣 = 鎷ｆ枡鍑哄簱鐨勭洰鏍囩珯
+ .eq("stn_no", pickSta.getStaNo()) // 浣滀笟绔欑偣 = 鎷ｆ枡鍑哄簱鐨勭洰鏍囩珯
.eq("crn_no", wrkMast.getCrnNo()); // 鍫嗗灈鏈哄彿
StaDesc staDesc = staDescService.selectOne(wrapper);
if (Cools.isEmpty(staDesc)) {
@@ -391,7 +391,7 @@
// 鏇存柊绔欑偣淇℃伅 涓� 涓嬪彂plc鍛戒护
staProtocol.setWorkNo(wrkMast.getWrkNo());
- staProtocol.setStaNo(staProtocol.getSiteId().shortValue());
+ staProtocol.setStaNo(wrkMast.getStaNo().shortValue());
devpThread.setPakMk(staProtocol.getSiteId(), false);
boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
log.error("杈撻�佺嚎涓嬪彂5锛�"+wrkMast.getWrkNo()+","+wrkMast.getStaNo());
@@ -1083,13 +1083,6 @@
continue;
}
String barcode = barcodeThread.getBarcode();
- if(!Cools.isEmpty(barcode)) {
- if("NG".endsWith(barcode) || "NoRead".equals(barcode)) {
- continue;
- }
- } else {
- continue;
- }
LedThread ledThread = null;
if (!Cools.isEmpty(emptyInSta.getLed())) {
@@ -1104,10 +1097,18 @@
if (staProtocol.isAutoing()
&& staProtocol.isLoading()
&& staProtocol.isInEnable()
- && staProtocol.isEmptyMk()
+// && staProtocol.isEmptyMk()
&& staProtocol.isPakMk()
&& staProtocol.getWorkNo() == 9997
) {
+ if (staProtocol.isBarcodeErr() || Cools.isEmpty(barcode) || barcode.startsWith("ERROR") || barcode.endsWith("NG") || barcode.startsWith("00000000")) {
+ staProtocol.setWorkNo(wrkNo);
+ staProtocol.setStaNo(emptyInSta.getBackSta().shortValue());
+ devpThread.setPakMk(staProtocol.getSiteId(), false);
+ MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+ MessageQueue.offer(SlaveType.Led, emptyInSta.getLed(), new Task(3, "鏉＄爜鎵弿閿欒锛�" + barcode));
+ continue;
+ }
News.warnNoLog(""+mark+" - 0"+" - 寮�濮嬫墽琛岋細绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐�");
try {
@@ -1132,10 +1133,10 @@
// 鏇存柊绔欑偣淇℃伅 涓� 涓嬪彂plc鍛戒护
staProtocol.setWorkNo(dto.getWorkNo());
- staProtocol.setStaNo(staProtocol.getSiteId().shortValue());
+ staProtocol.setStaNo(dto.getStaNo().shortValue());
devpThread.setPakMk(staProtocol.getSiteId(), false);
boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
- log.error("杈撻�佺嚎涓嬪彂6锛�"+dto.getWorkNo()+","+staProtocol.getSiteId());
+ log.info("杈撻�佺嚎涓嬪彂6锛�"+dto.getWorkNo()+","+staProtocol.getSiteId());
if (!result) {
News.errorNoLog(""+mark+" - 1"+" - 鏇存柊plc绔欑偣淇℃伅澶辫触");
throw new CoolException("SiemensDevp - 5");
@@ -1407,7 +1408,7 @@
ledCommand.setEmptyMk(true);
break;
default:
- News.error("浠诲姟鍏ュ嚭搴撶被鍨嬮敊璇紒锛侊紒[宸ヤ綔鍙凤細{}] [鍏ュ嚭搴撶被鍨嬶細{}]", wrkMast.getWrkNo(), wrkMast.getIoType());
+// News.error("浠诲姟鍏ュ嚭搴撶被鍨嬮敊璇紒锛侊紒[宸ヤ綔鍙凤細{}] [鍏ュ嚭搴撶被鍨嬶細{}]", wrkMast.getWrkNo(), wrkMast.getIoType());
break;
}
ledCommand.setLocNo(wrkMast.getLocNo());
--
Gitblit v1.9.1