From 641f7bb8b2d2e23f1f5192fecf030a567151c7b5 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 15 七月 2025 17:50:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ghjtasrs' into ghjtasrs
---
src/main/java/com/zy/asrs/controller/LocMastController.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index e343c2b..b68e7ee 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -101,6 +101,8 @@
}
// 鏈夌墿鏂欐椂淇敼涓虹┖搴撲綅鎴栬�呯┖鏉垮簱浣嶏紝鍒欏垹闄ゅ簱瀛樻槑缁�
if (oldLocMast.getLocSts().equals("R") || oldLocMast.getLocSts().equals("F")) {
+ // 娓呯┖搴撲綅鏉＄爜
+ locMast.setBarcode("");
if (locMast.getLocSts().equals("O") || locMast.getLocSts().equals("D")) {
locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));
}
@@ -199,9 +201,9 @@
}
}
}
- locMastService.delete(new EntityWrapper<>());
- locDetlService.delete(new EntityWrapper<>());
- locMastService.insertBatch(list);
+// locMastService.delete(new EntityWrapper<>());
+// locDetlService.delete(new EntityWrapper<>());
+// locMastService.insertBatch(list);
return R.ok("鍒濆鍖栨垚鍔�");
}
}
--
Gitblit v1.9.1