From 2567eba7aff97393618e71337045345bdffdb856 Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期五, 27 三月 2026 20:40:10 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/asrs/controller/CheckOrderController.java | 9 +++++----
src/main/java/com/zy/asrs/controller/OpenController.java | 6 +-----
src/main/java/com/zy/asrs/controller/LocCacheController.java | 4 ++--
src/main/java/com/zy/asrs/controller/MobileController.java | 16 +++++++++++++++-
4 files changed, 23 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/CheckOrderController.java b/src/main/java/com/zy/asrs/controller/CheckOrderController.java
index 59e39eb..7145160 100644
--- a/src/main/java/com/zy/asrs/controller/CheckOrderController.java
+++ b/src/main/java/com/zy/asrs/controller/CheckOrderController.java
@@ -60,6 +60,7 @@
List<LocDto> locDtos = checkOrderService.preview(orderId);
return R.ok(locDtos);
}
+
@PostMapping(value = "/checkOrder/getTaskList/auth")
@ManagerAuth(memo = "pda锛氳幏鍙栫洏鐐逛换鍔″垪琛�")
public R checkOrderGetTaskList(@RequestBody CheckTaskListParam checkTaskListParam) {
@@ -145,9 +146,9 @@
checkOrderDetl.setStatus(1);
checkOrderDetl.setZpallet(locDetl.getZpallet());
checkOrderDetl.setCreateBy(getUserId());
- checkOrderDetl.setCreateTime(now);
+// checkOrderDetl.setCreateTime(now);
checkOrderDetl.setUpdateBy(getUserId());
- checkOrderDetl.setUpdateTime(now);
+// checkOrderDetl.setUpdateTime(now);
if (!checkOrderDetlService.insert(checkOrderDetl)) {
throw new CoolException("淇濆瓨鐩樼偣鍗曟槑缁嗗け璐�");
}
@@ -195,9 +196,9 @@
checkOrderDetl1.setStatus(checkOrderDetl.getStatus());
checkOrderDetl1.setZpallet(checkOrderDetl.getZpallet());
checkOrderDetl1.setCreateBy(getUserId());
- checkOrderDetl1.setCreateTime(checkOrderDetl.getCreateTime() == null?now:checkOrderDetl.getCreateTime());
+// checkOrderDetl1.setCreateTime(checkOrderDetl.getCreateTime() == null?now:checkOrderDetl.getCreateTime());
checkOrderDetl1.setUpdateBy(getUserId());
- checkOrderDetl1.setUpdateTime(now);
+// checkOrderDetl1.setUpdateTime(now);
if (!checkOrderDetlService.insert(checkOrderDetl1)) {
throw new CoolException("淇濆瓨鐩樼偣鍗曟槑缁嗗け璐�");
}
diff --git a/src/main/java/com/zy/asrs/controller/LocCacheController.java b/src/main/java/com/zy/asrs/controller/LocCacheController.java
index e58146f..65938b0 100644
--- a/src/main/java/com/zy/asrs/controller/LocCacheController.java
+++ b/src/main/java/com/zy/asrs/controller/LocCacheController.java
@@ -84,7 +84,7 @@
return R.error("搴撲綅涓嶅瓨鍦�");
}
cache.setSort(locCache.getSort());
- if (!locCacheService.updateById(cache)) {
+ if (!locCacheService.update(cache, new EntityWrapper<LocCache>().eq("loc_no", cache.getLocNo()))) {
return R.error("鏇存柊澶辫触");
}
return R.ok();
@@ -94,7 +94,7 @@
@ManagerAuth
public R delete(@RequestParam(value="ids[]") Long[] ids){
for (Long id : ids){
- locCacheService.deleteById(id);
+// locCacheService.deleteById(id);
}
return R.ok();
}
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index f414275..72347fe 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -223,7 +223,7 @@
* @version 1.0
*/
@PostMapping("/cache/out/call")
- @ApiOperation("鍛煎彨AGV鎼繍")
+ @ApiOperation("鍛煎彨AGV鎼繍/缂撳瓨鍑哄簱")
@ManagerAuth
public R OutCallAgv(@RequestBody AgvCallParams params) {
if (Objects.isNull(params)) {
@@ -361,6 +361,20 @@
}
/**
+ * 绌烘澘鍑哄簱
+ * @param params
+ * @return
+ */
+ @RequestMapping("/empty/call/out")
+ public R getEmptyOut(@RequestBody AgvCallParams params) {
+ if (Objects.isNull(params)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return mobileService.getEmptyOutStock(params);
+ }
+
+
+ /**
*
* 鑾峰彇鎹嗗寘鍑哄簱鏄庣粏
* @param params
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 0b8728d..b4e7dbb 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -11,8 +11,6 @@
import com.zy.asrs.entity.param.*;
import com.zy.asrs.mapper.ReportQueryMapper;
import com.zy.asrs.service.*;
-import com.zy.asrs.service.impl.BasStationDetlServiceImpl;
-import com.zy.asrs.service.impl.BasStationServiceImpl;
import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
@@ -54,11 +52,9 @@
@Autowired
private WaitPakinService waitPakinService;
@Autowired
- private BasStationServiceImpl basStationService;
+ private BasStationService basStationService;
@Autowired
private BasStationDetlService basStationDetlService;
-
-
/**
* 缁勬墭鏌ヨ鎺ュ彛
*/
--
Gitblit v1.9.1