From 5b1a1d32abc8441bf73b7e2dc609def87e5a580a Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期四, 05 二月 2026 08:57:36 +0800
Subject: [PATCH] 删除不用的方法
---
src/main/java/com/zy/service/impl/MainServiceImpl.java | 213 ++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 186 insertions(+), 27 deletions(-)
diff --git a/src/main/java/com/zy/service/impl/MainServiceImpl.java b/src/main/java/com/zy/service/impl/MainServiceImpl.java
index 5e13bfe..dea54f0 100644
--- a/src/main/java/com/zy/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/service/impl/MainServiceImpl.java
@@ -27,9 +27,13 @@
import com.zy.core.properties.SlaveProperties;
import com.zy.core.thread.BarcodeThread;
import com.zy.core.thread.LedThread;
+import com.zy.core.thread.RgvThread;
import com.zy.core.thread.SiemensDevpThread;
+import com.zy.core.model.RgvSlave;
+import com.zy.core.model.protocol.RgvProtocol;
import com.zy.entity.*;
import com.zy.mapper.*;
+import com.zy.mapper.BasRgvErrMapper;
import com.zy.service.*;
import com.zy.utils.*;
import lombok.extern.slf4j.Slf4j;
@@ -93,6 +97,9 @@
@Resource
private BasDevpErrLogService basDevpErrLogService;
+
+ @Autowired
+ private BasRgvErrMapper basRgvErrMapper;
@Value("${wms.url}")
private String wmsUrl;
@@ -161,13 +168,12 @@
// 閫�鍥�
if (back && staProtocol.isInEnable() && staProtocol.isLoading() && staProtocol.isPakMk() && !staProtocol.isEmptyMk() ) {
MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errMsg));
- staProtocol.setWorkNo(wrkNo);
- wrkNo++;
- News.info("{}鍏ュ簱鍥為��锛歿}锛屼换鍔″彿锛歿}", inSta.getStaNo(), errMsg,wrkNo);
+ News.info("{}鍏ュ簱鍥為��锛歿}锛屼换鍔″彿锛歿}", inSta.getStaNo(), errMsg, staProtocol.getWorkNo());
+ staProtocol.setWorkNo(9999);
staProtocol.setStaNo(inSta.getBackSta().shortValue());
devpThread.setPakMk(staProtocol.getSiteId(), false);
MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
- log.error("杈撻�佺嚎涓嬪彂1锛�"+wrkNo+","+inSta.getBackSta());
+ log.error("杈撻�佺嚎涓嬪彂1锛�"+staProtocol.getWorkNo()+","+inSta.getBackSta());
return;
}
@@ -222,13 +228,12 @@
ledThread.errorReset();
}
} else {
- staProtocol.setWorkNo(wrkNo);
- wrkNo++;
+ staProtocol.setWorkNo(9999);
staProtocol.setStaNo(inSta.getBackSta().shortValue());
devpThread.setPakMk(staProtocol.getSiteId(), false);
MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
String errorMsg = jsonObject.getString("msg");
- log.error("鍏ㄧ増鍏ュ簱鍥為��,"+wrkNo+","+errorMsg);
+ log.error("鍏ㄧ増鍏ュ簱鍥為��,"+staProtocol.getWorkNo()+","+errorMsg);
if (!Cools.isEmpty(errorMsg)) {
MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errorMsg));
}
@@ -296,12 +301,11 @@
StaDesc staDesc = staDescService.selectOne(wrapper);
if (Cools.isEmpty(staDesc)) {
News.error(""+mark+" - 2"+" - 鍏ュ簱璺緞涓嶅瓨鍦紒type_no={},stn_no={},crn_no={}", wrkMast.getIoType(), pickSta.getStaNo(), wrkMast.getCrnNo());
- staProtocol.setWorkNo(wrkNo);
- wrkNo++;
+ staProtocol.setWorkNo(9999);
staProtocol.setStaNo((short) (pickSta.getStaNo().shortValue()-(short)1));
devpThread.setPakMk(staProtocol.getSiteId(), false);
MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
- log.error("杈撻�佺嚎涓嬪彂4锛�"+wrkNo+","+(pickSta.getStaNo().shortValue()-(short)1));
+ log.error("杈撻�佺嚎涓嬪彂4锛�"+staProtocol.getWorkNo()+","+(pickSta.getStaNo().shortValue()-(short)1));
//LED
LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, pickSta.getLed());
// led 寮傚父鏄剧ず
@@ -1044,6 +1048,12 @@
for (DevpSlave devp : slaveProperties.getDevp()) {
// 閬嶅巻绌烘澘鍏ュ簱鍙�
for (DevpSlave.Sta emptyInSta : devp.getEmptyInSta()) {
+ // 鑾峰彇鏉＄爜鎵弿浠俊鎭�
+ BarcodeThread barcodeThread = null;
+ if (!Cools.isEmpty(emptyInSta.getBarcode())) {
+ barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, emptyInSta.getBarcode());
+ }
+
// 鑾峰彇绌烘澘鍏ュ簱绔欎俊鎭�
SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
StaProtocol staProtocol = devpThread.getStation().get(emptyInSta.getStaNo());
@@ -1062,6 +1072,16 @@
continue;
}
+ // 妫�鏌ユ潯鐮佹壂鎻忥細濡傛灉鎵弿鍒版潯鐮侊紝鍒欏瓨鍏ワ紝鎵弿涓嶅埌锛屽垯涓嶅瓨
+ String barcode = null;
+ if (barcodeThread != null) {
+ barcode = barcodeThread.getBarcode();
+ // 濡傛灉鏉＄爜涓虹┖銆丯G銆丯oRead鎴�00000000
+ if (Cools.isEmpty(barcode) || barcode.endsWith("NG") || "NoRead".equals(barcode) || "00000000".equals(barcode)) {
+ barcode=null;
+ }
+ }
+
// 绔欑偣鏉′欢鍒ゆ柇
if (staProtocol.isAutoing() //鑷姩
&& staProtocol.isLoading() //鏈夌墿
@@ -1070,7 +1090,66 @@
&& staProtocol.isPakMk() //闃叉閲嶅涓嬪彂淇″彿 绔欑偣鏃犵墿 鏃犱换鍔″彿浼氳嚜鍔ㄥ彉鎴恡rue
) {
- News.warnNoLog(""+mark+" - 0"+" - 寮�濮嬫墽琛岋細绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐�");
+ // 鍒ゆ柇閲嶅宸ヤ綔妗�
+ WrkMast wrkMast = null;
+ if (!Cools.isEmpty(barcode)) {
+ // 鏈夋潯鐮佹椂锛屾鏌ユ槸鍚︽湁鐩稿悓绔欑偣鍜屾潯鐮佺殑绌烘澘鍏ュ簱宸ヤ綔妗�
+ wrkMast = wrkMastMapper.selectPakInStep1(emptyInSta.getStaNo(), barcode);
+ } else {
+ // 鏃犳潯鐮佹椂锛屾鏌ユ槸鍚︽湁鐩稿悓绔欑偣涓斿伐浣滅姸鎬佷负2鐨勭┖鏉垮叆搴撳伐浣滄。
+ wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
+ .eq("source_sta_no", emptyInSta.getStaNo())
+ .eq("wrk_sts", 2)
+ .eq("io_type", 10));
+ }
+ if (wrkMast != null) {
+ News.info("{}绌烘澘鍏ュ簱閲嶅宸ヤ綔妗ｆ鏌ワ細宸插瓨鍦ㄥ伐浣滄。锛屽伐浣滃彿锛歿}锛屾潯鐮侊細{}", emptyInSta.getStaNo(), wrkMast.getWrkNo(), barcode);
+ continue;
+ }
+
+ // 灏哄妫�娴嬪紓甯革紙澶嶅埢generateStoreWrkFile鐨勯�昏緫锛屼絾涓嶅寘鎷壂鐮佸け璐ワ級
+ boolean back = false;
+ String errMsg = "";
+ if (staProtocol.isFrontErr()) {
+ errMsg = "鍓嶈秴闄�";
+ back = true;
+ }
+ if (!back && staProtocol.isBackErr()) {
+ errMsg = "鍚庤秴闄�";
+ back = true;
+ }
+ if (!back && staProtocol.isHighErr()) {
+ errMsg = "楂樿秴闄�";
+ back = true;
+ }
+ if (!back && staProtocol.isLeftErr()) {
+ errMsg = "宸﹁秴闄�";
+ back = true;
+ }
+ if (!back && staProtocol.isRightErr()) {
+ errMsg = "鍙宠秴闄�";
+ back = true;
+ }
+ if (!back && staProtocol.isWeightErr()) {
+ errMsg = "瓒呴噸";
+ back = true;
+ }
+ // 閫�鍥烇紙绌烘墭鍏ュ簱鐨勬潯浠舵槸isEmptyMk涓簍rue锛�
+ if (back && staProtocol.isInEnable() && staProtocol.isLoading() && staProtocol.isPakMk() && staProtocol.isEmptyMk()) {
+ Integer ledId = emptyInSta.getLed();
+ if (ledId != null) {
+ MessageQueue.offer(SlaveType.Led, ledId, new Task(3, errMsg));
+ }
+ News.info("{}绌烘澘鍏ュ簱鍥為��锛歿}锛屼换鍔″彿锛歿}", emptyInSta.getStaNo(), errMsg, staProtocol.getWorkNo());
+ staProtocol.setWorkNo(9999);
+ staProtocol.setStaNo(emptyInSta.getBackSta().shortValue());
+ devpThread.setPakMk(staProtocol.getSiteId(), false);
+ MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+ log.error("杈撻�佺嚎涓嬪彂1锛堢┖鏉匡級锛�"+staProtocol.getWorkNo()+","+emptyInSta.getBackSta());
+ continue;
+ }
+
+ News.warnNoLog(""+mark+" - 0"+" - 寮�濮嬫墽琛岋細绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐э紝鏉＄爜锛歿}", barcode);
try {
LocTypeDto locTypeDto = new LocTypeDto(staProtocol);
@@ -1079,6 +1158,7 @@
param.setIoType(10);
param.setSourceStaNo(emptyInSta.getStaNo());
param.setLocType1(locTypeDto.getLocType1());
+ param.setBarcode(barcode); // 璁剧疆鎵弿鍒扮殑鏉＄爜
String response = new HttpHandler.Builder()
.setUri(wmsUrl)
.setPath("/rpc/pakin/loc/v1")
@@ -1088,6 +1168,11 @@
JSONObject jsonObject = JSON.parseObject(response);
if (jsonObject.getInteger("code").equals(200)) {
StartupDto dto = jsonObject.getObject("data", StartupDto.class);
+
+ // 娓呯┖鏉＄爜
+ if (barcodeThread != null) {
+ barcodeThread.setBarcode("");
+ }
// 鏇存柊绔欑偣淇℃伅 涓� 涓嬪彂plc鍛戒护
staProtocol.setWorkNo(dto.getWorkNo());
@@ -1112,26 +1197,25 @@
ledCommand.setStaNo(dto.getStaNo());
commands.add(ledCommand);
MessageQueue.offer(SlaveType.Led, emptyInSta.getLed(), new Task(1, commands));
-// ledThread.errorReset();
+ }
+ // 鎴愬姛鏃堕噸缃甃ED閿欒
+ if (ledThread != null) {
+ ledThread.errorReset();
}
} else {
- staProtocol.setWorkNo(wrkNo);
- wrkNo++;
+ String errorMsg = jsonObject.getString("msg");
+ // 濡傛灉浠诲姟鍥為��锛屽苟涓旂珯鐐逛笉鏄嚜鍔ㄧ姸鎬侊紝鍒欎笉瑙﹀彂鍥為��
+ if (!staProtocol.isAutoing()) {
+ log.error("绌烘澘鍏ュ簱鍥為��,"+staProtocol.getWorkNo()+","+errorMsg+"锛岀珯鐐逛笉鏄嚜鍔ㄧ姸鎬侊紝涓嶈Е鍙戝洖閫�");
+ continue;
+ }
+ staProtocol.setWorkNo(9999);
staProtocol.setStaNo(emptyInSta.getBackSta().shortValue());
devpThread.setPakMk(staProtocol.getSiteId(), false);
- boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
- String errorMsg = jsonObject.getString("msg");
- log.error("绌烘澘鍏ュ簱鍥為��"+wrkNo+","+errorMsg);
- if (!result) {
- News.errorNoLog(""+mark+" - 2"+" - 鏇存柊plc绔欑偣淇℃伅澶辫触");
- throw new CoolException("鏇存柊plc绔欑偣淇℃伅澶辫触");
- }
-
- if (ledThread != null) {
-
- if (!Cools.isEmpty(errorMsg)) {
- MessageQueue.offer(SlaveType.Led, emptyInSta.getLed(), new Task(3, errorMsg));
- }
+ MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+ log.error("绌烘澘鍏ュ簱鍥為��,"+staProtocol.getWorkNo()+","+errorMsg);
+ if (!Cools.isEmpty(errorMsg)) {
+ MessageQueue.offer(SlaveType.Led, emptyInSta.getLed(), new Task(3, errorMsg));
}
// News.error(""+mark+" - 3"+" - 璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", wmsUrl + "/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
}
@@ -1204,6 +1288,31 @@
);
if (!basDevpErrLogService.insert(basErrLog)) {
News.error("杈撻�佺嚎寮傚父淇℃伅鎻掑叆琛╝sr_bas_devp_err_log寮傚父锛歿}", basErrLog);
+ }
+
+ // 杈撻�佺嚎鎶ヨ鏃舵墭鐩橀��鍥�
+ if (staProtocol.isInEnable() && staProtocol.isLoading() && staProtocol.isPakMk() && !staProtocol.isEmptyMk()) {
+ Integer backSta = findBackSta(devp, siteNo);
+ if (backSta != null) {
+ log.info("銆愯緭閫佺嚎鎶ヨ閫�鍥炪�戠珯鐐癸細{}锛屽伐浣滃彿锛歿}锛屾姤璀︼細{}锛岄��鍥炵珯锛歿}", siteNo, workNo, plcErr, backSta);
+ // 鎺ㄩ�佸埌LED鏄剧ず鎶ヨ淇℃伅
+ Integer ledId = findLedId(devp, siteNo);
+ if (ledId != null) {
+ MessageQueue.offer(SlaveType.Led, ledId, new Task(3, plcErr));
+ }
+ // 璁剧疆閫�鍥炵珯
+ staProtocol.setWorkNo(9999);
+ staProtocol.setStaNo(backSta.shortValue());
+ devpThread.setPakMk(staProtocol.getSiteId(), false);
+ boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+ if (!result) {
+ News.error("杈撻�佺嚎鎶ヨ閫�鍥炲け璐ワ紝绔欑偣锛歿}锛屽伐浣滃彿锛歿}", siteNo, workNo);
+ } else {
+ log.info("銆愯緭閫佺嚎鎶ヨ閫�鍥炪�戞垚鍔熶笅鍙戦��鍥炴寚浠わ紝绔欑偣锛歿}锛屽伐浣滃彿锛歿}锛岄��鍥炵珯锛歿}", siteNo, workNo, backSta);
+ }
+ } else {
+ log.warn("銆愯緭閫佺嚎鎶ヨ閫�鍥炪�戞湭鎵惧埌閫�鍥炵珯閰嶇疆锛岀珯鐐癸細{}锛屽伐浣滃彿锛歿}", siteNo, workNo);
+ }
}
}
} else {
@@ -1318,6 +1427,56 @@
}
/**
+ * 鏍规嵁绔欑偣鍙锋煡鎵鹃��鍥炵珯
+ */
+ private Integer findBackSta(DevpSlave devp, Integer siteNo) {
+ // 鏌ユ壘鍏ュ簱绔�
+ for (DevpSlave.Sta inSta : devp.getInSta()) {
+ if (inSta.getStaNo().equals(siteNo)) {
+ return inSta.getBackSta();
+ }
+ }
+ // 鏌ユ壘鎷ｆ枡绔�
+ for (DevpSlave.Sta pickSta : devp.getPickSta()) {
+ if (pickSta.getStaNo().equals(siteNo)) {
+ return pickSta.getBackSta();
+ }
+ }
+ // 鏌ユ壘绌烘澘鍏ュ簱绔�
+ for (DevpSlave.Sta emptyInSta : devp.getEmptyInSta()) {
+ if (emptyInSta.getStaNo().equals(siteNo)) {
+ return emptyInSta.getBackSta();
+ }
+ }
+ return null;
+ }
+
+ /**
+ * 鏍规嵁绔欑偣鍙锋煡鎵綥ED ID
+ */
+ private Integer findLedId(DevpSlave devp, Integer siteNo) {
+ // 鏌ユ壘鍏ュ簱绔�
+ for (DevpSlave.Sta inSta : devp.getInSta()) {
+ if (inSta.getStaNo().equals(siteNo)) {
+ return inSta.getLed();
+ }
+ }
+ // 鏌ユ壘鎷ｆ枡绔�
+ for (DevpSlave.Sta pickSta : devp.getPickSta()) {
+ if (pickSta.getStaNo().equals(siteNo)) {
+ return pickSta.getLed();
+ }
+ }
+ // 鏌ユ壘绌烘澘鍏ュ簱绔�
+ for (DevpSlave.Sta emptyInSta : devp.getEmptyInSta()) {
+ if (emptyInSta.getStaNo().equals(siteNo)) {
+ return emptyInSta.getLed();
+ }
+ }
+ return null;
+ }
+
+ /**
* 鍑哄簱 ===>> 宸ヤ綔妗ｄ俊鎭啓鍏ed鏄剧ず鍣�
*/
public synchronized void ledExecute() {
--
Gitblit v1.9.1