From 1500287f94b6e8422193b31f4b0df5b18a5624ef Mon Sep 17 00:00:00 2001
From: lihao <3139678155@qq.com>
Date: Thu, 26 Dec 2024 15:16:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=87=BA=E5=BA=93=E5=8D=95?=
 =?UTF-8?q?=E6=8B=89=E5=8D=95=E5=A4=87=E6=96=99=E8=AE=A1=E5=88=92=E6=97=B6?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pu/src/private/nc/bs/pu/m422x/query/QueryFor4455BP1.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pu/src/private/nc/bs/pu/m422x/query/QueryFor4455BP1.java b/pu/src/private/nc/bs/pu/m422x/query/QueryFor4455BP1.java
index 25cea79..9679610 100644
--- a/pu/src/private/nc/bs/pu/m422x/query/QueryFor4455BP1.java
+++ b/pu/src/private/nc/bs/pu/m422x/query/QueryFor4455BP1.java
@@ -29,12 +29,14 @@ public class QueryFor4455BP1 extends Abstract422XRefQueryBP1 {
         wholeSql.append(" (");
         wholeSql.append(" SELECT cpickmid");
         wholeSql.append(this.psor.getFinalFromWhere());
-        // wholeSql.append(" AND fbillstatus = 1"); 查询审核通过 todo
+        // 查询审核通过
+        wholeSql.append(" AND fbillstatus = 1");
         wholeSql.append(" AND APPROVERTIME > '2024-11-01'");
         // NCCForUAPLogger.debug("finalFromWhere = " + this.psor.getFinalFromWhere());
         wholeSql.append(" ) a");
-        wholeSql.append(" INNER JOIN mm_pickm_b b ON b.cpickmid = a.cpickmid AND b.dr = 0");
-        // 出库数量>0 todo
+        wholeSql.append(" INNER JOIN mm_pickm_b b ON b.cpickmid = a.cpickmid AND b.dr = 0 ");
+        // 出库数量>0
+        wholeSql.append(" AND ( COALESCE(b.nplanoutastnum, 0) - COALESCE(b.nshouldastnum, 0) - COALESCE(b.npscastnum, 0) - COALESCE(b.naccoutastnum, 0) ) >0 ");
         NCCForUAPLogger.debug("wholeSql = " + wholeSql);
         return wholeSql;
     }