From 770a7701c1473993c0e8148377c4f44dfec31e20 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 28 十一月 2023 16:34:19 +0800
Subject: [PATCH] #接口+高度位变更为检测小车+扫码
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 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 511ccb0..5c03577 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -140,7 +140,11 @@
devpThread.setPakMk(staProtocol.getSiteId(), false);
MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
-
+ TaskWrk taskWrk = taskWrkMapper.selectByWrkNo(Integer.valueOf(workNo));
+ if (taskWrk != null) {
+ taskWrk.setMemo(errMsg);//灏嗛敊璇爜瀛樺叆澶囨敞瀛楁杩涜灞曠ず
+ taskWrkMapper.updateById(taskWrk);
+ }
continue;
}
// 鑾峰彇鏉＄爜鎵弿浠俊鎭�
@@ -208,11 +212,19 @@
continue;
}
- // 鏇存柊宸ヤ綔妗ｇ姸鎬佷负14澶辫触
+ // 鏇存柊宸ヤ綔妗ｇ姸鎬佷负14
taskWrk.setWrkSts(14);
if (taskWrkMapper.updateById(taskWrk) != 0) {
// 澶嶄綅鍫嗗灈鏈�
crnThread.setResetFlag(true);
+
+ //鏇存柊搴撲綅鐘舵��
+ LocMast locMast = locMastService.selectByLocNo(taskWrk.getTargetPoint());
+ locMast.setLocSts("O");//O.绌哄簱浣�
+ locMast.setBarcode("");//鎵樼洏鐮�
+ locMast.setModiTime(new Date());
+ locMast.setModiUser(9999L);
+ locMastService.updateById(locMast);
} else {
log.error("鏇存柊宸ヤ綔妗ｇ殑宸ヤ綔鐘舵�佷负14澶辫触锛侊紒锛� [宸ヤ綔鍙�:{}]", taskWrk.getWrkNo());
}
@@ -557,6 +569,14 @@
if (integerTaskWrk > 0) {
// 鍫嗗灈鏈哄浣�
crnThread.setResetFlag(true);
+
+ //鏇存柊搴撲綅鐘舵��
+ LocMast locMast = locMastService.selectByLocNo(taskWrk.getTargetPoint());
+ locMast.setLocSts("F");//F.鍦ㄥ簱
+ locMast.setBarcode(taskWrk.getBarcode());//鎵樼洏鐮�
+ locMast.setModiTime(now);
+ locMast.setModiUser(9999L);
+ locMastService.updateById(locMast);
}
}
}
--
Gitblit v1.9.1