From 271bc9e0b596ff73e887bbd7389e90e71670668d Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期五, 24 十一月 2023 16:30:29 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 51 ++++++++++++++++++++++++++++++++++++---------------
1 files changed, 36 insertions(+), 15 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 ff8904b..0dafbdd 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -765,9 +765,11 @@
crnCommand.setDestinationPosY(locMast.getBay1().shortValue()); // 鐩爣搴撲綅鍒�
crnCommand.setDestinationPosZ(locMast.getLev1().shortValue()); // 鐩爣搴撲綅灞俓
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));
} else {
+ log.error("772 鍫嗗灈鏈哄懡浠や笅鍙戞垚鍔�"+crnCommand);
// long startTime = System.currentTimeMillis();
// while ((System.currentTimeMillis() - startTime) < COMMAND_TIMEOUT) {
@@ -782,6 +784,7 @@
// }
// 淇敼宸ヤ綔妗ｇ姸鎬� 2.璁惧涓婅蛋 => 3.鍚婅溅鍏ュ簱涓�
+ log.error("787 淇敼宸ヤ綔妗ｇ姸鎬�2.璁惧涓婅蛋 => 3.鍚婅溅鍏ュ簱涓� "+wrkMast);
Date now = new Date();
wrkMast.setWrkSts(3L);
wrkMast.setCrnStrTime(now);
@@ -789,6 +792,7 @@
if (wrkMastMapper.updateById(wrkMast) == 0) {
log.error("淇敼宸ヤ綔妗ｇ姸鎬� 2.璁惧涓婅蛋 => 3.鍚婅溅鍏ュ簱涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkMast.getWrkNo());
}
+ log.error("795 淇敼宸ヤ綔妗ｇ姸鎬佹垚鍔�2.璁惧涓婅蛋 => 3.鍚婅溅鍏ュ簱涓�"+wrkMast);
}
}
}
@@ -1063,6 +1067,7 @@
* 搴撲綅绉昏浆
*/
public void locToLoc(CrnSlave slave, CrnProtocol crnProtocol){
+ log.info("寮�濮嬬Щ搴撲换鍔＄▼搴�");
//鑾峰彇鎵�鏈夌Щ搴撲换鍔�
List<WrkMast> wrkMasts=wrkMastMapper.selectLocMoves(slave.getId());
// 鑾峰彇宸ヤ綔妗ｄ俊鎭�
@@ -1147,6 +1152,7 @@
log.error("銆愬簱浣嶇Щ杞�� 淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkMast.getWrkNo());
}
}
+ log.info("缁撴潫绉诲簱浠诲姟绋嬪簭");
}
@@ -2360,19 +2366,24 @@
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:绌洪棽
@@ -2382,35 +2393,45 @@
//testMast.setStatus
//"鐘舵�� 0: 寰呯敵璇� 1: 鐢宠涓� 2: 宸插鏍� 3:娴嬭瘯涓� 4:瀹屾垚 5:绉诲簱 6:鐏"
if(devpThread.startSignal[i][0]==8){
+ log.info("2390琛岀▼搴忓紑濮嬭繍琛岋紝淇敼娴嬭瘯妗ｇ姸鎬佷负 1銆佺敵璇蜂腑锛屽紑濮嬩慨鏀瑰墠锛�"+testMast);
testMast.setStatus(1);
locMast.setPackStatus(1);
testMast.setModiTime(new Date());
+ log.info("2394琛岀▼搴忓紑濮嬭繍琛岋紝淇敼娴嬭瘯妗ｇ姸鎬佷负 1銆佺敵璇蜂腑,淇敼鏁版嵁鍚庛�佹湭鏇存柊"+testMast);
}else if(devpThread.startSignal[i][0]==2 && locMast.getPackStatus()!=2){
+ log.info("2396琛岀▼搴忓紑濮嬭繍琛岋紝淇敼娴嬭瘯妗ｇ姸鎬佷负 3銆佹祴璇曚腑锛屽紑濮嬩慨鏀瑰墠锛�"+testMast);
testMast.setStatus(3);
locMast.setPackStatus(2);
testMast.setModiTime(new Date());
+ log.info("2400锛屼慨鏀规祴璇曟。鐘舵�佷负 3銆佹祴璇曚腑,淇敼鏁版嵁鍚庛�佹湭鏇存柊"+testMast);
//NG杞琌K闇�瑕佽繕鍘熸簮搴撲綅鍜岀洰鏍囧簱浣嶇姸鎬侊紝OK杞琋G 鍒犻櫎浠诲姟妗�
WrkMast wrkMast=wrkMastService.selectOne(new EntityWrapper<WrkMast>()
.eq("source_loc_no",locMast.getLocNo())
.eq("wrk_sts",11));
+ log.info("2405锛屾煡璇㈢姸鎬佷负鐢熸垚鍑哄簱id鐨勬祴璇曞畬鎴愶紙NG鎴朞K锛変换鍔℃。锛�"+wrkMast);
if(!Cools.isEmpty(wrkMast)){
if(wrkMast.getWrkSts()==11){
- if(wrkMast.getIoType()==11){
- 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()));
+ if(wrkMast.getIoType()==11){
+ log.info("2409锛屽垹闄や换鍔℃。涓虹Щ搴撶殑锛�"+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锛屽垹闄ゅ伐浣滄。"+wrkMast);
+ locMast.setLocSts("F");
+ log.info("2417锛屽垹闄ゅ伐浣滄。"+wrkMast);
+ 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(),locMast);
+ }else{
+ log.error("2424"+locMast.getLocNo(),locMast);
+ fig=true;
+ }
}
- wrkMastMapper.delete(new EntityWrapper<WrkMast>()
- .eq("wrk_no",wrkMast.getWrkNo()));
- locMast.setLocSts("F");
- wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("wrk_no",wrkMast.getWrkNo()));
- if(!locMastService.update(locMast,new EntityWrapper<LocMast>()
- .eq("channel",i+1))){
- log.error("淇敼娴嬭瘯搴撲綅鐘舵�佸け璐�"+locMast.getLocNo(),locMast);
- }else{
- fig=true;
- }
- }}
+ }
}else if(devpThread.startSignal[i][0]==3){
locMast.setPackStatus(7);
testMast.setModiTime(new Date());
--
Gitblit v1.9.1