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/common/web/BaseController.java |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/common/web/BaseController.java b/src/main/java/com/zy/common/web/BaseController.java
index 995c3d9..4123819 100644
--- a/src/main/java/com/zy/common/web/BaseController.java
+++ b/src/main/java/com/zy/common/web/BaseController.java
@@ -16,6 +16,7 @@
 import com.zy.system.service.UserLoginService;
 import com.zy.system.service.UserService;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import javax.servlet.http.HttpServletRequest;
@@ -26,6 +27,7 @@
 /**
  * Created by vincent on 2019-09-09
  */
+@Slf4j
 public class BaseController extends AbstractBaseController {
 
     protected static final String RANGE_TIME_LINK = " - ";
@@ -169,6 +171,9 @@
                 column = field.getName();
             }
             if (!set.contains(column)) {
+                if(Cools.eq(column,"pakinTime")){
+                    continue;
+                }
                 columns.add(column);
             }
         }

--
Gitblit v1.9.1