From 921d69a620b26ee8616b1564f4fa3b228e09d4d6 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期三, 29 四月 2026 16:45:39 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 48 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 17b8a2b..33f885e 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -11,6 +11,8 @@
import com.zy.asrs.entity.param.*;
import com.zy.asrs.mapper.ReportQueryMapper;
import com.zy.asrs.service.*;
+import com.zy.asrs.task.core.ReturnT;
+import com.zy.asrs.task.handler.AutoEmptyOutHandler;
import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
@@ -47,7 +49,11 @@
@Autowired
private WrkMastService wrkMastService;
@Autowired
+ private WaitPakinService waitPakinService;
+ @Autowired
private WrkDetlService wrkDetlService;
+ @Autowired
+ private AutoEmptyOutHandler autoEmptyOutHandler;
@PostMapping("/order/matSync/default/v2")
// @AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
@@ -177,6 +183,23 @@
HttpServletRequest request) {
auth(appkey, null, request);
return R.ok().add(openService.queryStock());
+ }
+
+ @PostMapping("/task/autoEmptyOut/run/v1")
+ public synchronized R runAutoEmptyOut(@RequestHeader(required = false) String appkey,
+ @RequestParam(required = false) Integer crnNo,
+ @RequestParam(required = false) Integer max,
+ @RequestParam(required = false) Long userId,
+ HttpServletRequest request) {
+ // auth(appkey, null, request);
+ ReturnT<String> res = autoEmptyOutHandler.moveOldestInventory(crnNo, max, userId);
+ if (res == null) {
+ return R.error("鎵ц澶辫触").add(null);
+ }
+ if (res.isSuccess()) {
+ return R.ok().add(res);
+ }
+ return R.error(res.getMsg()).add(res);
}
private void auth(String appkey, Object obj, HttpServletRequest request) {
@@ -366,4 +389,29 @@
map.put("wrkDetls", wrkDetls);
return R.ok().add(map);
}
+
+
+ /**
+ * 浠诲姟鏌ヨ鎺ュ彛
+ */
+ @PostMapping("/queryTaskByBarcode")
+ public synchronized R queryTask(@RequestBody QueryTaskByBarcodeParam param) {
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ if (Cools.isEmpty(param.getBarcode())) {
+ return R.error("鏉＄爜涓嶈兘涓虹┖");
+ }
+
+
+ List<WaitPakin> waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()));
+ if (waitPakins.isEmpty()) {
+ return R.error("鏁版嵁涓嶅瓨鍦�");
+ }
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("taskNo", null);
+ map.put("ioType", "1");
+ map.put("waitPakins", waitPakins);
+ return R.ok().add(map);
+ }
}
--
Gitblit v1.9.1