From 71a4caed3841c92ee79f4e3190132d89f8ba3699 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 29 三月 2022 15:54:31 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index 71c0a9a..2db13f5 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -1,6 +1,8 @@
 package com.zy.asrs.task.handler;
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.core.common.Cools;
 import com.zy.asrs.entity.*;
 import com.zy.asrs.service.*;
 import com.zy.asrs.task.AbstractHandler;
@@ -101,15 +103,19 @@
 
                         // 鏇存柊鍏ュ簱閫氱煡妗� ioStatus ===>> Y
                         try {
+                            Wrapper<WaitPakin> wrapper = new EntityWrapper<WaitPakin>()
+                                    .eq("zpallet", wrkDetl.getZpallet())
+                                    .eq("matnr", wrkDetl.getMatnr())
+                                    .eq("anfme", wrkDetl.getAnfme());
+                            if (Cools.isEmpty(wrkDetl.getBatch())) {
+                                wrapper.eq("batch", wrkDetl.getBatch());
+                            } else {
+                                wrapper.isNull("batch").or().eq("batch", "");
+                            }
                             WaitPakin setParam = new WaitPakin();
                             setParam.setIoStatus("Y");
                             setParam.setModiTime(now);
-                            waitPakinService.update(setParam, new EntityWrapper<WaitPakin>()
-                                            .eq("zpallet", wrkDetl.getZpallet())
-                                            .eq("matnr", wrkDetl.getMatnr())
-                                            .eq("anfme", wrkDetl.getAnfme())
-                                            .eq("batch", wrkDetl.getBatch())
-                            );
+                            waitPakinService.update(setParam, wrapper);
                         } catch (Exception ignore){}
 
                     }

--
Gitblit v1.9.1