From 01c964b63f8ec9ff6422221c67e72d47b7a685c8 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期二, 08 四月 2025 12:58:08 +0800
Subject: [PATCH] 初始化
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 768 ++++++++++++++++++++++++++++-------------------------------
src/main/java/com/zy/core/MainProcess.java | 2
2 files changed, 366 insertions(+), 404 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 3e19bc8..e5d2421 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -25,7 +25,6 @@
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.*;
-import com.zy.core.enums.DevpType.DevpWorkType;
import com.zy.core.model.CrnSlave;
import com.zy.core.model.DevpSlave;
import com.zy.core.model.LedSlave;
@@ -126,31 +125,31 @@
boolean back = false;
String errMsg = "寮傚父锛�";
if (staProtocol.isFrontErr()) {
- errMsg = errMsg+"鍓嶈秴闄愶紱";
+ errMsg = errMsg + "鍓嶈秴闄愶紱";
back = true;
}
if (staProtocol.isBackErr()) {
- errMsg = errMsg+"鍚庤秴闄�";
+ errMsg = errMsg + "鍚庤秴闄�";
back = true;
}
if (staProtocol.isHighErr()) {
- errMsg = errMsg+"楂樿秴闄�";
+ errMsg = errMsg + "楂樿秴闄�";
back = true;
}
if (staProtocol.isLeftErr()) {
- errMsg = errMsg+"宸﹁秴闄�";
+ errMsg = errMsg + "宸﹁秴闄�";
back = true;
}
if (staProtocol.isRightErr()) {
- errMsg = errMsg+"鍙宠秴闄�";
+ errMsg = errMsg + "鍙宠秴闄�";
back = true;
}
if (staProtocol.isWeightErr()) {
- errMsg = errMsg+"瓒呴噸";
+ errMsg = errMsg + "瓒呴噸";
back = true;
}
if (staProtocol.isBarcodeErr()) {
- errMsg = errMsg+"鎵爜澶辫触";
+ errMsg = errMsg + "鎵爜澶辫触";
back = true;
}
// 閫�鍥�
@@ -163,7 +162,7 @@
continue;
}
String barcode = barcodeThread.getBarcode();
- if (!Cools.isEmpty(barcode)&&!barcode.equals("00000000")) {
+ if (!Cools.isEmpty(barcode) && !barcode.equals("00000000")) {
log.info("{}鍙锋潯鐮佹壂鎻忓櫒妫�娴嬫潯鐮佷俊鎭細{}", inSta.getBarcode(), barcode);
if ("NG".endsWith(barcode) || "NoRead".equals(barcode)) {
continue;
@@ -181,7 +180,7 @@
if (staProtocol.isAutoing() && staProtocol.isLoading()
&& staProtocol.isInEnable()
&& !staProtocol.isEmptyMk() && (staProtocol.getWorkNo() >= 9992 && staProtocol.getWorkNo() <= 9999)
- && staProtocol.isPakMk()){// && !Cools.isEmpty(barcode)) {
+ && staProtocol.isPakMk()) {// && !Cools.isEmpty(barcode)) {
// if(Cools.isEmpty(barcode) || "NG".endsWith(barcode) || "NoRead".equals(barcode)) {
// log.info("{}鍙锋潯鐮佹壂鎻忓櫒妫�娴嬫潯鐮佷俊鎭細{}", inSta.getBarcode(), barcode);
@@ -211,7 +210,7 @@
try {
LocTypeDto locTypeDto = new LocTypeDto(staProtocol);
- locTypeDto.setLocType1((short)1);
+ locTypeDto.setLocType1((short) 1);
SearchLocParam param = new SearchLocParam();
param.setBarcode(barcode);
param.setIoType(1);
@@ -236,25 +235,25 @@
News.error("鏇存柊plc绔欑偣淇℃伅澶辫触");
throw new CoolException("鏇存柊plc绔欑偣淇℃伅澶辫触");
}
- } else if (jsonObject.getInteger("code").equals(700) && (!barcodeThread.getBarcode().equals("NG"))){
+ } else if (jsonObject.getInteger("code").equals(700) && (!barcodeThread.getBarcode().equals("NG"))) {
StartupDto dto = jsonObject.getObject("data", StartupDto.class);
barcodeThread.setBarcode("");
- staProtocol.setWorkNo((short)9991);
+ staProtocol.setWorkNo((short) 9991);
staProtocol.setStaNo(inSta.getBackSta().shortValue());
devpThread.setPakMk(staProtocol.getSiteId(), true);
boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
- News.error("url锛歿}锛況equest锛歿}锛況esponse锛歿}", wmsUrl+"/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
- }else {
+ 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)9991);
+ staProtocol.setWorkNo((short) 9991);
staProtocol.setStaNo(inSta.getBackSta().shortValue());
devpThread.setPakMk(staProtocol.getSiteId(), true);
boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
- News.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);
}
} catch (Exception e) {
- News.error("鎵爜鍏ュ簱鎶ラ敊锛岄敊璇俊鎭�",e);
+ News.error("鎵爜鍏ュ簱鎶ラ敊锛岄敊璇俊鎭�", e);
e.printStackTrace();
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
}
@@ -294,7 +293,9 @@
&& staProtocol.isPakMk()) {
// 鍒ゆ柇閲嶅宸ヤ綔妗�
WrkMast wrkMast = wrkMastMapper.selectPakInStep11(inSta.getStaNo());
- if (wrkMast == null) { continue; }
+ if (wrkMast == null) {
+ continue;
+ }
// 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
@@ -325,7 +326,7 @@
/**
* 鎷ｆ枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱
*/
- public synchronized void stnToCrnStnPick(){
+ public synchronized void stnToCrnStnPick() {
for (DevpSlave devp : slaveProperties.getDevp()) {
// 閬嶅巻鎷ｆ枡鍏ュ簱鍙�
for (DevpSlave.Sta pickSta : devp.getPickSta()) {
@@ -335,9 +336,9 @@
continue;
}
String barcode = barcodeThread.getBarcode();
- if(!Cools.isEmpty(barcode)) {
+ if (!Cools.isEmpty(barcode)) {
log.info("{}鍙锋潯鐮佹壂鎻忓櫒妫�娴嬫潯鐮佷俊鎭細{}", pickSta.getBarcode(), barcode);
- if("NG".endsWith(barcode) || "NoRead".equals(barcode)) {
+ if ("NG".endsWith(barcode) || "NoRead".equals(barcode)) {
continue;
}
} else {
@@ -356,7 +357,7 @@
// // 鍏ュ嚭搴撴ā寮忓垽鏂�
// if (devpThread.ioMode != IoModeType.PAKIN_MODE) { continue; }
- if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable() && staProtocol.isPakMk()){
+ if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable() && staProtocol.isPakMk()) {
// if(Cools.isEmpty(barcode) || "NG".endsWith(barcode) || "NoRead".equals(barcode)) {
// log.info("{}鍙锋潯鐮佹壂鎻忓櫒妫�娴嬫潯鐮佷俊鎭細{}", pickSta.getBarcode(), barcode);
@@ -377,7 +378,7 @@
continue;
}
if ((wrkMast.getIoType() != 103 && wrkMast.getIoType() != 104 && wrkMast.getIoType() != 107)
- || Cools.isEmpty(wrkMast.getStaNo()) || Cools.isEmpty(wrkMast.getSourceStaNo()) ) {
+ || Cools.isEmpty(wrkMast.getStaNo()) || Cools.isEmpty(wrkMast.getSourceStaNo())) {
continue;
}
@@ -473,7 +474,7 @@
} else {
staProtocol = staProtocol.clone();
}
- if (staProtocol.isAutoing() && (staProtocol.isLoading()||staProtocol.getSiteId()==1000) && (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) {
@@ -481,7 +482,7 @@
}
// 鍒ゆ柇宸ヤ綔妗ｆ潯浠�
if (wrkMast.getIoType() < 100 || wrkMast.getStaNo() == null || wrkMast.getSourceStaNo() == null) {
- News.error("宸ヤ綔妗ｆ鏉′欢涓嶆弧瓒筹細宸ヤ綔妗ｆ锛�"+wrkMast+";鏉′欢iotype<100鎴栬�卻taNo涓虹┖鎴栬�卻ourceStaNo涓虹┖");
+ News.error("宸ヤ綔妗ｆ鏉′欢涓嶆弧瓒筹細宸ヤ綔妗ｆ锛�" + wrkMast + ";鏉′欢iotype<100鎴栬�卻taNo涓虹┖鎴栬�卻ourceStaNo涓虹┖");
continue;
}
// 鍒ゆ柇鍚婅溅鏄惁瀹為檯宸插畬鎴愶紝涓旂數鑴戠姸鎬佸湪move涓紝浠ュ鐢佃剳杩涜鏇存柊宸ヤ綔妗�
@@ -525,12 +526,14 @@
/**
* 鍏ュ嚭搴� ===>> 鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂
*/
- public synchronized void crnIoExecute(){
+ public synchronized void crnIoExecute() {
for (CrnSlave crn : slaveProperties.getCrn()) {
// 鑾峰彇鍫嗗灈鏈轰俊鎭�
CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
CrnProtocol crnProtocol = crnThread.getCrnProtocol();
- if (crnProtocol == null) { continue; }
+ if (crnProtocol == null) {
+ continue;
+ }
BasCrnp basCrnp = basCrnpService.selectById(crn.getId());
if (basCrnp == null) {
News.error("{}鍙峰爢鍨涙満灏氭湭鍦ㄦ暟鎹簱杩涜缁存姢锛�", crn.getId());
@@ -546,7 +549,7 @@
if (crnProtocol.getStatusType() == CrnStatusType.IDLE && crnProtocol.getTaskNo() == 0 && crnProtocol.getModeType() == CrnModeType.AUTO
&& crnProtocol.getLoaded() == 0 && crnProtocol.getForkPos() == 0) {
// 搴撲綅绉昏浆
- this.stnToStn(crn, crnProtocol);
+// this.stnToStn(crn, crnProtocol);
// 濡傛灉鏈�杩戜竴娆℃槸鍏ュ簱妯″紡
if (crnProtocol.getLastIo().equals("I")) {
if (basCrnp.getInEnable().equals("Y")) {
@@ -578,7 +581,7 @@
/**
* 鍥炲師鐐癸紝鍫嗗灈鏈烘病鏈夋墽琛屼腑浠诲姟锛岃澶囧瓨鍦ㄥ叆搴撲换鍔℃椂鍙洖鍘熺偣
*/
- public synchronized void crnRebackHp(CrnProtocol crnProtocol, CrnThread crnThread){
+ public synchronized void crnRebackHp(CrnProtocol crnProtocol, CrnThread crnThread) {
// for (CrnSlave crn : slaveProperties.getCrn()) {
// // 鑾峰彇鍫嗗灈鏈轰俊鎭�
// CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
@@ -591,51 +594,51 @@
// log.error("{}鍙峰爢鍨涙満灏氭湭鍦ㄦ暟鎹簱杩涜缁存姢锛�", crn.getId());
// continue;
// }
- if (crnProtocol.getStatusType() == CrnStatusType.IDLE && crnProtocol.getTaskNo() == 0 && crnProtocol.getModeType() == CrnModeType.AUTO) {
- if(crnProtocol.getBay() ==1 && crnProtocol.getLevel()==1){
- return;
- }
-
- // 宸茬粡瀛樺湪鍚婅溅鎵ц浠诲姟鏃讹紝鍒欒繃婊�3,12
- if (wrkMastMapper.selectWorking(crnProtocol.getCrnNo()) != null) {
- return;
- }
-
- //鍫嗗灈鏈烘湁鎵ц涓换鍔★紝杩囨护3,4,11,12
- if (wrkMastMapper.selectCrnWorking(crnProtocol.getCrnNo()) != null) {
- return;
- }
-
- //杈撻�佺嚎娌℃湁鍏ュ簱浠诲姟锛岃繃婊�2
- if (wrkMastMapper.selectDevWorking(crnProtocol.getCrnNo()) == null) {
- return;
- }
-
- log.info("鍫嗗灈鏈哄彫鍥炲師鐐�==>>" + crnProtocol.getCrnNo() + "鍙峰爢鍨涙満鏈夊叆搴撲换鍔�,鍙洖鍘熺偣");
- // 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
- CrnCommand crnCommand = new CrnCommand();
- crnCommand.setCrnNo(crnProtocol.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
- crnCommand.setTaskNo((short) 9999); // 宸ヤ綔鍙�
- crnCommand.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
- crnCommand.setTaskMode(CrnTaskModeType.GO_ORIGIN); // 浠诲姟妯″紡: 鍥炲師鐐�
- crnCommand.setSourcePosX((short) 0); // 婧愬簱浣嶆帓
- crnCommand.setSourcePosY((short) 0); // 婧愬簱浣嶅垪
- crnCommand.setSourcePosZ((short) 0); // 婧愬簱浣嶅眰
- crnCommand.setDestinationPosX((short) 0); // 鐩爣搴撲綅鎺�
- crnCommand.setDestinationPosY((short) 0); // 鐩爣搴撲綅鍒�
- crnCommand.setDestinationPosZ((short) 0); // 鐩爣搴撲綅灞�
- if (!MessageQueue.offer(SlaveType.Crn, crnProtocol.getCrnNo(), new Task(2, crnCommand))) {
- log.error("鍫嗗灈鏈哄洖鍘熺偣鍛戒护涓嬪彂澶辫触锛屽爢鍨涙満鍙�={}锛屼换鍔℃暟鎹�={}", crnProtocol.getCrnNo(), JSON.toJSON(crnCommand));
- }
- crnThread.setBackHpFlag(true);
+ if (crnProtocol.getStatusType() == CrnStatusType.IDLE && crnProtocol.getTaskNo() == 0 && crnProtocol.getModeType() == CrnModeType.AUTO) {
+ if (crnProtocol.getBay() == 1 && crnProtocol.getLevel() == 1) {
+ return;
}
+
+ // 宸茬粡瀛樺湪鍚婅溅鎵ц浠诲姟鏃讹紝鍒欒繃婊�3,12
+ if (wrkMastMapper.selectWorking(crnProtocol.getCrnNo()) != null) {
+ return;
+ }
+
+ //鍫嗗灈鏈烘湁鎵ц涓换鍔★紝杩囨护3,4,11,12
+ if (wrkMastMapper.selectCrnWorking(crnProtocol.getCrnNo()) != null) {
+ return;
+ }
+
+ //杈撻�佺嚎娌℃湁鍏ュ簱浠诲姟锛岃繃婊�2
+ if (wrkMastMapper.selectDevWorking(crnProtocol.getCrnNo()) == null) {
+ return;
+ }
+
+ log.info("鍫嗗灈鏈哄彫鍥炲師鐐�==>>" + crnProtocol.getCrnNo() + "鍙峰爢鍨涙満鏈夊叆搴撲换鍔�,鍙洖鍘熺偣");
+ // 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
+ CrnCommand crnCommand = new CrnCommand();
+ crnCommand.setCrnNo(crnProtocol.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
+ crnCommand.setTaskNo((short) 9999); // 宸ヤ綔鍙�
+ crnCommand.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
+ crnCommand.setTaskMode(CrnTaskModeType.GO_ORIGIN); // 浠诲姟妯″紡: 鍥炲師鐐�
+ crnCommand.setSourcePosX((short) 0); // 婧愬簱浣嶆帓
+ crnCommand.setSourcePosY((short) 0); // 婧愬簱浣嶅垪
+ crnCommand.setSourcePosZ((short) 0); // 婧愬簱浣嶅眰
+ crnCommand.setDestinationPosX((short) 0); // 鐩爣搴撲綅鎺�
+ crnCommand.setDestinationPosY((short) 0); // 鐩爣搴撲綅鍒�
+ crnCommand.setDestinationPosZ((short) 0); // 鐩爣搴撲綅灞�
+ if (!MessageQueue.offer(SlaveType.Crn, crnProtocol.getCrnNo(), new Task(2, crnCommand))) {
+ log.error("鍫嗗灈鏈哄洖鍘熺偣鍛戒护涓嬪彂澶辫触锛屽爢鍨涙満鍙�={}锛屼换鍔℃暟鎹�={}", crnProtocol.getCrnNo(), JSON.toJSON(crnCommand));
+ }
+ crnThread.setBackHpFlag(true);
+ }
// }
}
/**
* 鍏ュ簱 ===>> 鍫嗗灈鏈虹珯鍒板簱浣�
*/
- public void crnStnToLoc(CrnSlave slave, CrnProtocol crnProtocol){
+ public void crnStnToLoc(CrnSlave slave, CrnProtocol crnProtocol) {
for (CrnSlave.CrnStn crnStn : slave.getCrnInStn()) {
boolean flag = false;
// 鑾峰彇鍫嗗灈鏈哄叆搴撶珯淇℃伅
@@ -653,7 +656,7 @@
continue;
}
if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.getWorkNo() > 0 && staProtocol.isInEnable()
- && staDetl.getCanining()!=null && staDetl.getCanining().equals("Y")) {
+ && staDetl.getCanining() != null && staDetl.getCanining().equals("Y")) {
flag = true;
}
if (!flag) {
@@ -661,7 +664,7 @@
}
// 鑾峰彇宸ヤ綔鐘舵�佷负2锛堣澶囦笂璧帮級鐨勫叆搴撳伐浣滄。
WrkMast wrkMast = wrkMastMapper.selectPakInStep2(slave.getId(), staProtocol.getWorkNo().intValue(), crnStn.getStaNo());
- if(null == wrkMast) {
+ if (null == wrkMast) {
// log.error("鏌ヨ鏃犲緟鍏ュ簱鏁版嵁--wrk_sts=2, 宸ヤ綔鍙�={}", staProtocol.getWorkNo());
continue;
}
@@ -716,9 +719,9 @@
// moveLocForDeepLocPakin(slave, shallowLoc, wrkMast);
}
continue;
- } else if (shallowLoc.getLocSts().equals("Q")){
+ } else if (shallowLoc.getLocSts().equals("Q")) {
WrkMast waitWrkMast = wrkMastMapper.selectByLocNo(shallowLocNo);
- if (null != waitWrkMast && waitWrkMast.getWrkSts()==4) {
+ if (null != waitWrkMast && waitWrkMast.getWrkSts() == 4) {
continue;
}
}
@@ -737,12 +740,12 @@
crnCommand.setDestinationPosY(locMast.getBay1().shortValue()); // 鐩爣搴撲綅鍒�
crnCommand.setDestinationPosZ(locMast.getLev1().shortValue()); // 鐩爣搴撲綅灞俓
crnCommand.setBarcode(wrkMast.getBarcode());//鎵樼洏鐮�
- log.error("768 鍫嗗灈鏈哄懡浠や笅鍙�"+crnCommand);
+ log.error("768 鍫嗗灈鏈哄懡浠や笅鍙�" + crnCommand);
if (!MessageQueue.offer(SlaveType.Crn, wrkMast.getCrnNo(), new Task(2, crnCommand))) {
News.error("鍫嗗灈鏈哄懡浠や笅鍙戝け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", wrkMast.getCrnNo(), JSON.toJSON(crnCommand));
} else {
- log.error("772 鍫嗗灈鏈哄懡浠や笅鍙戞垚鍔�"+crnCommand);
- News.info("772 鍫嗗灈鏈哄懡浠や笅鍙戞垚鍔�"+crnCommand);
+ log.error("772 鍫嗗灈鏈哄懡浠や笅鍙戞垚鍔�" + crnCommand);
+ News.info("772 鍫嗗灈鏈哄懡浠や笅鍙戞垚鍔�" + crnCommand);
// long startTime = System.currentTimeMillis();
// while ((System.currentTimeMillis() - startTime) < COMMAND_TIMEOUT) {
@@ -757,8 +760,8 @@
// }
// 淇敼宸ヤ綔妗ｇ姸鎬� 2.璁惧涓婅蛋 => 3.鍚婅溅鍏ュ簱涓�
- log.error("787 淇敼宸ヤ綔妗ｇ姸鎬�2.璁惧涓婅蛋 => 3.鍚婅溅鍏ュ簱涓� "+wrkMast);
- News.info("787 淇敼宸ヤ綔妗ｇ姸鎬�2.璁惧涓婅蛋 => 3.鍚婅溅鍏ュ簱涓� "+wrkMast);
+ log.error("787 淇敼宸ヤ綔妗ｇ姸鎬�2.璁惧涓婅蛋 => 3.鍚婅溅鍏ュ簱涓� " + wrkMast);
+ News.info("787 淇敼宸ヤ綔妗ｇ姸鎬�2.璁惧涓婅蛋 => 3.鍚婅溅鍏ュ簱涓� " + wrkMast);
Date now = new Date();
wrkMast.setWrkSts(3L);
wrkMast.setCrnStrTime(now);
@@ -766,8 +769,8 @@
if (wrkMastMapper.updateById(wrkMast) == 0) {
News.error("淇敼宸ヤ綔妗ｇ姸鎬� 2.璁惧涓婅蛋 => 3.鍚婅溅鍏ュ簱涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkMast.getWrkNo());
}
- log.error("795 淇敼宸ヤ綔妗ｇ姸鎬佹垚鍔�2.璁惧涓婅蛋 => 3.鍚婅溅鍏ュ簱涓�"+wrkMast);
- News.info("795 淇敼宸ヤ綔妗ｇ姸鎬佹垚鍔�2.璁惧涓婅蛋 => 3.鍚婅溅鍏ュ簱涓�"+wrkMast);
+ log.error("795 淇敼宸ヤ綔妗ｇ姸鎬佹垚鍔�2.璁惧涓婅蛋 => 3.鍚婅溅鍏ュ簱涓�" + wrkMast);
+ News.info("795 淇敼宸ヤ綔妗ｇ姸鎬佹垚鍔�2.璁惧涓婅蛋 => 3.鍚婅溅鍏ュ簱涓�" + wrkMast);
}
}
}
@@ -776,23 +779,23 @@
* 鍑哄簱 ===>> 搴撲綅鍒板爢鍨涙満绔�
* 2022-06-09 TQS淇敼锛屾煡璇㈠伐浣滄。LIST锛岄亶鍘嗕笅鍙戯紝闃叉绗竴涓换鍔″牭濉炲嚭搴�
*/
- public void locToCrnStn(CrnSlave slave, CrnProtocol crnProtocol){
+ public void locToCrnStn(CrnSlave slave, CrnProtocol crnProtocol) {
for (CrnSlave.CrnStn crnStn : slave.getCrnOutStn()) {
// 鑾峰彇宸ヤ綔鐘舵�佷负11锛堢敓鎴愬嚭搴揑D锛夌殑鍑哄簱宸ヤ綔妗�
// WrkMast wrkMast = wrkMastMapper.selectPakOutStep1(slave.getId(), crnStn.getStaNo());
List<WrkMast> wrkMasts = wrkMastMapper.selectPakOutStep11(slave.getId(), crnStn.getStaNo());
- for (WrkMast wrkMast : wrkMasts){
+ for (WrkMast wrkMast : wrkMasts) {
if (wrkMast == null) {
continue;
}
// 宸ヤ綔妗ｇ姸鎬佸垽鏂�
- if (wrkMast.getIoType() < 100 || wrkMast.getSourceStaNo() == null){
+ if (wrkMast.getIoType() < 100 || wrkMast.getSourceStaNo() == null) {
News.error("鏌ヨ宸ヤ綔妗ｆ暟鎹笉绗﹀悎鏉′欢--鍏ュ嚭绫诲瀷/绔欑偣, 宸ヤ綔鍙�={}锛屾簮搴撲綅={}锛屽叆鍑虹被鍨�={}", wrkMast.getWrkNo(), wrkMast.getSourceLocNo(), wrkMast.getIoType());
continue;
}
// 鑾峰彇婧愬簱浣嶄俊鎭�
LocMast sourceSta = locMastService.selectById(wrkMast.getSourceLocNo());
- if (!sourceSta.getLocSts().equals("R") &&!sourceSta.getLocSts().equals("P")) {
+ if (!sourceSta.getLocSts().equals("R") && !sourceSta.getLocSts().equals("P")) {
News.error("鍑哄簱鎿嶄綔搴撲綅鐘舵�佷笉绗﹀悎--鐘舵��, 搴撲綅鍙�={}锛屽簱浣嶇姸鎬�={}", wrkMast.getLocNo(), sourceSta.getLocSts());
continue;
}
@@ -817,20 +820,69 @@
// 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());
+ 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(wrkMast.getStaNo()==1000&& locMast.getCtnKind()==1){
+ // 鍒ゆ柇鍫嗗灈鏈哄嚭搴撶珯鐘舵��
+ 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;
+ }
+ // 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
+
// 鍫嗗灈鏈烘帶鍒惰繃婊�
if (!crnProtocol.getStatusType().equals(CrnStatusType.IDLE) || crnProtocol.getTaskNo() != 0) {
// continue;
break;
+ }
+
+ // 鍙屾繁搴撲綅涓旀祬搴撲綅鏈夎揣锛屽垯闇�鍏堝娴呭簱浣嶈繘琛屽簱浣嶇Щ杞�
+ if (Utils.isDeepLoc(slaveProperties, wrkMast.getSourceLocNo())) {
+ String shallowLocNo = Utils.getShallowLoc(slaveProperties, wrkMast.getSourceLocNo());
+ LocMast shallowLoc = locMastService.selectById(shallowLocNo);
+ // O.绌哄簱浣嶃�丵.鎷ｆ枡/鐩樼偣/骞舵澘鍐嶅叆搴撱�丼.鍏ュ簱棰勭害銆乆.绂佺敤 鐩存帴鎼紒
+ if (shallowLoc.getLocSts().equals("P") || shallowLoc.getLocSts().equals("R")) {
+ WrkMast waitWrkMast = wrkMastMapper.selectByLocNo(shallowLocNo);
+ if (null == waitWrkMast) {
+ News.error("{}搴撲綅寮傚父锛屾湭妫�绱㈠埌鐩稿簲宸ヤ綔妗ｏ紒", shallowLocNo);
+ } else {
+ if (waitWrkMast.getWrkSts() == 11) {
+ waitWrkMast.setIoPri(15D);
+ waitWrkMast.setModiTime(new Date());
+ if (wrkMastMapper.updateById(waitWrkMast) == 0) {
+ News.error("璋冩暣宸ヤ綔妗ｄ紭鍏堢骇澶辫触锛佸伐浣滃彿={}", waitWrkMast.getWrkNo());
+ }
+ continue;
+ } else {
+
+ }
+ }
+ } else if (shallowLoc.getLocSts().equals("F") || shallowLoc.getLocSts().equals("D")) {
+ WrkMast waitWrkMast = wrkMastMapper.selectByLocNo(shallowLocNo);
+ // 姝ゆ爣璁伴伩鍏嶅娆℃墽琛岀Щ搴撲换鍔�
+ if (Cools.isEmpty(wrkMast.getUpdMk()) || "N".equals(wrkMast.getUpdMk())
+ || Cools.isEmpty(waitWrkMast)) {
+ wrkMast.setUpdMk("Y");
+ wrkMastMapper.updateById(wrkMast);
+ // 鐢熸垚宸ヤ綔妗�,灏嗘祬搴撲綅绉昏浆鍒版柊鐨勫簱浣嶄腑
+ moveLocForDeepLoc(slave, shallowLoc);
+ }
+ News.error("{}浠诲姟鍑哄簱澶辫触锛屾祬搴撲綅鍫靛锛�", wrkMast.getWrkNo());
+ continue;
+ } else if (shallowLoc.getLocSts().equals("Q") || shallowLoc.getLocSts().equals("S")) {
+ WrkMast waitWrkMast = wrkMastMapper.selectByLocNo(shallowLocNo);
+ if (null != waitWrkMast && waitWrkMast.getWrkSts() == 4) {
+ continue;
+ }
+ }
}
// 宸茬粡瀛樺湪鍚婅溅鎵ц浠诲姟鏃讹紝鍒欒繃婊�
@@ -865,99 +917,8 @@
}
break;
}
- }else {
- // 鍒ゆ柇鍫嗗灈鏈哄嚭搴撶珯鐘舵��
- 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;
- }
- // 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
-
- // 鍫嗗灈鏈烘帶鍒惰繃婊�
- if (!crnProtocol.getStatusType().equals(CrnStatusType.IDLE) || crnProtocol.getTaskNo() != 0) {
-// continue;
- break;
- }
-
- // 鍙屾繁搴撲綅涓旀祬搴撲綅鏈夎揣锛屽垯闇�鍏堝娴呭簱浣嶈繘琛屽簱浣嶇Щ杞�
- if (Utils.isDeepLoc(slaveProperties, wrkMast.getSourceLocNo())) {
- String shallowLocNo = Utils.getShallowLoc(slaveProperties, wrkMast.getSourceLocNo());
- LocMast shallowLoc = locMastService.selectById(shallowLocNo);
- // O.绌哄簱浣嶃�丵.鎷ｆ枡/鐩樼偣/骞舵澘鍐嶅叆搴撱�丼.鍏ュ簱棰勭害銆乆.绂佺敤 鐩存帴鎼紒
- if (shallowLoc.getLocSts().equals("P") || shallowLoc.getLocSts().equals("R")) {
- WrkMast waitWrkMast = wrkMastMapper.selectByLocNo(shallowLocNo);
- if (null == waitWrkMast) {
- News.error("{}搴撲綅寮傚父锛屾湭妫�绱㈠埌鐩稿簲宸ヤ綔妗ｏ紒", shallowLocNo);
- } else {
- if(waitWrkMast.getWrkSts() == 11) {
- waitWrkMast.setIoPri(15D);
- waitWrkMast.setModiTime(new Date());
- if (wrkMastMapper.updateById(waitWrkMast) == 0) {
- News.error("璋冩暣宸ヤ綔妗ｄ紭鍏堢骇澶辫触锛佸伐浣滃彿={}", waitWrkMast.getWrkNo());
- }
- continue;
- } else {
-
- }
- }
- } else if (shallowLoc.getLocSts().equals("F") || shallowLoc.getLocSts().equals("D")) {
- WrkMast waitWrkMast = wrkMastMapper.selectByLocNo(shallowLocNo);
- // 姝ゆ爣璁伴伩鍏嶅娆℃墽琛岀Щ搴撲换鍔�
- if (Cools.isEmpty(wrkMast.getUpdMk()) || "N".equals(wrkMast.getUpdMk())
- || Cools.isEmpty(waitWrkMast)) {
- wrkMast.setUpdMk("Y");
- wrkMastMapper.updateById(wrkMast);
- // 鐢熸垚宸ヤ綔妗�,灏嗘祬搴撲綅绉昏浆鍒版柊鐨勫簱浣嶄腑
- moveLocForDeepLoc(slave, shallowLoc);
- }
- News.error("{}浠诲姟鍑哄簱澶辫触锛屾祬搴撲綅鍫靛锛�", wrkMast.getWrkNo());
- continue;
- } else if (shallowLoc.getLocSts().equals("Q") || shallowLoc.getLocSts().equals("S")){
- WrkMast waitWrkMast = wrkMastMapper.selectByLocNo(shallowLocNo);
- if (null != waitWrkMast && waitWrkMast.getWrkSts()==4) {
- continue;
- }
- }
- }
-
- // 宸茬粡瀛樺湪鍚婅溅鎵ц浠诲姟鏃讹紝鍒欒繃婊�
- if (wrkMastMapper.selectWorking(slave.getId()) != null) {
- break;
-// return;
- }
-
-
- // 1.鍫嗗灈鏈哄紑濮嬬Щ鍔�
- CrnCommand crnCommand = new CrnCommand();
- crnCommand.setCrnNo(slave.getId()); // 鍫嗗灈鏈虹紪鍙�
- crnCommand.setTaskNo(wrkMast.getWrkNo().shortValue()); // 宸ヤ綔鍙�
- crnCommand.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
- crnCommand.setTaskMode(CrnTaskModeType.LOC_MOVE); // 浠诲姟妯″紡: 搴撲綅绉昏浆
- crnCommand.setSourcePosX(sourceSta.getRow1().shortValue()); // 婧愬簱浣嶆帓
- crnCommand.setSourcePosY(sourceSta.getBay1().shortValue()); // 婧愬簱浣嶅垪
- crnCommand.setSourcePosZ(sourceSta.getLev1().shortValue()); // 婧愬簱浣嶅眰
- crnCommand.setDestinationPosX(crnStn.getRow().shortValue()); // 鐩爣搴撲綅鎺�
- crnCommand.setDestinationPosY(crnStn.getBay().shortValue()); // 鐩爣搴撲綅鍒�
- crnCommand.setDestinationPosZ(crnStn.getLev().shortValue()); // 鐩爣搴撲綅灞�
- crnCommand.setBarcode(wrkMast.getBarcode());
- if (!MessageQueue.offer(SlaveType.Crn, wrkMast.getCrnNo(), new Task(2, crnCommand))) {
- News.error("鍫嗗灈鏈哄懡浠や笅鍙戝け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", wrkMast.getCrnNo(), JSON.toJSON(crnCommand));
- } else {
- // 淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓�
- Date now = new Date();
- wrkMast.setWrkSts(12L);
- wrkMast.setCrnStrTime(now);
- wrkMast.setModiTime(now);
- if (wrkMastMapper.updateById(wrkMast) == 0) {
- News.error("淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkMast.getWrkNo());
- }
- break;
- }
- }
}
+
}
}
}
@@ -1082,36 +1043,36 @@
/**
* 搴撲綅绉昏浆
*/
- public void locToLoc(CrnSlave slave, CrnProtocol crnProtocol){
+ public void locToLoc(CrnSlave slave, CrnProtocol crnProtocol) {
// log.info("寮�濮嬬Щ搴撲换鍔＄▼搴�");
//鑾峰彇鎵�鏈夌Щ搴撲换鍔�
- List<WrkMast> wrkMasts=wrkMastMapper.selectLocMoves(slave.getId());
+ List<WrkMast> wrkMasts = wrkMastMapper.selectLocMoves(slave.getId());
// 鑾峰彇宸ヤ綔妗ｄ俊鎭�
- WrkMast wrkMast =null;
- if(Cools.isEmpty(wrkMasts)){
+ 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;
+ 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)) {
+ 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)){
+ if (Cools.isEmpty(wrkMast)) {
return;
}
@@ -1148,8 +1109,8 @@
}
//娴嬭瘯搴撲綅鍑哄簱蹇呴』瑕佹寜鍚姩鎸夐挳鎵嶈兘鍑哄簱
- if(sourceSta.getLocType1()==1 && sourceSta.getCtnKind()==0){
- News.error("鍑哄簱 ===>> 绛夊緟鍚姩鎸夐挳",wrkMast);
+ if (sourceSta.getLocType1() == 1 && sourceSta.getCtnKind() == 0) {
+ News.error("鍑哄簱 ===>> 绛夊緟鍚姩鎸夐挳", wrkMast);
return;
}
@@ -1165,11 +1126,7 @@
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);
- }
+ crnCommand.setBarcode(wrkMast.getBarcode());//鎵樼洏鐮�
if (!MessageQueue.offer(SlaveType.Crn, wrkMast.getCrnNo(), new Task(2, crnCommand))) {
News.error("鍫嗗灈鏈哄懡浠や笅鍙戝け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", wrkMast.getCrnNo(), JSON.toJSON(crnCommand));
} else {
@@ -1183,7 +1140,6 @@
}
}
log.info("缁撴潫绉诲簱浠诲姟绋嬪簭");
-
}
/**
@@ -1195,13 +1151,15 @@
// 鑾峰彇鍫嗗灈鏈轰俊鎭�
CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
CrnProtocol crnProtocol = crnThread.getCrnProtocol();
- if (crnProtocol == null) { continue; }
+ if (crnProtocol == null) {
+ continue;
+ }
// 鐘舵�侊細绛夊緟纭 骞朵笖 浠诲姟瀹屾垚浣� = 1
if (crnProtocol.statusType == CrnStatusType.WAITING && crnProtocol.getTaskNo() != 0) {
- if(crnProtocol.getTaskNo()==9999){
+ if (crnProtocol.getTaskNo() == 9999) {
// 鍫嗗灈鏈哄浣�
crnThread.setResetFlag(true);
- }else {
+ } else {
// 鑾峰彇鍏ュ簱寰呯‘璁ゅ伐浣滄。
WrkMast wrkMast = wrkMastMapper.selectPakInStep3(crnProtocol.getTaskNo().intValue());
if (wrkMast == null) {
@@ -1232,7 +1190,7 @@
* 鍫嗗灈鏈哄紓甯镐俊鎭褰�
*/
@Async
- public void recCrnErr(){
+ public void recCrnErr() {
Date now = new Date();
for (CrnSlave crn : slaveProperties.getCrn()) {
// 鑾峰彇鍫嗗灈鏈轰俊鎭�
@@ -1254,7 +1212,7 @@
continue;
}
BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm());
- String errName = crnError==null? String.valueOf(crnProtocol.getAlarm()):crnError.getErrName();
+ String errName = crnError == null ? String.valueOf(crnProtocol.getAlarm()) : crnError.getErrName();
BasErrLog basErrLog = new BasErrLog(
null, // 缂栧彿
wrkMast.getWrkNo(), // 宸ヤ綔鍙�
@@ -1293,7 +1251,7 @@
}
}
}
- // 鏃犱换鍔�
+ // 鏃犱换鍔�
} else {
BasErrLog latest = basErrLogService.findLatest(crn.getId());
// 鏈夊紓甯�
@@ -1301,7 +1259,7 @@
// 璁板綍鏂板紓甯�
if (latest == null || (latest.getErrCode() != crnProtocol.getAlarm().intValue())) {
BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm());
- String errName = crnError==null? String.valueOf(crnProtocol.getAlarm()):crnError.getErrName();
+ String errName = crnError == null ? String.valueOf(crnProtocol.getAlarm()) : crnError.getErrName();
BasErrLog basErrLog = new BasErrLog(
null, // 缂栧彿
null, // 宸ヤ綔鍙�
@@ -1316,7 +1274,7 @@
null, // 婧愮珯
null, // 婧愬簱浣�
null, // 鏉＄爜
- (int)crnProtocol.getAlarm(), // 寮傚父鐮�
+ (int) crnProtocol.getAlarm(), // 寮傚父鐮�
errName, // 寮傚父
1, // 寮傚父鎯呭喌
now, // 娣诲姞鏃堕棿
@@ -1329,7 +1287,7 @@
log.error("鍫嗗灈鏈簆lc寮傚父璁板綍澶辫触 ===>> [id:{}] [error:{}]", crn.getId(), errName);
}
}
- // 鏃犲紓甯�
+ // 鏃犲紓甯�
} else {
// 寮傚父淇
if (latest != null && latest.getStatus() == 1) {
@@ -1354,7 +1312,7 @@
* 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐�
*/
@Async
- public void storeEmptyPlt(){
+ public void storeEmptyPlt() {
for (DevpSlave devp : slaveProperties.getDevp()) {
// 閬嶅巻绌烘澘鍏ュ簱鍙�
for (DevpSlave.Sta emptyInSta : devp.getEmptyInSta()) {
@@ -1400,14 +1358,12 @@
throw new CoolException("鏇存柊plc绔欑偣淇℃伅澶辫触");
}
} else {
- log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", wmsUrl+"/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
+ log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", wmsUrl + "/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
}
} catch (Exception e) {
e.printStackTrace();
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
}
-
-
// // 妫�绱㈠簱浣�
@@ -1492,7 +1448,9 @@
}
// 鑾峰彇宸ヤ綔妗ｆ暟鎹�
WrkMast wrkMast = wrkMastMapper.selectById(staProtocol.getWorkNo());
- if (null == wrkMast) { continue; }
+ if (null == wrkMast) {
+ continue;
+ }
wrkMasts.add(wrkMast);
// 缁勮鍛戒护
LedCommand ledCommand = new LedCommand();
@@ -1542,19 +1500,19 @@
total = locDetl.getAnfme();
}
if (wrkMast.getIoType() == 101 || wrkMast.getIoType() == 1) {
- ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(),total));
+ ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(), total));
}
if (wrkMast.getIoType() == 103 && (null == wrkDetl.getInspect() || 0 == wrkDetl.getInspect())) {
- ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(),total));
+ ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(), total));
}
if (wrkMast.getIoType() == 107 || wrkMast.getIoType() == 104) {
- ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(),total));
+ ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(), total));
}
});
}
commands.add(ledCommand);
}
- if(Cools.isEmpty(wrkMasts)){
+ if (Cools.isEmpty(wrkMasts)) {
continue;
}
Set<Integer> workNos = wrkMasts.stream().map(WrkMast::getWrkNo).collect(Collectors.toSet());
@@ -1660,7 +1618,7 @@
* tip锛氬悓姝�
*/
@Transactional
- public synchronized void moveLocForDeepLocPakin(CrnSlave crn, LocMast shallowLoc, WrkMast pakinWrkMast){
+ public synchronized void moveLocForDeepLocPakin(CrnSlave crn, LocMast shallowLoc, WrkMast pakinWrkMast) {
LocMast loc = locMastService.selectById(pakinWrkMast.getLocNo());
// 鑾峰彇宸ヤ綔鍙�
@@ -1679,7 +1637,7 @@
wrkMast.setFullPlt(shallowLoc.getFullPlt()); // 婊℃澘
wrkMast.setPicking("N"); // 鎷ｆ枡
wrkMast.setExitMk("N"); // 閫�鍑�
- wrkMast.setEmptyMk(shallowLoc.getLocSts().equals("D")?"Y":"N"); // 绌烘澘
+ wrkMast.setEmptyMk(shallowLoc.getLocSts().equals("D") ? "Y" : "N"); // 绌烘澘
wrkMast.setBarcode(shallowLoc.getBarcode()); // 鎵樼洏鐮�
wrkMast.setLinkMis("N");
wrkMast.setCtnNo("Y"); // 鍏ュ簱闃诲搴撲綅绉昏浆鏍囪
@@ -1709,7 +1667,7 @@
if (shallowLoc.getLocSts().equals("D") || shallowLoc.getLocSts().equals("F")) {
shallowLoc.setLocSts("S"); // S.鍏ュ簱棰勭害锛屽叆搴撻樆濉炲簱浣嶇Щ杞�
shallowLoc.setModiTime(now);
- if (!locMastService.updateById(shallowLoc)){
+ if (!locMastService.updateById(shallowLoc)) {
throw new CoolException("鏇存柊婧愬簱浣嶇姸鎬佸け璐�");
}
} else {
@@ -1735,7 +1693,7 @@
* 鍥犲弻娣卞簱浣嶉樆濉烇紝瀵规祬搴撲綅杩涜绉昏浆锛堢珛鍗虫墽琛岀増)
* tip锛氬悓姝�
*/
- private void moveLocForDeepLoc(CrnSlave crn, LocMast shallowLoc){
+ private void moveLocForDeepLoc(CrnSlave crn, LocMast shallowLoc) {
try {
List<Integer> rows = locMastService.queryDistinctRow(crn.getId());
LocMast loc = null;
@@ -1852,7 +1810,7 @@
/**
* 鍫嗗灈鏈烘紨绀� ===>> 搴撲綅绉昏浆
*/
- public synchronized void crnDemoOfLocMove1(){
+ public synchronized void crnDemoOfLocMove1() {
try {
for (CrnSlave crn : slaveProperties.getCrn()) {
if (!crn.getDemo()) {
@@ -1953,7 +1911,7 @@
/**
* 鍫嗗灈鏈哄懡浠や笅鍙戝悗锛屽紓姝ヤ慨鏀瑰伐浣滄。鐘舵��
*/
- public synchronized void crnIoWrkMast(){
+ public synchronized void crnIoWrkMast() {
for (CrnSlave crn : slaveProperties.getCrn()) {
// 鑾峰彇鍫嗗灈鏈轰俊鎭�
CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
@@ -1966,7 +1924,9 @@
if (crnProtocol.getStatusType() != CrnStatusType.IDLE && crnProtocol.getTaskNo() != 0 && crnProtocol.getModeType() == CrnModeType.AUTO) {
// 鑾峰彇宸ヤ綔妗�
WrkMast wrkMast = wrkMastMapper.selectById(crnProtocol.getTaskNo());
- if (wrkMast == null) { continue; }
+ if (wrkMast == null) {
+ continue;
+ }
// 鍏ュ簱
if (wrkMast.getWrkSts() == 1 || wrkMast.getWrkSts() == 2) {
News.warn("鍫嗗灈鏈洪潪绌洪棽鎯呭喌涓嬶紝寮�濮嬩慨鏀瑰伐浣滄。鐘舵�併�俒id:{},鏃堕棿锛歿}] >>>>> 鍫嗗灈鏈哄綋鍓嶇姸鎬佷负锛歿}銆備换鍔″彿:{}", crn.getId(), DateUtils.convert(now, DateUtils.yyyyMMddHHmmsssss_F), crnProtocol.getStatusType().desc, crnProtocol.getTaskNo());
@@ -1977,7 +1937,7 @@
if (wrkMastMapper.updateById(wrkMast) == 0) {
News.error("淇敼宸ヤ綔妗ｇ姸鎬� 2.璁惧涓婅蛋 => 3.鍚婅溅鍏ュ簱涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkMast.getWrkNo());
}
- News.warn("淇敼宸ヤ綔妗ｇ姸鎬佹垚鍔熴�俒鏃堕棿锛歿}] >>>>> 浠诲姟鍙�:{}", DateUtils.convert(now, DateUtils.yyyyMMddHHmmsssss_F), wrkMast.getWrkNo());
+ News.warn("淇敼宸ヤ綔妗ｇ姸鎬佹垚鍔熴�俒鏃堕棿锛歿}] >>>>> 浠诲姟鍙�:{}", DateUtils.convert(now, DateUtils.yyyyMMddHHmmsssss_F), wrkMast.getWrkNo());
}
// 鍑哄簱銆佺Щ搴�
if (wrkMast.getWrkSts() == 11) {
@@ -1989,7 +1949,7 @@
if (wrkMastMapper.updateById(wrkMast) == 0) {
News.error("淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkMast.getWrkNo());
}
- News.warn("淇敼宸ヤ綔妗ｇ姸鎬佹垚鍔熴�俒鏃堕棿锛歿}] >>>>> 浠诲姟鍙�:{}", DateUtils.convert(now, DateUtils.yyyyMMddHHmmsssss_F), wrkMast.getWrkNo());
+ News.warn("淇敼宸ヤ綔妗ｇ姸鎬佹垚鍔熴�俒鏃堕棿锛歿}] >>>>> 浠诲姟鍙�:{}", DateUtils.convert(now, DateUtils.yyyyMMddHHmmsssss_F), wrkMast.getWrkNo());
}
@@ -2047,9 +2007,11 @@
* 绔欏埌绔� ===>> 鍫嗗灈鏈�109绔欏埌108绔�
* 109闃茬垎娌欑绔欑偣 鍑哄簱 鍒� 108绔欑偣
*/
- public void stnToStn(CrnSlave slave, CrnProtocol crnProtocol){
+ public void stnToStn(CrnSlave slave, CrnProtocol crnProtocol) {
for (CrnSlave.CrnStn crnStn : slave.getCrnInStn()) {
- if(crnStn.getStaNo()!=109){ continue; }
+ if (crnStn.getStaNo() != 109) {
+ continue;
+ }
boolean flag = false;
// 鑾峰彇鍫嗗灈鏈哄叆搴撶珯淇℃伅
@@ -2067,7 +2029,7 @@
continue;
}
if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.getWorkNo() > 0 && staProtocol.isInEnable()
- && staDetl.getCanining()!=null && staDetl.getCanining().equals("Y")) {
+ && staDetl.getCanining() != null && staDetl.getCanining().equals("Y")) {
flag = true;
}
@@ -2098,15 +2060,15 @@
// 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
CrnCommand crnCommand = new CrnCommand();
crnCommand.setCrnNo(slave.getId()); // 鍫嗗灈鏈虹紪鍙�
- crnCommand.setTaskNo((short)9999); // 宸ヤ綔鍙�
+ crnCommand.setTaskNo((short) 9999); // 宸ヤ綔鍙�
crnCommand.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
crnCommand.setTaskMode(CrnTaskModeType.LOC_MOVE); // 浠诲姟妯″紡: 搴撲綅绉昏浆
crnCommand.setSourcePosX(crnStn.getRow().shortValue()); // 婧愬簱浣嶆帓
crnCommand.setSourcePosY(crnStn.getBay().shortValue()); // 婧愬簱浣嶅垪
crnCommand.setSourcePosZ(crnStn.getLev().shortValue()); // 婧愬簱浣嶅眰
- crnCommand.setDestinationPosX((short)2); // 鐩爣搴撲綅鎺�
- crnCommand.setDestinationPosY((short)19); // 鐩爣搴撲綅鍒�
- crnCommand.setDestinationPosZ((short)1); // 鐩爣搴撲綅灞�
+ crnCommand.setDestinationPosX((short) 2); // 鐩爣搴撲綅鎺�
+ crnCommand.setDestinationPosY((short) 19); // 鐩爣搴撲綅鍒�
+ crnCommand.setDestinationPosZ((short) 1); // 鐩爣搴撲綅灞�
if (!MessageQueue.offer(SlaveType.Crn, 1, new Task(2, crnCommand))) {
News.error("鍫嗗灈鏈哄懡浠や笅鍙戝け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", 1, JSON.toJSON(crnCommand));
} else {
@@ -2123,12 +2085,12 @@
// 鏍规嵁杈撻�佺嚎plc閬嶅巻
for (DevpSlave devp : slaveProperties.getDevp()) {
SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
- if(null != devpThread){
- for (int i = 0; i < 48; i++){
+ if (null != devpThread) {
+ for (int i = 0; i < 48; i++) {
int olsStatus = 0;//testMast琛ㄥ師鏉tatus鏁版嵁鐘舵��
int newStatus = 0;//testMast琛ㄥ緟淇敼鐨剆tatus鏁版嵁鐘舵��
short newSingle = 0; //PLC鍦板潃寰呬慨鏀圭殑鏂板��
- switch (devpThread.startSignal[i][0]){//鏍规嵁淇″彿鏌ユ壘testMast琛ㄤ腑瀵瑰簲鐘舵�佹潯浠�,olsStatus锛宯ewStatus鏍规嵁瀹為檯娴佺▼璋冩暣
+ switch (devpThread.startSignal[i][0]) {//鏍规嵁淇″彿鏌ユ壘testMast琛ㄤ腑瀵瑰簲鐘舵�佹潯浠�,olsStatus锛宯ewStatus鏍规嵁瀹為檯娴佺▼璋冩暣
case 0://鍒濆鐘舵�侊紝鍏ュ簱
olsStatus = 1;//寰呮祴
newStatus = 1;//寰呮祴
@@ -2176,72 +2138,72 @@
newSingle = 0;//澶嶄綅锛屽瘎瀛樺櫒鍦板潃锛�12===>>0
break;
default:
- log.info("璇诲彇閫氶亾"+(i+1)+"娴嬭瘯搴撲綅鎸夐挳淇″彿:涓�"+devpThread.startSignal[i][0]);
+ log.info("璇诲彇閫氶亾" + (i + 1) + "娴嬭瘯搴撲綅鎸夐挳淇″彿:涓�" + devpThread.startSignal[i][0]);
continue;
}
TestMast testMast = testMastService.selectOne(new EntityWrapper<TestMast>()
- .eq("channel",(i+1)).eq("status",olsStatus));//鏌ユ壘鍘熸潵鐨勭姸鎬�
- LocMast locMast=null;
- boolean sign=false;
- switch (devpThread.startSignal[i][0]){
+ .eq("channel", (i + 1)).eq("status", olsStatus));//鏌ユ壘鍘熸潵鐨勭姸鎬�
+ LocMast locMast = null;
+ 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;
+ 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;
+ 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;
case 5:
case 6:
- if (!Cools.isEmpty(testMast)){
- locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("channel",(i+1)));
- if (!Cools.isEmpty(locMast) && locMast.getLocSts().equals("F")){
- if (devpThread.startSignal[i][0]==5 && locMast.getPackStatus()==4){
- sign=true;
- }else if (devpThread.startSignal[i][0]==6 && locMast.getPackStatus()==3){
- sign=true;
- }else {
- log.error("娴嬭瘯瀹屾垚绉诲簱鏃舵寜涓嬪畬鎴愭寜閽笌娴嬭瘯缁撴灉涓嶄竴鑷�===>>[channel:{}", i+1);
+ if (!Cools.isEmpty(testMast)) {
+ locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("channel", (i + 1)));
+ if (!Cools.isEmpty(locMast) && locMast.getLocSts().equals("F")) {
+ if (devpThread.startSignal[i][0] == 5 && locMast.getPackStatus() == 4) {
+ sign = true;
+ } else if (devpThread.startSignal[i][0] == 6 && locMast.getPackStatus() == 3) {
+ sign = true;
+ } else {
+ log.error("娴嬭瘯瀹屾垚绉诲簱鏃舵寜涓嬪畬鎴愭寜閽笌娴嬭瘯缁撴灉涓嶄竴鑷�===>>[channel:{}", i + 1);
}
- }else {
- log.error("娴嬭瘯瀹屾垚绉诲簱鏃舵湭鏌ヨ鍒版祴璇曟。妗�===>>[channel:{}", i+1);
+ } else {
+ log.error("娴嬭瘯瀹屾垚绉诲簱鏃舵湭鏌ヨ鍒版祴璇曟。妗�===>>[channel:{}", i + 1);
}
}
break;
case 2:
- if (!Cools.isEmpty(testMast)){
+ if (!Cools.isEmpty(testMast)) {
testMast.setStatus(newStatus);
testMast.setModiTime(new Date());
- if(!testMastService.update(testMast,new EntityWrapper<TestMast>().eq("channel",(i+1)).eq("barcode",testMast.getBarcode()))){
+ if (!testMastService.update(testMast, new EntityWrapper<TestMast>().eq("channel", (i + 1)).eq("barcode", testMast.getBarcode()))) {
throw new CoolException("鏇存柊浜у搧娴嬭瘯鐘舵�佸け璐�");
- }else {
- sign=true;
+ } else {
+ sign = true;
}
- }else {
- log.error("鍚姩娴嬭瘯鏃舵湭鏌ヨ鍒版祴璇曟。妗�===>>[channel:{}", i+1);
+ } else {
+ log.error("鍚姩娴嬭瘯鏃舵湭鏌ヨ鍒版祴璇曟。妗�===>>[channel:{}", i + 1);
}
break;
case 7:
SearchLocParam param = new SearchLocParam();
- param.setBarcode(i+1+"");
+ param.setBarcode(i + 1 + "");
String response = new HttpHandler.Builder()
.setUri(wmsUrl)
.setPath("/mobile/test/suspend/auth")
@@ -2250,84 +2212,84 @@
.doPost();
JSONObject jsonObject = JSON.parseObject(response);
if (jsonObject.getInteger("code").equals(200)) {
- testMast = testMastService.selectOne(new EntityWrapper<TestMast>().eq("channel",(i+1)));
+ testMast = testMastService.selectOne(new EntityWrapper<TestMast>().eq("channel", (i + 1)));
testMast.setStatus(newStatus);
testMast.setModiTime(new Date());
- if(!testMastService.update(testMast,new EntityWrapper<TestMast>().eq("channel",(i+1)).eq("barcode",testMast.getBarcode()))){
+ if (!testMastService.update(testMast, new EntityWrapper<TestMast>().eq("channel", (i + 1)).eq("barcode", testMast.getBarcode()))) {
log.error("鏇存柊浜у搧娴嬭瘯鐘舵�佸け璐�");
}
- sign=true;
+ sign = true;
} else {
- log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", wmsUrl+"/mobile/test/suspend/auth", JSON.toJSONString(param), response);
+ log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", wmsUrl + "/mobile/test/suspend/auth", JSON.toJSONString(param), response);
}
break;
case 9:
case 12:
- locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("channel",(i+1)));
- if (!Cools.isEmpty(locMast) && locMast.getLocSts().equals("F") || locMast.getLocSts().equals("D")){
+ locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("channel", (i + 1)));
+ if (!Cools.isEmpty(locMast) && locMast.getLocSts().equals("F") || locMast.getLocSts().equals("D")) {
locMast.setPackStatus(8); //8.绱ф�ュ嚭搴�
- if (locMastService.update(locMast,new EntityWrapper<LocMast>().eq("channel",(i+1)))){
- log.info("搴撲綅锛歿}锛岀揣鎬ュ嚭搴擄紒",locMast.getLocNo());
+ if (locMastService.update(locMast, new EntityWrapper<LocMast>().eq("channel", (i + 1)))) {
+ log.info("搴撲綅锛歿}锛岀揣鎬ュ嚭搴擄紒", locMast.getLocNo());
}
- }else {
+ } else {
log.error("搴撲綅涓嶆槸鍦ㄥ簱鐘舵�侊紝鏃犻渶绱ф�ュ嚭搴擄紒");
}
- sign=true;
+ sign = true;
break;
case 10:
- if (!Cools.isEmpty(testMast)){
- locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("channel",(i+1)));
- if (!Cools.isEmpty(locMast) && locMast.getLocSts().equals("F") ){
- if ( locMast.getFireStatus().equals(1)){
- newSingle=11;
- }else {
+ if (!Cools.isEmpty(testMast)) {
+ locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("channel", (i + 1)));
+ if (!Cools.isEmpty(locMast) && locMast.getLocSts().equals("F")) {
+ if (locMast.getFireStatus().equals(1)) {
+ newSingle = 11;
+ } else {
testMast.setStatus(newStatus);
testMast.setModiTime(new Date());
- if(!testMastService.update(testMast,new EntityWrapper<TestMast>().eq("channel",(i+1)).eq("barcode",testMast.getBarcode()))){
+ if (!testMastService.update(testMast, new EntityWrapper<TestMast>().eq("channel", (i + 1)).eq("barcode", testMast.getBarcode()))) {
throw new CoolException("鏇存柊浜у搧娴嬭瘯鐘舵�佸け璐�");
- }else {
- sign=true;
+ } else {
+ sign = true;
}
}
}
}
- sign=true;
+ sign = true;
break;
case 13:
- locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("channel",(i+1)));
- if (locMast.getLocSts().equals("O")){
+ locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("channel", (i + 1)));
+ if (locMast.getLocSts().equals("O")) {
locMast.setLocSts("X");
- locMastService.update(locMast,new EntityWrapper<LocMast>().eq("channel",(i+1)));
+ locMastService.update(locMast, new EntityWrapper<LocMast>().eq("channel", (i + 1)));
}
- sign=true;
+ sign = true;
break;
case 15:
- locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("channel",(i+1)));
- if (locMast.getLocSts().equals("X")){
+ locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("channel", (i + 1)));
+ if (locMast.getLocSts().equals("X")) {
locMast.setLocSts("O");
- locMastService.update(locMast,new EntityWrapper<LocMast>().eq("channel",(i+1)));
+ locMastService.update(locMast, new EntityWrapper<LocMast>().eq("channel", (i + 1)));
}
- sign=true;
+ sign = true;
break;
default:
- log.info("璇诲彇閫氶亾"+(i+1)+"娴嬭瘯搴撲綅鎸夐挳淇″彿:涓�"+devpThread.startSignal[i][0]);
+ log.info("璇诲彇閫氶亾" + (i + 1) + "娴嬭瘯搴撲綅鎸夐挳淇″彿:涓�" + devpThread.startSignal[i][0]);
continue;
}
- if (sign){
- boolean result = messageQueueOffer(i,newSingle,SlaveType.Devp, devp.getId());
- if(!result){
- log.error("鏇存柊娴嬭瘯淇″彿澶辫触===>>[channel:{},locNo:{},barcode:{}]", i+1, testMast.getLocNo(), testMast.getBarcode());
+ if (sign) {
+ boolean result = messageQueueOffer(i, newSingle, SlaveType.Devp, devp.getId());
+ if (!result) {
+ log.error("鏇存柊娴嬭瘯淇″彿澶辫触===>>[channel:{},locNo:{},barcode:{}]", i + 1, testMast.getLocNo(), testMast.getBarcode());
} else {
- devpThread.startSignal[i][0] = newSingle;
+ 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());
+ 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);
+ } catch (Exception e) {
+ log.error("鐏 ===>> 缁欒緭閫佺嚎鍙戦�佽鎶ュけ璐�,閫氶亾鍙凤細", i + 1);
}
}
@@ -2341,15 +2303,15 @@
}
}
- public boolean messageQueueOffer(int i ,short newSingle,SlaveType devp,Integer id){
+ public boolean messageQueueOffer(int i, short newSingle, SlaveType devp, Integer id) {
//澶嶄綅PLC淇″彿锛屽�熺敤杈撻�佺珯鐐瑰疄浣撶被
StaProtocol staProtocol = new StaProtocol();
- staProtocol.setSiteId(i*2);//瀵勫瓨鍣ㄥ湴鍧�
+ staProtocol.setSiteId(i * 2);//瀵勫瓨鍣ㄥ湴鍧�
staProtocol.setStaNo(newSingle);//淇敼PLC瀵勫瓨鍣ㄥ湴鍧�鍊�,8==>0
return MessageQueue.offer(devp, id, new Task(3, staProtocol));
}
- public boolean messageQueueOffer2(int i ,short newSingle,SlaveType devp,Integer id){
+ public boolean messageQueueOffer2(int i, short newSingle, SlaveType devp, Integer id) {
//澶嶄綅PLC淇″彿锛屽�熺敤杈撻�佺珯鐐瑰疄浣撶被
StaProtocol staProtocol = new StaProtocol();
staProtocol.setSiteId(i);//瀵勫瓨鍣ㄥ湴鍧�
@@ -2363,15 +2325,15 @@
@Transactional
public void fierCrn() {
try {
- for (CrnSlave crn :slaveProperties.getCrn()) {
- if(crn.getId()!=1){
+ 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)){
+ if (!Cools.isEmpty(locMast)) {
//鎶ヨ淇″彿鍐欏叆1
if (!MessageQueue.offer(SlaveType.Crn, 1, new Task(4, 1))) {
News.error("鐏 ===>> 缁欏爢鍨涙満鍙戦�佹姤璀︿俊鍙峰け璐�");
@@ -2399,16 +2361,16 @@
try {
// 鏍规嵁杈撻�佺嚎plc閬嶅巻
for (DevpSlave devp : slaveProperties.getDevp()) {
- BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no",103));
- if (Cools.isEmpty(basDevp)){
+ 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") ){
+ if (basDevp.getAutoing().equals("Y") && basDevp.getWrkNo() > 0 && basDevp.getLoading().equals("Y")) {
WrkDetl wrkDetl = wrkDetlService.devpPackNo(basDevp.getWrkNo());
- if (Cools.isEmpty(wrkDetl)){
+ if (Cools.isEmpty(wrkDetl)) {
News.error("103绔欑偣鏌ヨ澶辫触-MainServiceImpl.java-2255琛�");
}
- MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(4,wrkDetl.getMatnr()));
+ MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(4, wrkDetl.getMatnr()));
}
}
} catch (Exception e) {
@@ -2417,6 +2379,7 @@
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
}
}
+
/**
* 鏍规嵁PLC鎸夐挳娴嬭瘯銆佸畬鎴愩�佹殏鍋滀俊鍙凤紝鏇存柊testMast琛ㄤ腑status鍊硷紝浜ょ敱WMS绯荤粺澶勭悊
*/
@@ -2427,18 +2390,18 @@
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++){
+ if (null != devpThread) {
+ for (int i = 0; i < 48; i++) {
// log.info("2367琛岀▼搴忓紑濮嬭繍琛岋紝绗�"+i+"娆�");
- boolean fig=false;
+ boolean fig = false;
//鏌ヨ鍦ㄥ簱鍜岄绾﹀嚭搴�
- LocMast locMast=locMastService.selectztgx("F","R",i);
- if(!Cools.isEmpty(locMast)){
+ 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)){
+ 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;
}
@@ -2451,82 +2414,82 @@
//testMast.setStatus
//"鐘舵�� 0: 寰呯敵璇� 1: 鐢宠涓� 2: 宸插鏍� 3:娴嬭瘯涓� 4:瀹屾垚 5:绉诲簱 6:鐏"
- if(devpThread.startSignal[i][0]==8){
- News.info("2390琛岀▼搴忓紑濮嬭繍琛岋紝淇敼娴嬭瘯妗ｇ姸鎬佷负 1銆佺敵璇蜂腑锛屽紑濮嬩慨鏀瑰墠锛�"+ JSON.toJSONString(testMast));
+ 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));
+ 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));
+ 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()));
+ 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()));
+ locMastService.update(locMast1, new EntityWrapper<LocMast>().eq("loc_no", wrkMast.getLocNo()));
}
wrkMastMapper.deleteById(wrkMast);
- log.info("2415锛屽垹闄ゅ伐浣滄。"+JSON.toJSONString(wrkMast)+JSON.toJSONString(locMast));
+ 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;
+ 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){
+ } 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){
+ } 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){
+ 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());
+ 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);
+ 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);
+ } 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()))) {
+ if (!testMastService.update(testMast, new EntityWrapper<TestMast>()
+ .eq("loc_no", locMast.getLocNo())
+ .eq("user_id", locMast.getBarcode()))) {
News.error("淇敼娴嬭瘯妗ｇ姸鎬佸け璐�" + locMast.getLocNo(), locMast);
}
}
@@ -2535,35 +2498,34 @@
//褰撳厖鏀剧數搴撲綅涓篛绌哄簱浣嶆椂
//搴撲綅鐘舵�佹敼涓�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){
+ 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));
+ 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)){
+ 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){
+ if (locMast.getFireStatus() == 1) {
testMast.setStatus(6);//鐏
- if(!testMastService.update(testMast,new EntityWrapper<TestMast>()
- .eq("loc_no",locMast.getLocNo())
- .eq("user_id",locMast.getBarcode()))) {
+ 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("鐏 ===>> 缁欒緭閫佺嚎鍙戦�佽鎶ュけ璐�,閫氶亾鍙凤細", i + 1);
}
}
-
}
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 88f2a6d..595c5ec 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -59,7 +59,7 @@
// 鍫嗗灈鏈哄紓甯镐俊鎭褰�
mainService.recCrnErr();
// 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐�
- mainService.storeEmptyPlt();
+// mainService.storeEmptyPlt();
// 鍑哄簱 ===>> 宸ヤ綔妗ｄ俊鎭啓鍏ed鏄剧ず鍣�
mainService.ledExecute();
// 鍏朵粬 ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅
--
Gitblit v1.9.1