From df79f2a0702de355d96c6889adf61977b4284005 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期四, 19 三月 2026 19:35:00 +0800
Subject: [PATCH] 1.修复登录页面 2.新增强制入库或者正常入库
---
src/main/java/com/zy/asrs/controller/LocDetlController.java | 46 ++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 46 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index edfb2a5..61fb204 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -12,6 +12,7 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.asrs.entity.FrozenParam;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.LocOwner;
import com.zy.asrs.entity.Mat;
@@ -188,6 +189,7 @@
// }
// }
excludeTrash(param);
+ applyBeBatchFilter(param, wrapper);
convert(param, wrapper);
allLike(LocDetl.class, param.keySet(), wrapper, condition);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
@@ -214,6 +216,29 @@
}
}
}
+ }
+
+ private <T> void applyBeBatchFilter(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ Object beBatchObj = map.remove("beBatch");
+ if (beBatchObj == null) {
+ beBatchObj = map.remove("be_batch");
+ }
+ if (beBatchObj == null) {
+ return;
+ }
+ String beBatch = String.valueOf(beBatchObj).trim();
+ if (Cools.isEmpty(beBatch)) {
+ return;
+ }
+ if ("1".equals(beBatch)) {
+ wrapper.eq("be_batch", 1);
+ return;
+ }
+ if ("0".equals(beBatch)) {
+ wrapper.andNew().isNull("be_batch").or().eq("be_batch", 0);
+ return;
+ }
+ wrapper.eq("be_batch", beBatch);
}
@RequestMapping(value = "/locDetl/add/auth")
@@ -252,6 +277,26 @@
return R.ok();
}
+ @PostMapping(value = "/locDetl/frozenInventory")
+ @ManagerAuth(memo = "搴撳瓨鍐荤粨")
+ public R frozen(@RequestBody List<FrozenParam> param){
+ if (param.size() == 0) {
+ return R.parse("鏈敹鍒版暟鎹�");
+ }
+
+ return locDetlService.frozenInventory(param);
+ }
+
+ @PostMapping(value = "/locDetl/unfreezeInventory")
+ @ManagerAuth(memo = "搴撳瓨瑙ｅ喕")
+ public R unfreeze(@RequestBody List<FrozenParam> param){
+ if (param.size() == 0) {
+ return R.parse("鏈敹鍒版暟鎹�");
+ }
+
+ return locDetlService.unfreezeInventory(param);
+ }
+
@RequestMapping(value = "/locDetl/export/auth")
@ManagerAuth(memo = "搴撲綅鏄庣粏瀵煎嚭")
public R export(@RequestBody JSONObject param){
@@ -269,6 +314,7 @@
map.remove("row");
}
}
+ applyBeBatchFilter(map, wrapper);
convert(map, wrapper);
if (!row.equals("")) {
wrapper.and()
--
Gitblit v1.9.1