From 7bd1e8326844525956f13ebaf4e5549943be484f Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期四, 18 十二月 2025 08:12:47 +0800
Subject: [PATCH] bug修复
---
src/main/java/com/zy/asrs/service/impl/TaskServiceImpl.java | 2 ++
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 17 ++++++++++++++++-
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 4 ++--
src/main/java/com/zy/asrs/controller/MobileController.java | 2 +-
src/main/java/com/zy/asrs/controller/OutController.java | 8 ++++++--
src/main/webapp/static/js/orderPakout/agvOut.js | 6 +++---
6 files changed, 30 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index e3a2df6..2cf05fe 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -176,7 +176,7 @@
@PostMapping("/cache/agv/call")
- @ApiOperation("鍛煎彨绌鸿溅")
+ @ApiOperation("缂撳啿鍖哄叆搴�")
@ManagerAuth
public R callAgvMove(@RequestBody AgvCallParams params) {
if (Objects.isNull(params)) {
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 297e261..ec8168e 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -8,6 +8,7 @@
import com.core.exception.CoolException;
import com.zy.api.enums.LocAreaType;
import com.zy.asrs.entity.*;
+import com.zy.asrs.enums.LocStsType;
import com.zy.asrs.service.*;
import com.zy.asrs.service.impl.BasAreasServiceImpl;
import com.zy.asrs.service.impl.BasStationServiceImpl;
@@ -329,7 +330,7 @@
return R.error("搴撳瓨涓嶈冻");
}
- Thread.sleep(1000L);
+ Thread.sleep(300L);
List<TaskDto> taskDtos = new ArrayList<>();
// 鏍规嵁 锛堝簱浣� & 鍑哄簱绔欙級 鍒嗙粍锛� 鐞嗘兂鐘舵�侊細涓�缁勪负涓�娆″嚭搴撲换鍔�
@@ -347,7 +348,10 @@
// -----------------------------------------------------------------------------------------------
for (TaskDto taskDto : taskDtos) {
// BasDevp staNo = basDevpService.checkSiteStatus(taskDto.getStaNo());
- BasStation station = basStationService.selectOne(new EntityWrapper<BasStation>().eq("dev_no", taskDto.getAgvStaNo()));
+ BasStation station = basStationService.selectOne(new EntityWrapper<BasStation>()
+ .in("loc_sts", Arrays.asList(LocStsType.LOC_STS_TYPE_O.type, LocStsType.LOC_STS_TYPE_O.type))
+ .eq("dev_no", taskDto.getAgvStaNo()));
+ if (Objects.isNull(station)) { throw new CoolException("鏁版嵁閿欒锛岀珯鐐逛笉瀛樺湪鎴栧凡浣跨敤锛侊紒"); }
workService.agvStockOut(station, taskDto, getUserId());
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 362f761..a114a19 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -1540,7 +1540,7 @@
station.setModiTime(new Date());
station.setModiUser(userId);
if (!basStationService.updateById(station)) {
- throw new CoolException("鏇存柊鐩爣搴撲綅鐘舵�佸け璐�");
+ throw new CoolException("鏇存柊鐩爣绔欑偣鐘舵�佸け璐�");
}
} else {
throw new CoolException("绉昏浆澶辫触锛岀洰鏍囧簱浣嶇姸鎬侊細" + station.getLocSts());
@@ -2456,7 +2456,7 @@
if (station.getLocSts().equals(LocStsType.LOC_STS_TYPE_O.type)) {
station.setLocSts("R"); // S.鍏ュ簱棰勭害
- station.setBarcode(barcode);
+// station.setBarcode(barcode);
station.setModiTime(new Date());
station.setModiUser(userId);
if (!basStationService.updateById(station)) {
diff --git a/src/main/java/com/zy/asrs/service/impl/TaskServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/TaskServiceImpl.java
index b164ac9..0543095 100644
--- a/src/main/java/com/zy/asrs/service/impl/TaskServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/TaskServiceImpl.java
@@ -59,6 +59,7 @@
BasStation station = basStationService.selectOne(new EntityWrapper<BasStation>().eq("dev_no", wrkMast.getSourceStaNo()));
if (!Objects.isNull(station)) {
station.setLocSts(LocStsType.LOC_STS_TYPE_O.type);
+ station.setBarcode(null);
if (!basStationService.updateById(station)) {
throw new CoolException("绔欑偣鐘舵�佷慨鏀瑰け璐�!!");
}
@@ -213,6 +214,7 @@
BasStation station = basStationService.selectOne(new EntityWrapper<BasStation>().eq("dev_no", wrkMast.getStaNo()));
if (station.getLocSts().equals("S")) {
station.setLocSts("O");
+ station.setBarcode(null);
station.setModiTime(new Date());
station.setModiUser(userId);
if (!basStationService.updateById(station)) {
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index 43f85c0..3fb7968 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -427,7 +427,7 @@
}
String agvSta = null;
- if (wrkMast.getIoType() == TaskIOType.MERGE_OUT.type) {
+ if (wrkMast.getIoType() == TaskIOType.MERGE_IN.type) {
agvSta = wrkMast.getPauseMk();
}
@@ -769,6 +769,7 @@
throw new CoolException("绔欑偣锛�" + task.getSourceStaNo() + ", 涓嶅瓨鍦紒锛�");
}
devNo.setLocSts(LocStsType.LOC_STS_TYPE_F.type);
+ devNo.setBarcode(task.getBarcode());
devNo.setModiTime(new Date());
if (!basStationService.updateById(devNo)) {
throw new CoolException("绔欑偣淇℃伅淇敼澶辫触锛侊紒");
@@ -882,6 +883,20 @@
@Transactional(rollbackFor = Exception.class)
public ReturnT<String> agvDoIn(Task wrkMast) {
LocCache locCache = locCacheService.selectOne(new EntityWrapper<LocCache>().eq("loc_no", wrkMast.getLocNo()));
+
+ if (!Objects.isNull(wrkMast.getSourceStaNo())) {
+ BasStation station = basStationService.selectOne(new EntityWrapper<BasStation>()
+ .eq("dev_no", wrkMast.getSourceStaNo()));
+ if (!Objects.isNull(station)) {
+ List<String> list = Arrays.asList(LocStsType.LOC_STS_TYPE_O.type, LocStsType.LOC_STS_TYPE_D.type);
+ if (!list.contains(station.getLocSts())) {
+ station.setLocSts(LocStsType.LOC_STS_TYPE_O.type);
+ }
+ station.setBarcode(null);
+ basStationService.updateById(station);
+ }
+ }
+
if(wrkMast.getIoType().equals(1)){
if (Objects.isNull(locCache)) {
throw new CoolException("鏁版嵁閿欒锛屽簱浣嶄笉瀛樺湪锛侊紒");
diff --git a/src/main/webapp/static/js/orderPakout/agvOut.js b/src/main/webapp/static/js/orderPakout/agvOut.js
index bc6fdc3..a3243ad 100644
--- a/src/main/webapp/static/js/orderPakout/agvOut.js
+++ b/src/main/webapp/static/js/orderPakout/agvOut.js
@@ -179,7 +179,7 @@
let data = tableCache[index];
for (let i = 0; i<tableCache.length; i++) {
if (tableCache[i].locNo === data.locNo) {
- tableCache[i]['staNo'] = Number(obj.elem.value);
+ tableCache[i]['agvStaNo'] = obj.elem.value;
}
}
obj.othis.children().find("input").css("color", "blue");
@@ -199,7 +199,7 @@
// 鍑哄簱绔欏彇浜ら泦
let staBatchSelectVal = [];
for(let i = 0; i<stoPreTabData.length; i++) {
- let staNos = stoPreTabData[i].staNos;
+ let staNos = stoPreTabData[i].agvStaNos;
if (staNos !== null) {
if (staBatchSelectVal.length === 0) {
staBatchSelectVal = staNos;
@@ -229,7 +229,7 @@
// 纭
form.on('submit(staBatchSelectConfirm)', function (obj) {
let loadIdx = layer.load(2);
- let batchSta = Number(obj.field.batchSta);
+ let batchSta = obj.field.batchSta;
let arr = [];
for (let j = 0; j<stoPreTabData.length; j++) {
for (let i = 0; i<tableCache.length; i++) {
--
Gitblit v1.9.1