From 256b910f140d4bf1272059289fabc668ae45ee75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=90=8D=E5=96=9C?= <liumingxiy@outlook.com>
Date: Thu, 28 Nov 2024 14:14:00 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=BF=BD=E7=95=A5=E6=95=B0=E9=87=8F?=
 =?UTF-8?q?=E4=B8=BA0=E7=9A=84=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ktg-mes/src/main/resources/mapper/md/AP0AEMapper.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ktg-mes/src/main/resources/mapper/md/AP0AEMapper.xml b/ktg-mes/src/main/resources/mapper/md/AP0AEMapper.xml
index 482defd..f00b958 100644
--- a/ktg-mes/src/main/resources/mapper/md/AP0AEMapper.xml
+++ b/ktg-mes/src/main/resources/mapper/md/AP0AEMapper.xml
@@ -106,7 +106,7 @@
 
     <select id="selectOutNewData" resultMap="AP0AEResult">
         <include refid="AP0AESelectAllCol"/>
-        where UDF07 != 'ED'
+        where UDF07 != 'ED' AND AE017 > 0
     </select>
 
     <update id="updateOutDataToOld">

From a1c16f0be67de27daafd2c5f9718f5b6a3fe6e7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=90=8D=E5=96=9C?= <liumingxiy@outlook.com>
Date: Thu, 28 Nov 2024 14:20:18 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=E6=8A=9B=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ktg/mes/md/controller/WmsOutTaskController.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ktg-mes/src/main/java/com/ktg/mes/md/controller/WmsOutTaskController.java b/ktg-mes/src/main/java/com/ktg/mes/md/controller/WmsOutTaskController.java
index f222c04..09caedf 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/md/controller/WmsOutTaskController.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/md/controller/WmsOutTaskController.java
@@ -63,7 +63,7 @@ public class WmsOutTaskController extends BaseController {
     }
 
     @PutMapping("/open/run/{wmsOutTaskIds}")
-    public AjaxResult openRun(@PathVariable Long[] wmsOutTaskIds) {
+    public AjaxResult openRun(@PathVariable Long[] wmsOutTaskIds) throws JAXBException {
         return toAjax(wmsOutTaskService.runWmsOutTask(wmsOutTaskIds));
     }
 

From 9ae9de272d0128ee8f800a828d735c35cdd100d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=90=8D=E5=96=9C?= <liumingxiy@outlook.com>
Date: Thu, 28 Nov 2024 14:25:34 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=BF=BD=E7=95=A5=E7=A9=BA=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ktg-mes/src/main/resources/mapper/md/AP0AEMapper.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ktg-mes/src/main/resources/mapper/md/AP0AEMapper.xml b/ktg-mes/src/main/resources/mapper/md/AP0AEMapper.xml
index f00b958..17540f0 100644
--- a/ktg-mes/src/main/resources/mapper/md/AP0AEMapper.xml
+++ b/ktg-mes/src/main/resources/mapper/md/AP0AEMapper.xml
@@ -106,7 +106,10 @@
 
     <select id="selectOutNewData" resultMap="AP0AEResult">
         <include refid="AP0AESelectAllCol"/>
-        where UDF07 != 'ED' AND AE017 > 0
+        where UDF07 != 'ED'
+        AND AE017 > 0
+        AND AE014 IS NOT NULL
+        AND AE020 IS NOT NULL
     </select>
 
     <update id="updateOutDataToOld">