From 621ee9ed14726ae98bbb6fea9342b8c47a0435f4 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 14 七月 2025 19:34:31 +0800
Subject: [PATCH] 空拖出库避免重复点击
---
src/main/java/com/zy/asrs/controller/LocMastController.java | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index c914c92..4037e82 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -87,6 +87,21 @@
return R.ok(locMastService.selectPage(new Page<>(curr, limit), wrapper));
}
+ @RequestMapping(value = "/locMast/emptyList/auth")
+ @ManagerAuth
+ public R emptyList(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam(required = false)String orderByField,
+ @RequestParam(required = false)String orderByType,
+ @RequestParam Map<String, Object> param){
+ excludeTrash(param);
+ EntityWrapper<LocMast> wrapper = new EntityWrapper<>();
+ convert(param, wrapper);
+ wrapper.in("loc_sts","Z","M");
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ return R.ok(locMastService.selectPage(new Page<>(curr, limit), wrapper));
+ }
+
private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
boolean sign = false;
for (Map.Entry<String, Object> entry : map.entrySet()){
@@ -128,12 +143,12 @@
return R.error();
}
- WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
- .eq("source_loc_no", locMast.getLocNo())
- .or().eq("loc_no", locMast.getLocNo()));
- if(!Cools.isEmpty(wrkMast)){
- return R.error("璇ュ簱浣嶆鍦ㄤ綔涓氾紝璇峰厛澶勭悊宸ヤ綔妗�");
- }
+// WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
+// .eq("source_loc_no", locMast.getLocNo())
+// .or().eq("loc_no", locMast.getLocNo()));
+// if(!Cools.isEmpty(wrkMast)){
+// return R.error("璇ュ簱浣嶆鍦ㄤ綔涓氾紝璇峰厛澶勭悊宸ヤ綔妗�");
+// }
LocMast oldLocMast = locMastService.selectById(locMast.getLocNo());
if (locMast.getLocSts().equals("F") && (oldLocMast.getLocSts().equals("D") || oldLocMast.getLocSts().equals("O"))) {
--
Gitblit v1.9.1