From f6513ffa7e2efe2a4dc81626c7aab9cf643f8f41 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期四, 14 三月 2024 10:14:28 +0800
Subject: [PATCH] 1.增加牌号作为唯一物料条件 (当前牌号 批号 包号可以筛选出唯一物料) 2.增加移库接口 3.订单出库可替换物料 4.页面ui完善

---
 src/main/java/com/zy/asrs/controller/TagController.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/TagController.java b/src/main/java/com/zy/asrs/controller/TagController.java
index 8fd2db1..c5e92f0 100644
--- a/src/main/java/com/zy/asrs/controller/TagController.java
+++ b/src/main/java/com/zy/asrs/controller/TagController.java
@@ -35,7 +35,9 @@
                      @RequestParam(defaultValue = "10")Integer limit,
                      @RequestParam(required = false)Long parentId){
         EntityWrapper<Tag> wrapper = new EntityWrapper<>();
-        wrapper.eq("parent_id", parentId==null?getOriginTag().getId():parentId);
+        if(!Cools.isEmpty(parentId)) {
+            wrapper.eq("parent_id", parentId == null ? getOriginTag().getId() : parentId);
+        }
         wrapper.orderBy("sort");
         List<Tag> tags = tagService.selectList(wrapper);
         return R.ok().add(tags);

--
Gitblit v1.9.1