From b885f63a2990ece741fc6db5c55aeeae673062b3 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 24 十月 2023 17:22:31 +0800
Subject: [PATCH] 输送线到AGV流程

---
 src/main/java/com/zy/asrs/utils/Utils.java |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 49274c9..aec9f69 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -387,7 +387,7 @@
     }
 
     public static void wapperSetCondition(Wrapper wrapper, String column, String condition){
-        if(Cools.isEmpty(condition)){
+        if(Cools.isEmpty(condition) || "null".equals(condition)){
             wrapper.andNew().eq(column,"").or().isNull(column);
         }else {
             wrapper.eq(column,condition);
@@ -400,4 +400,11 @@
         wapperSetCondition(wrapper,"isoseq",isoseq);
     }
 
+    public static void confirmOnlyMat(Wrapper wrapper, String matnr, String batch, String threeCode, String deadTime){
+        wapperSetCondition(wrapper,"matnr",matnr);
+        wapperSetCondition(wrapper,"three_code",threeCode);
+        wapperSetCondition(wrapper,"dead_time",deadTime);
+        wapperSetCondition(wrapper,"batch",batch);
+    }
+
 }

--
Gitblit v1.9.1