From 43efe016c156158b9fc3a8b647810f612fb126e6 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期二, 02 九月 2025 11:39:52 +0800
Subject: [PATCH] 自动补货单新增 1.订单中只能生成两笔自动补货单 2.CTU库是否有足够的空库位，空库位数需要大于100才会生成自动补货单 3.在补货时加上订单明细的数量进行判断
---
src/main/java/com/zy/asrs/controller/LocDetlController.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index 3ab417a..7f99784 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -19,6 +19,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import java.time.LocalDate;
import java.util.*;
@RestController
@@ -86,14 +87,23 @@
@RequestParam(required = false)String orderByType,
@RequestParam(required = false)String condition,
@RequestParam Map<String, Object> param,
- @RequestParam(required = false)Boolean unreason){
+ @RequestParam(required = false)Boolean unreason,
+ @RequestParam(required = false)Boolean expired){
if (!Cools.isEmpty(unreason) && unreason) {
return R.ok(locDetlService.selectPage(new Page<>(curr, limit), new EntityWrapper<LocDetl>()
.where(" DATALENGTH( batch ) != 11 or\n" +
" batch LIKE '%[a-z]%'")));
}
+ if (!Cools.isEmpty(expired) && expired) {
+ return R.ok(locDetlService.selectPage(
+ new Page<>(curr, limit),
+ new EntityWrapper<LocDetl>()
+ .where("deadline < {0}", LocalDate.now()) // 鏂板鐨勮繃鏈熷垽鏂�
+ ));
+ }
param.remove("unreason");
+ param.remove("expired");
String row = "";
EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
if (param.get("row") != null) {
--
Gitblit v1.9.1