From 40c2987c083122db0c9f9ea57750abb42d85b642 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期二, 16 七月 2024 13:12:51 +0800
Subject: [PATCH] 完善移库任务自动下发
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 415 +++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 357 insertions(+), 58 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 45544ce..01d8c90 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -19,6 +19,7 @@
import com.zy.common.service.CommonService;
import com.zy.common.utils.CollectionUtils;
import com.zy.common.utils.HttpHandler;
+import com.zy.common.utils.News;
import com.zy.core.CrnThread;
import com.zy.core.DevpThread;
import com.zy.core.cache.MessageQueue;
@@ -38,18 +39,21 @@
import com.zy.core.thread.SiemensCrnThread;
import com.zy.core.thread.SiemensDevpThread;
import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.ss.formula.functions.T;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import springfox.documentation.spring.web.json.Json;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
+
/**
* 绔嬩綋浠撳簱WCS绯荤粺涓绘祦绋嬩笟鍔�
@@ -94,6 +98,8 @@
@Value("${test.url}")
private String testUrl;
+ @Autowired
+ private WrkMastService wrkMastService;
/**
* 缁勬墭
@@ -128,10 +134,9 @@
} else {
staProtocol = staProtocol.clone();
}
-
+ //staProtocol.setPakMk(true);
// // 鍏ュ嚭搴撴ā寮忓垽鏂�
// if ( inSta.getStaNo()==180 && devpThread.ioMode != IoModeType.PAKIN_MODE) { continue; }
- staProtocol.setPakMk(true);
// 鍒ゆ柇鏄惁婊¤冻鍏ュ簱鏉′欢
if (staProtocol.isAutoing() && staProtocol.isLoading()
&& staProtocol.isInEnable()
@@ -152,9 +157,9 @@
// }
// 鍒ゆ柇閲嶅宸ヤ綔妗�
- WrkMast wrkMast = wrkMastMapper.selectPakInStep1(inSta.getStaNo(), barcode);
+ WrkMast wrkMast = wrkMastMapper.selectPakInStep1(inSta.getStaNo(), barcode.substring(0,6));
if (wrkMast != null) {
- log.error("宸ヤ綔妗ｄ腑宸插瓨鍦ㄨ绔欑姸鎬佷负锛� 2.璁惧涓婅蛋 锛夌殑鏁版嵁,宸ヤ綔鍙�={}", wrkMast.getWrkNo());
+ News.error("宸ヤ綔妗ｄ腑宸插瓨鍦ㄨ绔欑姸鎬佷负锛� 2.璁惧涓婅蛋 锛夌殑鏁版嵁,宸ヤ綔鍙�={}", wrkMast.getWrkNo());
continue;
}
// // 鑾峰彇鍏ュ簱閫氱煡妗�
@@ -165,9 +170,20 @@
// }
try {
- //String pack=barcode.substring(6);//pack鐮�
- String pack="MJY0136 0300";
+ String pack =null;//pack鐮�
+ if(barcode.length()>6){
+ pack=barcode.substring(6);
+ if(pack.equals("00000000000000000000")){
+ News.error("娌℃湁鑾峰緱Pack鐮�",pack);
+ continue;
+ }
+ }
+ //String pack="MJY0136 0400";
barcode=barcode.substring(0,6);//鎵樼洏鐮�
+ if(barcode.equals("000000")){
+ News.error("娌℃湁鑾峰緱鏉＄爜",barcode);
+ continue;
+ }
LocTypeDto locTypeDto = new LocTypeDto(staProtocol);
locTypeDto.setLocType1((short)1);
SearchLocParam param = new SearchLocParam();
@@ -185,31 +201,31 @@
JSONObject jsonObject = JSON.parseObject(response);
if (jsonObject.getInteger("code").equals(200)) {
StartupDto dto = jsonObject.getObject("data", StartupDto.class);
-
barcodeThread.setBarcode("");
staProtocol.setWorkNo(dto.getWorkNo().shortValue());
staProtocol.setStaNo(dto.getStaNo().shortValue());
devpThread.setPakMk(staProtocol.getSiteId(), false);
boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
if (!result) {
+ News.error("鏇存柊plc绔欑偣淇℃伅澶辫触");
throw new CoolException("鏇存柊plc绔欑偣淇℃伅澶辫触");
}
} else if (jsonObject.getInteger("code").equals(700) && (!barcodeThread.getBarcode().equals("NG"))){
StartupDto dto = jsonObject.getObject("data", StartupDto.class);
barcodeThread.setBarcode("");
- staProtocol.setWorkNo((short)9998);
- staProtocol.setStaNo((short)101);
- devpThread.setPakMk(staProtocol.getSiteId(), false);
+ staProtocol.setWorkNo((short)9999);
+ staProtocol.setStaNo((short)201);
+ devpThread.setPakMk(staProtocol.getSiteId(), true);
boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
- log.error("url锛歿}锛況equest锛歿}锛況esponse锛歿}", wmsUrl+"/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
+ News.error("url锛歿}锛況equest锛歿}锛況esponse锛歿}", wmsUrl+"/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
}else {
StartupDto dto = jsonObject.getObject("data", StartupDto.class);
barcodeThread.setBarcode("");
- staProtocol.setWorkNo((short)9998);
- staProtocol.setStaNo((short)101);
- devpThread.setPakMk(staProtocol.getSiteId(), false);
+ staProtocol.setWorkNo((short)9999);
+ staProtocol.setStaNo((short)201);
+ devpThread.setPakMk(staProtocol.getSiteId(), true);
boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
- log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", wmsUrl+"/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
+ News.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", wmsUrl+"/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
}
@@ -271,6 +287,7 @@
// }
} catch (Exception e) {
+ News.error("鎵爜鍏ュ簱鎶ラ敊锛岄敊璇俊鎭�",e);
e.printStackTrace();
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
}
@@ -327,7 +344,7 @@
log.error("鏇存柊宸ヤ綔妗ｅけ璐ワ紒锛侊紒 [宸ヤ綔鍙凤細{}]", wrkMast.getWrkNo());
}
} else {
- log.error("鍙戝竷鍛戒护鑷宠緭閫佺嚎闃熷垪澶辫触锛侊紒锛� [plc缂栧彿锛歿}]", devp.getId());
+ News.error("鍙戝竷鍛戒护鑷宠緭閫佺嚎闃熷垪澶辫触锛侊紒锛� [plc缂栧彿锛歿}]", devp.getId());
}
}
@@ -489,7 +506,7 @@
} else {
staProtocol = staProtocol.clone();
}
- if (staProtocol.isAutoing() && (staProtocol.isLoading()||staProtocol.getSiteId()==109) && (staProtocol.getWorkNo() == 0 || staProtocol.getStaNo() == null)) {
+ if (staProtocol.isAutoing() && (staProtocol.isLoading()||staProtocol.getSiteId()==1000) && (staProtocol.getWorkNo() == 0 || staProtocol.getStaNo() == null)) {
// 鏌ヨ宸ヤ綔妗�
WrkMast wrkMast = wrkMastMapper.selectPakOutStep2(staProtocol.getSiteId());
if (wrkMast == null) {
@@ -497,6 +514,7 @@
}
// 鍒ゆ柇宸ヤ綔妗ｆ潯浠�
if (wrkMast.getIoType() < 100 || wrkMast.getStaNo() == null || wrkMast.getSourceStaNo() == null) {
+ News.error("宸ヤ綔妗ｆ鏉′欢涓嶆弧瓒筹細宸ヤ綔妗ｆ锛�"+wrkMast+";鏉′欢iotype<100鎴栬�卻taNo涓虹┖鎴栬�卻ourceStaNo涓虹┖");
continue;
}
// 鍒ゆ柇鍚婅溅鏄惁瀹為檯宸插畬鎴愶紝涓旂數鑴戠姸鎬佸湪move涓紝浠ュ鐢佃剳杩涜鏇存柊宸ヤ綔妗�
@@ -527,7 +545,7 @@
// 澶嶄綅鍫嗗灈鏈�
crnThread.setResetFlag(true);
} else {
- log.error("鏇存柊宸ヤ綔妗ｇ殑宸ヤ綔鐘舵�佷负14澶辫触锛侊紒锛� [宸ヤ綔鍙�:{}]", wrkMast.getWrkNo());
+ News.error("鏇存柊宸ヤ綔妗ｇ殑宸ヤ綔鐘舵�佷负14澶辫触锛侊紒锛� [宸ヤ綔鍙�:{}]", wrkMast.getWrkNo());
}
}
@@ -548,7 +566,7 @@
if (crnProtocol == null) { continue; }
BasCrnp basCrnp = basCrnpService.selectById(crn.getId());
if (basCrnp == null) {
- log.error("{}鍙峰爢鍨涙満灏氭湭鍦ㄦ暟鎹簱杩涜缁存姢锛�", crn.getId());
+ News.error("{}鍙峰爢鍨涙満灏氭湭鍦ㄦ暟鎹簱杩涜缁存姢锛�", crn.getId());
continue;
}
@@ -664,7 +682,7 @@
// 鏌ヨ绔欑偣璇︾粏淇℃伅
BasDevp staDetl = basDevpService.selectById(crnStn.getStaNo());
if (staDetl == null) {
- log.error("鍏ュ簱 ===>> 鍫嗗灈鏈虹珯鐐瑰湪鏁版嵁搴撲笉瀛樺湪, 绔欑偣缂栧彿={}", crnStn.getStaNo());
+ News.error("鍏ュ簱 ===>> 鍫嗗灈鏈虹珯鐐瑰湪鏁版嵁搴撲笉瀛樺湪, 绔欑偣缂栧彿={}", crnStn.getStaNo());
continue;
}
if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.getWorkNo() > 0 && staProtocol.isInEnable()
@@ -683,11 +701,11 @@
// 鑾峰彇搴撲綅淇℃伅
LocMast locMast = locMastService.selectById(wrkMast.getLocNo());
if (locMast == null) {
- log.error("鏌ヨ搴撳瓨鏃犳暟鎹�--搴撲綅鍙穥}", wrkMast.getLocNo());
+ News.error("鏌ヨ搴撳瓨鏃犳暟鎹�--搴撲綅鍙穥}", wrkMast.getLocNo());
continue;
}
if (!locMast.getLocSts().equals("S") && !locMast.getLocSts().equals("Q")) {
- log.error("鍏ュ簱鎿嶄綔搴撲綅鐘舵�佷笉绗﹀悎--鐘舵��, 搴撲綅鍙�={}锛屽簱浣嶇姸鎬�={}", wrkMast.getLocNo(), locMast.getLocSts());
+ News.error("鍏ュ簱鎿嶄綔搴撲綅鐘舵�佷笉绗﹀悎--鐘舵��, 搴撲綅鍙�={}锛屽簱浣嶇姸鎬�={}", wrkMast.getLocNo(), locMast.getLocSts());
continue;
}
@@ -709,12 +727,12 @@
if (shallowLoc.getLocSts().equals("P") || shallowLoc.getLocSts().equals("R")) {
WrkMast waitWrkMast = wrkMastMapper.selectByLocNo(shallowLocNo);
if (null == waitWrkMast) {
- log.error("{}搴撲綅寮傚父锛屾湭妫�绱㈠埌鐩稿簲宸ヤ綔妗ｏ紒", shallowLocNo);
+ News.error("{}搴撲綅寮傚父锛屾湭妫�绱㈠埌鐩稿簲宸ヤ綔妗ｏ紒", shallowLocNo);
} else {
waitWrkMast.setIoPri(15D);
waitWrkMast.setModiTime(new Date());
if (wrkMastMapper.updateById(waitWrkMast) == 0) {
- log.error("璋冩暣宸ヤ綔妗ｄ紭鍏堢骇澶辫触锛佸伐浣滃彿={}", waitWrkMast.getWrkNo());
+ News.error("璋冩暣宸ヤ綔妗ｄ紭鍏堢骇澶辫触锛佸伐浣滃彿={}", waitWrkMast.getWrkNo());
}
continue;
}
@@ -751,10 +769,13 @@
crnCommand.setDestinationPosX(locMast.getRow1().shortValue()); // 鐩爣搴撲綅鎺�
crnCommand.setDestinationPosY(locMast.getBay1().shortValue()); // 鐩爣搴撲綅鍒�
crnCommand.setDestinationPosZ(locMast.getLev1().shortValue()); // 鐩爣搴撲綅灞俓
- crnCommand.setBarcode(wrkMast.getBarcode());
+ crnCommand.setBarcode(wrkMast.getBarcode());//鎵樼洏鐮�
+ log.error("768 鍫嗗灈鏈哄懡浠や笅鍙�"+crnCommand);
if (!MessageQueue.offer(SlaveType.Crn, wrkMast.getCrnNo(), new Task(2, crnCommand))) {
- log.error("鍫嗗灈鏈哄懡浠や笅鍙戝け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", wrkMast.getCrnNo(), JSON.toJSON(crnCommand));
+ News.error("鍫嗗灈鏈哄懡浠や笅鍙戝け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", wrkMast.getCrnNo(), JSON.toJSON(crnCommand));
} else {
+ log.error("772 鍫嗗灈鏈哄懡浠や笅鍙戞垚鍔�"+crnCommand);
+ News.info("772 鍫嗗灈鏈哄懡浠や笅鍙戞垚鍔�"+crnCommand);
// long startTime = System.currentTimeMillis();
// while ((System.currentTimeMillis() - startTime) < COMMAND_TIMEOUT) {
@@ -769,13 +790,17 @@
// }
// 淇敼宸ヤ綔妗ｇ姸鎬� 2.璁惧涓婅蛋 => 3.鍚婅溅鍏ュ簱涓�
+ log.error("787 淇敼宸ヤ綔妗ｇ姸鎬�2.璁惧涓婅蛋 => 3.鍚婅溅鍏ュ簱涓� "+wrkMast);
+ News.info("787 淇敼宸ヤ綔妗ｇ姸鎬�2.璁惧涓婅蛋 => 3.鍚婅溅鍏ュ簱涓� "+wrkMast);
Date now = new Date();
wrkMast.setWrkSts(3L);
wrkMast.setCrnStrTime(now);
wrkMast.setModiTime(now);
if (wrkMastMapper.updateById(wrkMast) == 0) {
- log.error("淇敼宸ヤ綔妗ｇ姸鎬� 2.璁惧涓婅蛋 => 3.鍚婅溅鍏ュ簱涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkMast.getWrkNo());
+ News.error("淇敼宸ヤ綔妗ｇ姸鎬� 2.璁惧涓婅蛋 => 3.鍚婅溅鍏ュ簱涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkMast.getWrkNo());
}
+ log.error("795 淇敼宸ヤ綔妗ｇ姸鎬佹垚鍔�2.璁惧涓婅蛋 => 3.鍚婅溅鍏ュ簱涓�"+wrkMast);
+ News.info("795 淇敼宸ヤ綔妗ｇ姸鎬佹垚鍔�2.璁惧涓婅蛋 => 3.鍚婅溅鍏ュ簱涓�"+wrkMast);
}
}
}
@@ -795,13 +820,13 @@
}
// 宸ヤ綔妗ｇ姸鎬佸垽鏂�
if (wrkMast.getIoType() < 100 || wrkMast.getSourceStaNo() == null){
- log.error("鏌ヨ宸ヤ綔妗ｆ暟鎹笉绗﹀悎鏉′欢--鍏ュ嚭绫诲瀷/绔欑偣, 宸ヤ綔鍙�={}锛屾簮搴撲綅={}锛屽叆鍑虹被鍨�={}", wrkMast.getWrkNo(), wrkMast.getSourceLocNo(), wrkMast.getIoType());
+ News.error("鏌ヨ宸ヤ綔妗ｆ暟鎹笉绗﹀悎鏉′欢--鍏ュ嚭绫诲瀷/绔欑偣, 宸ヤ綔鍙�={}锛屾簮搴撲綅={}锛屽叆鍑虹被鍨�={}", wrkMast.getWrkNo(), wrkMast.getSourceLocNo(), wrkMast.getIoType());
continue;
}
// 鑾峰彇婧愬簱浣嶄俊鎭�
LocMast sourceSta = locMastService.selectById(wrkMast.getSourceLocNo());
if (!sourceSta.getLocSts().equals("R") &&!sourceSta.getLocSts().equals("P")) {
- log.error("鍑哄簱鎿嶄綔搴撲綅鐘舵�佷笉绗﹀悎--鐘舵��, 搴撲綅鍙�={}锛屽簱浣嶇姸鎬�={}", wrkMast.getLocNo(), sourceSta.getLocSts());
+ News.error("鍑哄簱鎿嶄綔搴撲綅鐘舵�佷笉绗﹀悎--鐘舵��, 搴撲綅鍙�={}锛屽簱浣嶇姸鎬�={}", wrkMast.getLocNo(), sourceSta.getLocSts());
continue;
}
// 鑾峰彇鍫嗗灈鏈哄嚭搴撶珯淇℃伅
@@ -820,13 +845,28 @@
// 鏌ヨ绔欑偣璇︾粏淇℃伅
BasDevp staDetl = basDevpService.selectById(crnStn.getStaNo());
if (staDetl == null) {
- log.error("鍑哄簱 ===>> 鍫嗗灈鏈虹珯鐐瑰湪鏁版嵁搴撲笉瀛樺湪, 绔欑偣缂栧彿={}", crnStn.getStaNo());
+ News.error("鍑哄簱 ===>> 鍫嗗灈鏈虹珯鐐瑰湪鏁版嵁搴撲笉瀛樺湪, 绔欑偣缂栧彿={}", crnStn.getStaNo());
break;
// continue;
}
+ //鏌ヨ鍦ㄥ簱淇℃伅
+ LocMast locMast =locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("loc_sts","R")
+ .eq("loc_no",wrkMast.getSourceLocNo()));
+ if(Cools.isEmpty(locMast)){
+ News.error("鍑哄簱 ===>> 搴撲綅涓病鏈夎繖绗旇祫鏂�",wrkMast.getSourceLocNo());
+ continue;
+ }
+
+
// 鍒ゆ柇鍫嗗灈鏈哄嚭搴撶珯鐘舵��
if (staProtocol.isAutoing() && !staProtocol.isLoading() && staDetl.getCanouting() !=null && staDetl.getCanouting().equals("Y")
&& staProtocol.getWorkNo() == 0 && staProtocol.isOutEnable()) {
+ //娴嬭瘯搴撲綅鍑哄簱蹇呴』瑕佹寜鍚姩鎸夐挳鎵嶈兘鍑哄簱
+ if((wrkMast.getStaNo()==206 || wrkMast.getStaNo()==1000)&& locMast.getCtnKind()==0){
+ News.error("鍑哄簱 ===>> 绛夊緟鍚姩鍑哄簱鎸夐挳",wrkMast);
+ continue;
+ }
// 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
// 鍫嗗灈鏈烘帶鍒惰繃婊�
@@ -843,13 +883,13 @@
if (shallowLoc.getLocSts().equals("P") || shallowLoc.getLocSts().equals("R")) {
WrkMast waitWrkMast = wrkMastMapper.selectByLocNo(shallowLocNo);
if (null == waitWrkMast) {
- log.error("{}搴撲綅寮傚父锛屾湭妫�绱㈠埌鐩稿簲宸ヤ綔妗ｏ紒", shallowLocNo);
+ News.error("{}搴撲綅寮傚父锛屾湭妫�绱㈠埌鐩稿簲宸ヤ綔妗ｏ紒", shallowLocNo);
} else {
if(waitWrkMast.getWrkSts() == 11) {
waitWrkMast.setIoPri(15D);
waitWrkMast.setModiTime(new Date());
if (wrkMastMapper.updateById(waitWrkMast) == 0) {
- log.error("璋冩暣宸ヤ綔妗ｄ紭鍏堢骇澶辫触锛佸伐浣滃彿={}", waitWrkMast.getWrkNo());
+ News.error("璋冩暣宸ヤ綔妗ｄ紭鍏堢骇澶辫触锛佸伐浣滃彿={}", waitWrkMast.getWrkNo());
}
continue;
} else {
@@ -866,7 +906,7 @@
// 鐢熸垚宸ヤ綔妗�,灏嗘祬搴撲綅绉昏浆鍒版柊鐨勫簱浣嶄腑
moveLocForDeepLoc(slave, shallowLoc);
}
- log.error("{}浠诲姟鍑哄簱澶辫触锛屾祬搴撲綅鍫靛锛�", wrkMast.getWrkNo());
+ News.error("{}浠诲姟鍑哄簱澶辫触锛屾祬搴撲綅鍫靛锛�", wrkMast.getWrkNo());
continue;
} else if (shallowLoc.getLocSts().equals("Q") || shallowLoc.getLocSts().equals("S")){
WrkMast waitWrkMast = wrkMastMapper.selectByLocNo(shallowLocNo);
@@ -882,6 +922,7 @@
// return;
}
+
// 1.鍫嗗灈鏈哄紑濮嬬Щ鍔�
CrnCommand crnCommand = new CrnCommand();
crnCommand.setCrnNo(slave.getId()); // 鍫嗗灈鏈虹紪鍙�
@@ -896,7 +937,7 @@
crnCommand.setDestinationPosZ(crnStn.getLev().shortValue()); // 鐩爣搴撲綅灞�
crnCommand.setBarcode(wrkMast.getBarcode());
if (!MessageQueue.offer(SlaveType.Crn, wrkMast.getCrnNo(), new Task(2, crnCommand))) {
- log.error("鍫嗗灈鏈哄懡浠や笅鍙戝け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", wrkMast.getCrnNo(), JSON.toJSON(crnCommand));
+ News.error("鍫嗗灈鏈哄懡浠や笅鍙戝け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", wrkMast.getCrnNo(), JSON.toJSON(crnCommand));
} else {
// 淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓�
Date now = new Date();
@@ -904,7 +945,7 @@
wrkMast.setCrnStrTime(now);
wrkMast.setModiTime(now);
if (wrkMastMapper.updateById(wrkMast) == 0) {
- log.error("淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkMast.getWrkNo());
+ News.error("淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkMast.getWrkNo());
}
break;
}
@@ -1034,15 +1075,42 @@
* 搴撲綅绉昏浆
*/
public void locToLoc(CrnSlave slave, CrnProtocol crnProtocol){
+ log.info("寮�濮嬬Щ搴撲换鍔＄▼搴�");
+ //鑾峰彇鎵�鏈夌Щ搴撲换鍔�
+ List<WrkMast> wrkMasts=wrkMastMapper.selectLocMoves(slave.getId());
// 鑾峰彇宸ヤ綔妗ｄ俊鎭�
- WrkMast wrkMast = wrkMastMapper.selectLocMove(slave.getId());
- if (null == wrkMast) {
+ WrkMast wrkMast =null;
+ if(Cools.isEmpty(wrkMasts)){
return;
}
+ //鍏堟煡娴嬭瘯搴撲綅杞琌K鎴栬�匩G搴撲綅鎸変簡鎸夐挳鐨�
+ for (WrkMast wm: wrkMasts) {
+ LocMast sourceSta1 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no",wm.getSourceLocNo()));
+ if (!Cools.isEmpty(sourceSta1.getCtnKind())){
+ if(sourceSta1.getCtnKind()==1){
+ wrkMast=wm;
+ break;
+ }
+ }
+ }
+ //鍚庢煡绛夊緟搴撲綅杞祴璇曞簱浣�
+ if(Cools.isEmpty(wrkMast)){
+ for (WrkMast wm: wrkMasts) {
+ LocMast sourceSta1 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no",wm.getSourceLocNo()));
+ if (sourceSta1.getLocType1()==3){
+ wrkMast=wm;
+ }
+ }
+ }
+ //閮芥病鏈夋弧瓒虫潯浠剁殑锛岃烦杩囩Щ搴�
+ if(Cools.isEmpty(wrkMast)){
+ return;
+ }
+
// 鑾峰彇婧愬簱浣嶄俊鎭�
LocMast sourceSta = locMastService.selectById(wrkMast.getSourceLocNo());
if (null == sourceSta) {
- log.error("宸ヤ綔妗ｅ簱浣嶇Щ杞け璐ワ紝鍘熷洜锛氭绱㈡簮搴撲綅澶辫触锛佸伐浣滃彿={}锛屾簮搴撲綅={}", wrkMast.getWrkNo(), wrkMast.getSourceLocNo());
+ News.error("宸ヤ綔妗ｅ簱浣嶇Щ杞け璐ワ紝鍘熷洜锛氭绱㈡簮搴撲綅澶辫触锛佸伐浣滃彿={}锛屾簮搴撲綅={}", wrkMast.getWrkNo(), wrkMast.getSourceLocNo());
return;
}
// 婧愬簱浣� 搴撲綅鐘舵�佸垽鏂�
@@ -1052,7 +1120,7 @@
// 鑾峰彇鐩爣搴撲綅淇℃伅
LocMast sta = locMastService.selectById(wrkMast.getLocNo());
if (null == sta) {
- log.error("宸ヤ綔妗ｅ簱浣嶇Щ杞け璐ワ紝鍘熷洜锛氭绱㈢洰鏍囧簱浣嶅け璐ワ紒宸ヤ綔鍙�={}锛屾簮搴撲綅={}", wrkMast.getWrkNo(), wrkMast.getLocNo());
+ News.error("宸ヤ綔妗ｅ簱浣嶇Щ杞け璐ワ紝鍘熷洜锛氭绱㈢洰鏍囧簱浣嶅け璐ワ紒宸ヤ綔鍙�={}锛屾簮搴撲綅={}", wrkMast.getWrkNo(), wrkMast.getLocNo());
return;
}
// 鑾峰彇鍫嗗灈鏈轰俊鎭� 骞� 鍒ゆ柇鏄惁鍙叆鍑�
@@ -1071,6 +1139,12 @@
return;
}
+ //娴嬭瘯搴撲綅鍑哄簱蹇呴』瑕佹寜鍚姩鎸夐挳鎵嶈兘鍑哄簱
+ if(sourceSta.getLocType1()==1 && sourceSta.getCtnKind()==0){
+ News.error("鍑哄簱 ===>> 绛夊緟鍚姩鎸夐挳",wrkMast);
+ return;
+ }
+
// 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
CrnCommand crnCommand = new CrnCommand();
crnCommand.setCrnNo(slave.getId()); // 鍫嗗灈鏈虹紪鍙�
@@ -1083,8 +1157,13 @@
crnCommand.setDestinationPosX(sta.getRow1().shortValue()); // 鐩爣搴撲綅鎺�
crnCommand.setDestinationPosY(sta.getBay1().shortValue()); // 鐩爣搴撲綅鍒�
crnCommand.setDestinationPosZ(sta.getLev1().shortValue()); // 鐩爣搴撲綅灞�
+ if(!sta.getLocNo().equals("0102501")){
+ crnCommand.setBarcode(wrkMast.getBarcode());//鎵樼洏鐮�
+ }else {
+ crnCommand.setFireStaut((short) 1);
+ }
if (!MessageQueue.offer(SlaveType.Crn, wrkMast.getCrnNo(), new Task(2, crnCommand))) {
- log.error("鍫嗗灈鏈哄懡浠や笅鍙戝け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", wrkMast.getCrnNo(), JSON.toJSON(crnCommand));
+ News.error("鍫嗗灈鏈哄懡浠や笅鍙戝け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", wrkMast.getCrnNo(), JSON.toJSON(crnCommand));
} else {
// 淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓�
Date now = new Date();
@@ -1092,9 +1171,10 @@
wrkMast.setCrnStrTime(now);
wrkMast.setModiTime(now);
if (wrkMastMapper.updateById(wrkMast) == 0) {
- log.error("銆愬簱浣嶇Щ杞�� 淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkMast.getWrkNo());
+ News.error("銆愬簱浣嶇Щ杞�� 淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkMast.getWrkNo());
}
}
+ log.info("缁撴潫绉诲簱浠诲姟绋嬪簭");
}
@@ -1117,7 +1197,7 @@
// 鑾峰彇鍏ュ簱寰呯‘璁ゅ伐浣滄。
WrkMast wrkMast = wrkMastMapper.selectPakInStep3(crnProtocol.getTaskNo().intValue());
if (wrkMast == null) {
- log.error("鍫嗗灈鏈哄浜庣瓑寰呯‘璁や笖浠诲姟瀹屾垚鐘舵�侊紝浣嗘湭鎵惧埌宸ヤ綔妗ｃ�傚爢鍨涙満鍙�={}锛屽伐浣滃彿={}", crn.getId(), crnProtocol.getTaskNo());
+ News.error("鍫嗗灈鏈哄浜庣瓑寰呯‘璁や笖浠诲姟瀹屾垚鐘舵�侊紝浣嗘湭鎵惧埌宸ヤ綔妗ｃ�傚爢鍨涙満鍙�={}锛屽伐浣滃彿={}", crn.getId(), crnProtocol.getTaskNo());
continue;
}
// 鍏ュ簱 + 搴撲綅杞Щ ==> 4.鍏ュ簱瀹屾垚
@@ -1853,15 +1933,15 @@
if (wrkMast == null) { continue; }
// 鍏ュ簱
if (wrkMast.getWrkSts() == 1 || wrkMast.getWrkSts() == 2) {
- log.warn("鍫嗗灈鏈洪潪绌洪棽鎯呭喌涓嬶紝寮�濮嬩慨鏀瑰伐浣滄。鐘舵�併�俒id:{},鏃堕棿锛歿}] >>>>> 鍫嗗灈鏈哄綋鍓嶇姸鎬佷负锛歿}銆備换鍔″彿:{}", crn.getId(), DateUtils.convert(now, DateUtils.yyyyMMddHHmmsssss_F), crnProtocol.getStatusType().desc, crnProtocol.getTaskNo());
+ News.warn("鍫嗗灈鏈洪潪绌洪棽鎯呭喌涓嬶紝寮�濮嬩慨鏀瑰伐浣滄。鐘舵�併�俒id:{},鏃堕棿锛歿}] >>>>> 鍫嗗灈鏈哄綋鍓嶇姸鎬佷负锛歿}銆備换鍔″彿:{}", crn.getId(), DateUtils.convert(now, DateUtils.yyyyMMddHHmmsssss_F), crnProtocol.getStatusType().desc, crnProtocol.getTaskNo());
// 淇敼宸ヤ綔妗ｇ姸鎬� 2.璁惧涓婅蛋 => 3.鍚婅溅鍏ュ簱涓�
wrkMast.setWrkSts(3L);
wrkMast.setCrnStrTime(now);
wrkMast.setModiTime(now);
if (wrkMastMapper.updateById(wrkMast) == 0) {
- log.error("淇敼宸ヤ綔妗ｇ姸鎬� 2.璁惧涓婅蛋 => 3.鍚婅溅鍏ュ簱涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkMast.getWrkNo());
+ News.error("淇敼宸ヤ綔妗ｇ姸鎬� 2.璁惧涓婅蛋 => 3.鍚婅溅鍏ュ簱涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkMast.getWrkNo());
}
- log.warn("淇敼宸ヤ綔妗ｇ姸鎬佹垚鍔熴�俒鏃堕棿锛歿}] >>>>> 浠诲姟鍙�:{}", DateUtils.convert(now, DateUtils.yyyyMMddHHmmsssss_F), wrkMast.getWrkNo());
+ News.warn("淇敼宸ヤ綔妗ｇ姸鎬佹垚鍔熴�俒鏃堕棿锛歿}] >>>>> 浠诲姟鍙�:{}", DateUtils.convert(now, DateUtils.yyyyMMddHHmmsssss_F), wrkMast.getWrkNo());
}
// 鍑哄簱銆佺Щ搴�
if (wrkMast.getWrkSts() == 11) {
@@ -1871,9 +1951,9 @@
wrkMast.setCrnStrTime(now);
wrkMast.setModiTime(now);
if (wrkMastMapper.updateById(wrkMast) == 0) {
- log.error("淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkMast.getWrkNo());
+ News.error("淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkMast.getWrkNo());
}
- log.warn("淇敼宸ヤ綔妗ｇ姸鎬佹垚鍔熴�俒鏃堕棿锛歿}] >>>>> 浠诲姟鍙�:{}", DateUtils.convert(now, DateUtils.yyyyMMddHHmmsssss_F), wrkMast.getWrkNo());
+ News.warn("淇敼宸ヤ綔妗ｇ姸鎬佹垚鍔熴�俒鏃堕棿锛歿}] >>>>> 浠诲姟鍙�:{}", DateUtils.convert(now, DateUtils.yyyyMMddHHmmsssss_F), wrkMast.getWrkNo());
}
@@ -1947,7 +2027,7 @@
// 鏌ヨ绔欑偣璇︾粏淇℃伅
BasDevp staDetl = basDevpService.selectById(crnStn.getStaNo());
if (staDetl == null) {
- log.error("鍏ュ簱 ===>> 鍫嗗灈鏈虹珯鐐瑰湪鏁版嵁搴撲笉瀛樺湪, 绔欑偣缂栧彿={}", crnStn.getStaNo());
+ News.error("鍏ュ簱 ===>> 鍫嗗灈鏈虹珯鐐瑰湪鏁版嵁搴撲笉瀛樺湪, 绔欑偣缂栧彿={}", crnStn.getStaNo());
continue;
}
if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.getWorkNo() > 0 && staProtocol.isInEnable()
@@ -1992,7 +2072,7 @@
crnCommand.setDestinationPosY((short)19); // 鐩爣搴撲綅鍒�
crnCommand.setDestinationPosZ((short)1); // 鐩爣搴撲綅灞�
if (!MessageQueue.offer(SlaveType.Crn, 1, new Task(2, crnCommand))) {
- log.error("鍫嗗灈鏈哄懡浠や笅鍙戝け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", 1, JSON.toJSON(crnCommand));
+ News.error("鍫嗗灈鏈哄懡浠や笅鍙戝け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", 1, JSON.toJSON(crnCommand));
} else {
}
}
@@ -2026,7 +2106,7 @@
case 3://娴嬭瘯瀹屾垚
olsStatus = 4;//娴嬭瘯瀹屾垚
newStatus = 4;//娴嬭瘯瀹屾垚
- newSingle = 4;//娴嬭瘯瀹屾垚锛屽瘎瀛樺櫒鍦板潃锛�3===>>4
+ newSingle = 4;//锛圢G:4\OK:41锛夋祴璇曞畬鎴愶紝瀵勫瓨鍣ㄥ湴鍧�锛�3===>>4\41
break;
case 5://NG娴嬭瘯淇″彿
case 6://瀹屾垚娴嬭瘯淇″彿
@@ -2060,8 +2140,8 @@
newSingle = 0;//澶嶄綅锛屽瘎瀛樺櫒鍦板潃锛�12===>>0
break;
default:
- log.error("璇诲彇娴嬭瘯搴撲綅淇″彿鍑洪敊");
- break;
+ log.info("璇诲彇閫氶亾"+(i+1)+"娴嬭瘯搴撲綅鎸夐挳淇″彿:涓�"+devpThread.startSignal[i][0]);
+ continue;
}
TestMast testMast = testMastService.selectOne(new EntityWrapper<TestMast>()
@@ -2070,11 +2150,26 @@
boolean sign=false;
switch (devpThread.startSignal[i][0]){
case 0:
+ if (!Cools.isEmpty(testMast)){
+ locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("channel",(i+1)));
+ if (!Cools.isEmpty(locMast) && locMast.getLocSts().equals("F")){
+ sign=true;
+ }
+ }
+ break;
case 3:
if (!Cools.isEmpty(testMast)){
locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("channel",(i+1)));
if (!Cools.isEmpty(locMast) && locMast.getLocSts().equals("F")){
sign=true;
+ if (locMast.getPackStatus()==3){//娴嬭瘯瀹屾垚
+ newSingle=41;
+ }else if (locMast.getPackStatus()==4){//娴嬭瘯澶辫触
+ newSingle=4;
+ }else {
+ log.info("璇诲彇閫氶亾"+(i+1)+"娴嬭瘯搴撲綅鎸夐挳淇″彿:涓�"+devpThread.startSignal[i][0]+"閫氶亾搴撲綅pack鐘舵�佷俊鎭紓甯�"+locMast.getPackStatus());
+ sign=false;
+ }
}
}
break;
@@ -2179,7 +2274,7 @@
sign=true;
break;
default:
- log.error("璇诲彇娴嬭瘯搴撲綅淇″彿鍑洪敊");
+ log.info("璇诲彇閫氶亾"+(i+1)+"娴嬭瘯搴撲綅鎸夐挳淇″彿:涓�"+devpThread.startSignal[i][0]);
continue;
}
if (sign){
@@ -2189,6 +2284,14 @@
} else {
devpThread.startSignal[i][0] = newSingle;
}
+ }
+ try{
+ locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("channel",(i+1)));
+ if(devpThread.startSignal[i][1]!=locMast.getFireStatus()){
+ messageQueueOffer2(i+1,(short)((int)locMast.getFireStatus()),SlaveType.Devp, devp.getId());
+ }
+ }catch (Exception e){
+ log.error("鐏 ===>> 缁欒緭閫佺嚎鍙戦�佽鎶ュけ璐�,閫氶亾鍙凤細", i+1);
}
}
@@ -2210,6 +2313,14 @@
return MessageQueue.offer(devp, id, new Task(3, staProtocol));
}
+ public boolean messageQueueOffer2(int i ,short newSingle,SlaveType devp,Integer id){
+ //澶嶄綅PLC淇″彿锛屽�熺敤杈撻�佺珯鐐瑰疄浣撶被
+ StaProtocol staProtocol = new StaProtocol();
+ staProtocol.setSiteId(i);//瀵勫瓨鍣ㄥ湴鍧�
+ staProtocol.setStaNo(newSingle);//淇敼PLC瀵勫瓨鍣ㄥ湴鍧�鍊�,8==>0
+ return MessageQueue.offer(devp, id, new Task(5, staProtocol));
+ }
+
/**
* 灏嗙伀璀︽姤璀︿俊鍙峰啓鍏ュ埌鍫嗗灈鏈篜LC涓�
*/
@@ -2217,27 +2328,215 @@
public void fierCrn() {
try {
for (CrnSlave crn :slaveProperties.getCrn()) {
+ if(crn.getId()!=1){
+ continue;
+ }
// 鑾峰彇鍫嗗灈鏈轰俊鎭�
CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
CrnProtocol crnProtocol = crnThread.getCrnProtocol();
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("fire_status", 1));
if (!Cools.isEmpty(locMast)){
//鎶ヨ淇″彿鍐欏叆1
- if (!MessageQueue.offer(SlaveType.Crn, 1, new Task(4, (short)1))) {
- log.error("鐏 ===>> 缁欏爢鍨涙満鍙戦�佹姤璀︿俊鍙峰け璐�");
+ if (!MessageQueue.offer(SlaveType.Crn, 1, new Task(4, 1))) {
+ News.error("鐏 ===>> 缁欏爢鍨涙満鍙戦�佹姤璀︿俊鍙峰け璐�");
}
+ News.error("鐏!!!!!!! ===>> 缁欏爢鍨涙満鍙戦�佹姤璀︿俊鍙锋垚鍔�");
} else {
//鎶ヨ淇″彿娌℃湁鍚庯紝澶嶄綅鍦板潃
- if (!MessageQueue.offer(SlaveType.Crn, 1, new Task(4, (short)0))) {
- log.error("鐏 ===>> 缁欏爢鍨涙満娓呴浂澶嶄綅鎶ヨ淇″彿澶辫触");
+ if (!MessageQueue.offer(SlaveType.Crn, 1, new Task(4, 0))) {
+ News.error("鐏 ===>> 缁欏爢鍨涙満娓呴浂澶嶄綅鎶ヨ淇″彿澶辫触");
}
}
}
} catch (Exception e) {
- log.error("鐏 ===>> 缁欏爢鍨涙満鍙戦�佽鎶ュけ璐�", e);
+ News.error("鐏 ===>> 缁欏爢鍨涙満鍙戦�佽鎶ュけ璐�", e);
e.printStackTrace();
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
}
}
+ /**
+ * 103绔欑偣鏈夌墿涓嬪彂pack鐮�
+ */
+ @Transactional
+ public void packDevp() {
+ try {
+ // 鏍规嵁杈撻�佺嚎plc閬嶅巻
+ for (DevpSlave devp : slaveProperties.getDevp()) {
+ BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no",103));
+ if (Cools.isEmpty(basDevp)){
+ News.error("103绔欑偣鏌ヨ澶辫触-MainServiceImpl.java-2255琛�");
+ }
+ if (basDevp.getAutoing().equals("Y") && basDevp.getWrkNo()>0 && basDevp.getLoading().equals("Y") ){
+ WrkDetl wrkDetl = wrkDetlService.devpPackNo(basDevp.getWrkNo());
+ if (Cools.isEmpty(wrkDetl)){
+ News.error("103绔欑偣鏌ヨ澶辫触-MainServiceImpl.java-2255琛�");
+ }
+ MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(4,wrkDetl.getMatnr()));
+ }
+ }
+ } catch (Exception e) {
+ News.error("103 ===>> 缁欒緭閫佺嚎鍙戦�丳ack鐮佸け璐�", e);
+ e.printStackTrace();
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ }
+ }
+ /**
+ * 鏍规嵁PLC鎸夐挳娴嬭瘯銆佸畬鎴愩�佹殏鍋滀俊鍙凤紝鏇存柊testMast琛ㄤ腑status鍊硷紝浜ょ敱WMS绯荤粺澶勭悊
+ */
+ @Transactional
+ public void packTest1() {
+ try {
+ // 鏍规嵁杈撻�佺嚎plc閬嶅巻
+ for (DevpSlave devp : slaveProperties.getDevp()) {
+ log.info("2363琛岀▼搴忓紑濮嬭繍琛�");
+ SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
+ if(null != devpThread){
+ for (int i = 0; i < 48; i++){
+// log.info("2367琛岀▼搴忓紑濮嬭繍琛岋紝绗�"+i+"娆�");
+ boolean fig=false;
+ //鏌ヨ鍦ㄥ簱鍜岄绾﹀嚭搴�
+ LocMast locMast=locMastService.selectztgx("F","R",i);
+ if(!Cools.isEmpty(locMast)){
+// log.info("2372琛岀▼搴忓紑濮嬭繍琛岋紝鏌ヨ娴嬭瘯妗�");
+ TestMast testMast=testMastService.selectOne(new EntityWrapper<TestMast>()
+ .eq("loc_no",locMast.getLocNo())
+ .eq("user_id",locMast.getBarcode()));
+ if(Cools.isEmpty(testMast)){
+// log.info("2377琛岀▼搴忓紑濮嬭繍琛岋紝娴嬭瘯妗ｄ负绌猴紝璺宠繃");
+ continue;
+ }
+// log.info("2380琛岀▼搴忓紑濮嬭繍琛岋紝娴嬭瘯妗ｄ笉涓虹┖锛屼笅涓�姝�");
+ //devpThread.startSignal[i][0]
+ //0:绌�,1:鍚姩涓�,2:宸ヤ綔涓�,3:鑷姩鏆傚仠,4:姝ｅ父瀹屾垚(OK),5:寮傚父鍋滄(NG),6:鍦ㄧ嚎,7:绂荤嚎,8:绌洪棽
+
+ //locMast.setPackStatus
+ // "浜у搧鐘舵�亄0:鏃�,1:寰呮祴,2:娴嬭瘯涓�;3.娴嬭瘯瀹屾垚;4.娴嬭瘯澶辫触;5.闈欑疆涓�;6:闈欑疆瀹屾垚;7:鏆傚仠娴嬭瘯;8:绱ф�ュ嚭搴�;9:鍦ㄧ嚎;10:绂荤嚎;11:绌洪棽;}"
+
+ //testMast.setStatus
+ //"鐘舵�� 0: 寰呯敵璇� 1: 鐢宠涓� 2: 宸插鏍� 3:娴嬭瘯涓� 4:瀹屾垚 5:绉诲簱 6:鐏"
+ if(devpThread.startSignal[i][0]==8){
+ News.info("2390琛岀▼搴忓紑濮嬭繍琛岋紝淇敼娴嬭瘯妗ｇ姸鎬佷负 1銆佺敵璇蜂腑锛屽紑濮嬩慨鏀瑰墠锛�"+ JSON.toJSONString(testMast));
+ testMast.setStatus(1);
+ locMast.setPackStatus(1);
+ testMast.setModiTime(new Date());
+ log.info("2394琛岀▼搴忓紑濮嬭繍琛岋紝淇敼娴嬭瘯妗ｇ姸鎬佷负 1銆佺敵璇蜂腑,淇敼鏁版嵁鍚庛�佹湭鏇存柊"+JSON.toJSONString(testMast));
+ }else if(devpThread.startSignal[i][0]==2 && locMast.getPackStatus()!=2){
+ News.info("2396琛岀▼搴忓紑濮嬭繍琛岋紝淇敼娴嬭瘯妗ｇ姸鎬佷负 3銆佹祴璇曚腑锛屽紑濮嬩慨鏀瑰墠锛�"+JSON.toJSONString(testMast));
+ testMast.setStatus(3);
+ locMast.setPackStatus(2);
+ testMast.setModiTime(new Date());
+ log.info("2400锛屼慨鏀规祴璇曟。鐘舵�佷负 3銆佹祴璇曚腑,淇敼鏁版嵁鍚庛�佹湭鏇存柊"+JSON.toJSONString(testMast));
+ //NG杞琌K闇�瑕佽繕鍘熸簮搴撲綅鍜岀洰鏍囧簱浣嶇姸鎬侊紝OK杞琋G 鍒犻櫎浠诲姟妗�
+ WrkMast wrkMast=wrkMastService.selectOne(new EntityWrapper<WrkMast>()
+ .eq("source_loc_no",locMast.getLocNo())
+ .eq("wrk_sts",11));
+ News.info("2405锛屾煡璇㈢姸鎬佷负鐢熸垚鍑哄簱id鐨勬祴璇曞畬鎴愶紙NG鎴朞K锛変换鍔℃。锛�"+JSON.toJSONString(wrkMast));
+ if(!Cools.isEmpty(wrkMast)){
+ if(wrkMast.getWrkSts()==11){
+ if(wrkMast.getIoType()==11){
+ log.info("2409锛屽垹闄や换鍔℃。涓虹Щ搴撶殑锛�"+JSON.toJSONString(wrkMast));
+ LocMast locMast1=locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no",wrkMast.getLocNo()));
+ locMast1.setLocSts("O");
+ locMastService.update(locMast1,new EntityWrapper<LocMast>().eq("loc_no",wrkMast.getLocNo()));
+ }
+ wrkMastMapper.deleteById(wrkMast);
+ log.info("2415锛屽垹闄ゅ伐浣滄。"+JSON.toJSONString(wrkMast)+JSON.toJSONString(locMast));
+ locMast.setLocSts("F");
+ log.info("2417锛屽垹闄ゅ伐浣滄。"+JSON.toJSONString(wrkMast)+JSON.toJSONString(locMast));
+ wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("wrk_no",wrkMast.getWrkNo()));
+ log.info("2419锛屽垹闄ゅ伐浣滄槑缁�"+wrkMast.getWrkNo());
+ if(!locMastService.update(locMast,new EntityWrapper<LocMast>()
+ .eq("channel",i+1))){
+ log.error("2422淇敼娴嬭瘯搴撲綅鐘舵�佸け璐�"+locMast.getLocNo()+JSON.toJSONString(locMast));
+ }else{
+ log.error("2424淇敼娴嬭瘯搴撲綅鐘舵�佹垚鍔�"+locMast.getLocNo()+JSON.toJSONString(locMast));
+ fig=true;
+ }
+ }
+ }
+ }else if(devpThread.startSignal[i][0]==3){
+ locMast.setPackStatus(7);
+ testMast.setModiTime(new Date());
+ }else if(devpThread.startSignal[i][0]==4 && testMast.getStatus()!=4&&locMast.getFireStatus()!=1&&testMast.getStatus()!=6){
+ locMast.setPackStatus(3);
+ testMast.setStatus(4);
+ testMast.setModiTime(new Date());
+ testMastService.insertPackQualified(true,new Date(),testMast.getBarcode());
+ }else if(devpThread.startSignal[i][0]==5 && testMast.getStatus()!=4&&locMast.getFireStatus()!=1&&testMast.getStatus()!=6){
+ locMast.setPackStatus(4);
+ testMast.setStatus(4);
+ testMast.setModiTime(new Date());
+ testMastService.insertPackQualified(false,new Date(),testMast.getBarcode());
+ }
+// else if(devpThread.startSignal[i][0]==6||devpThread.startSignal[i][0]==7||devpThread.startSignal[i][0]==8){
+// locMast.setPackStatus(devpThread.startSignal[i][0]+3);
+// }
+ //閫氶亾鍚姩鎸夐挳鐘舵�侊紝1:鍙互鍚姩鍑哄簱鎴栬�呯Щ搴擄紝0:涓嶈兘鍚姩鍑哄簱鎴栬�呯Щ搴�
+ locMast.setCtnKind(devpThread.startSignal[i][2]);
+ if(devpThread.startSignal[i][2]==1){
+ if(!locMastService.update(locMast,new EntityWrapper<LocMast>()
+ .eq("loc_sts","R")
+ .eq("channel",i+1))){
+ News.error("淇敼鍚姩鎸夐挳鐘舵�侊紝娴嬭瘯搴撲綅鐘舵�佸け璐�"+locMast.getLocNo(),locMast);
+ }
+ }else if(!locMast.getLocSts().equals("R")){
+ if(!fig){
+ if(!locMastService.update(locMast,new EntityWrapper<LocMast>()
+ .eq("loc_sts","F")
+ .eq("channel",i+1))){
+ News.error("淇敼娴嬭瘯搴撲綅鐘舵�佸け璐�"+locMast.getLocNo(),locMast);
+ }
+ }
+ if(!testMastService.update(testMast,new EntityWrapper<TestMast>()
+ .eq("loc_no",locMast.getLocNo())
+ .eq("user_id",locMast.getBarcode()))) {
+ News.error("淇敼娴嬭瘯妗ｇ姸鎬佸け璐�" + locMast.getLocNo(), locMast);
+ }
+ }
+ }
+ }
+ //褰撳厖鏀剧數搴撲綅涓篛绌哄簱浣嶆椂
+ //搴撲綅鐘舵�佹敼涓�8绌洪棽
+ //缁橮LC鍐欐秷闃蹭俊鍙�
+ for (int i=0;i<48;i++){
+ LocMast locMast=locMastService.selectOne(new EntityWrapper<LocMast>().eq("channel",i+1));
+ TestMast testMast=testMastService.selectOne(new EntityWrapper<TestMast>()
+ .eq("loc_no",locMast.getLocNo())
+ .eq("user_id",locMast.getBarcode()));
+ if((locMast.getLocSts().equals("O")||locMast.getLocSts().equals("S"))&&devpThread.startSignal[i][0]!=8){
+ Thread.sleep(1000);
+ MessageQueue.offer(SlaveType.Devp, 1, new Task(6,locMast.getChannel()-1));
+ }
+ try{
+ if(locMast.getFireStatus()!=devpThread.startSignal[i][1]){
+ messageQueueOffer2(i,(short)((int)locMast.getFireStatus()),SlaveType.Devp, devp.getId());
+ if(Cools.isEmpty(testMast)){
+ continue;
+ }
+ if(locMast.getFireStatus()==1){
+ testMast.setStatus(6);//鐏
+ if(!testMastService.update(testMast,new EntityWrapper<TestMast>()
+ .eq("loc_no",locMast.getLocNo())
+ .eq("user_id",locMast.getBarcode()))) {
+ News.error("淇敼娴嬭瘯妗ｇ姸鎬佸け璐�" + locMast.getLocNo(), locMast);
+ }
+ }
+ }
+ }catch (Exception e){
+ News.error("鐏 ===>> 缁欒緭閫佺嚎鍙戦�佽鎶ュけ璐�,閫氶亾鍙凤細", i+1);
+ }
+ }
+
+
+
+ }
+
+ }
+ } catch (Exception e) {
+ News.error("鑾峰緱娴嬭瘯搴撲綅鐘舵�佸け璐�", e);
+ e.printStackTrace();
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ }
+ }
}
--
Gitblit v1.9.1