From 055743022694b6fc1bb1864137e0c81b6ea658c5 Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期四, 29 一月 2026 19:45:26 +0800
Subject: [PATCH] 盘点出库增加一个标记 可筛选可清除
---
src/main/java/com/zy/asrs/controller/LocMastController.java | 32 ++++++++++++++++++++++++++++++++
1 files changed, 32 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index 3925dd5..d4ce17e 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -97,6 +97,14 @@
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
} else if (entry.getKey().equals("loc_no")){
wrapper.like(entry.getKey(), val);
+ } else if (entry.getKey().equals("mk")){
+ // 澶勭悊鏄惁鐩樼偣鏌ヨ
+ if ("Y".equals(val)){
+ wrapper.eq("mk", "Y");
+ } else {
+ // 鏈洏鐐癸細mk != 'Y' 鎴栬�� mk is null
+ wrapper.ne("mk", "Y");
+ }
} else {
if (entry.getKey().equals("loc_type1")){
sign=true;
@@ -341,4 +349,28 @@
return R.error("鍒濆鍖栧け璐�===>"+e.getMessage());
}
}
+
+ @RequestMapping(value = "/locMast/clearMk/auth")
+ @ManagerAuth(memo = "娓呴櫎鐩樼偣鐘舵��")
+ public R clearMk(@RequestBody Map<String, Object> param) {
+ List<String> locNos = (List<String>) param.get("locNos");
+ if (Cools.isEmpty(locNos)) {
+ return R.error("搴撲綅鍙峰垪琛ㄤ笉鑳戒负绌�");
+ }
+ try {
+ // 鎵归噺鏇存柊 mk 瀛楁涓� 'N'
+ for (String locNo : locNos) {
+ LocMast locMast = locMastService.selectById(locNo);
+ if (!Cools.isEmpty(locMast)) {
+ locMast.setMk("N");
+ locMast.setModiUser(getUserId());
+ locMast.setModiTime(new Date());
+ locMastService.updateById(locMast);
+ }
+ }
+ return R.ok("娓呴櫎鐩樼偣鐘舵�佹垚鍔燂紝鍏卞鐞� " + locNos.size() + " 涓簱浣�");
+ } catch (Exception e) {
+ return R.error("娓呴櫎鐩樼偣鐘舵�佸け璐ワ細" + e.getMessage());
+ }
+ }
}
--
Gitblit v1.9.1