From 577666687fda4c3d3d72ae79a11246af779db99f Mon Sep 17 00:00:00 2001
From: mzr <1562242162@qq.com>
Date: Wed, 25 Dec 2024 11:57:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=BA=93=E7=94=B3=E8=AF=B7-=E5=A4=87?=
 =?UTF-8?q?=E6=96=99=E8=AE=A1=E5=88=92=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../action/QueryPickmFor4455Action.java       | 18 ++++-------
 .../m422x/query/Abstract422XRefQueryBP1.java  |  2 +-
 .../nc/bs/pu/m422x/query/QueryFor4455BP1.java | 30 +++++++++++--------
 3 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/ic/src/client/nccloud/web/ic/outbound/sapplybill/action/QueryPickmFor4455Action.java b/ic/src/client/nccloud/web/ic/outbound/sapplybill/action/QueryPickmFor4455Action.java
index 5ef1767..9398aa1 100644
--- a/ic/src/client/nccloud/web/ic/outbound/sapplybill/action/QueryPickmFor4455Action.java
+++ b/ic/src/client/nccloud/web/ic/outbound/sapplybill/action/QueryPickmFor4455Action.java
@@ -61,19 +61,13 @@ public class QueryPickmFor4455Action implements ICommonAction {
             return null;
         }
         // VO与UI数据格式转换 卡片列表：BillGridOperator
-        BillGrid[] grids = new BillGrid[0];
-        try {
-            BillGridOperator operator = new BillGridOperator(info.getTempletid(), info.getPageCode());
-            grids = operator.toBillGrids(vos);
-            if (grids != null) {
-                StoreReqScaleUtil util = new StoreReqScaleUtil();
-                for (BillGrid billGrid : grids) {
-                    util.processGrid(billGrid, false);
-                }
+        BillGridOperator operator = new BillGridOperator(info.getTempletid(), info.getPageCode());
+        BillGrid[] grids = operator.toBillGrids(vos);
+        if (grids != null) {
+            StoreReqScaleUtil util = new StoreReqScaleUtil();
+            for (BillGrid billGrid : grids) {
+                util.processGrid(billGrid, false);
             }
-        } catch (Exception e) {
-            e.printStackTrace();
-            throw new RuntimeException(e);
         }
         return grids;
     }
diff --git a/pu/src/private/nc/bs/pu/m422x/query/Abstract422XRefQueryBP1.java b/pu/src/private/nc/bs/pu/m422x/query/Abstract422XRefQueryBP1.java
index 429f7b8..db13bcf 100644
--- a/pu/src/private/nc/bs/pu/m422x/query/Abstract422XRefQueryBP1.java
+++ b/pu/src/private/nc/bs/pu/m422x/query/Abstract422XRefQueryBP1.java
@@ -44,7 +44,7 @@ public abstract class Abstract422XRefQueryBP1 {
 
     public PickmReqAppVO[] queryPickmReqVOs() {
         SCMDataAccessUtils utils = new SCMDataAccessUtils(10000);
-        this.psor.appendCurrentGroup();
+        // this.psor.appendCurrentGroup();
         StringBuilder sql = this.makeGetPKSql();
         String[][] pks = utils.query(sql.toString()).toTwoDimensionStringArray();
         if (null != pks && pks.length != 0) {
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 a7c07ab..ddb1fe6 100644
--- a/pu/src/private/nc/bs/pu/m422x/query/QueryFor4455BP1.java
+++ b/pu/src/private/nc/bs/pu/m422x/query/QueryFor4455BP1.java
@@ -7,10 +7,10 @@ package nc.bs.pu.m422x.query;
 
 import nc.bs.pu.m422x.plugin.StoreReqAppPluginPoint;
 import nc.bs.pu.m422x.query.rule.CanOutreqNumCalcRule;
-import nc.impl.pubapp.pattern.rule.IFilterRule;
 import nc.impl.pubapp.pattern.rule.processer.AroundProcesser;
 import nc.ui.querytemplate.querytree.IQueryScheme;
-import nc.vo.pu.m422x.entity.PickmReqAppVO;
+import nc.vo.pu.m422x.entity.StoreReqAppVO;
+import nccloud.baseapp.core.log.NCCForUAPLogger;
 import nccloud.commons.lang.ArrayUtils;
 
 public class QueryFor4455BP1 extends Abstract422XRefQueryBP1 {
@@ -18,28 +18,32 @@ public class QueryFor4455BP1 extends Abstract422XRefQueryBP1 {
         super(queryScheme);
     }
 
-    private void addRule(AroundProcesser<PickmReqAppVO> processer) {
-        processer.addAfterRule((IFilterRule<PickmReqAppVO>) new CanOutreqNumCalcRule());
+    private void addRule(AroundProcesser<StoreReqAppVO> processer) {
+        processer.addAfterRule(new CanOutreqNumCalcRule());
     }
 
     public StringBuilder makeGetPKSql() {
         StringBuilder wholeSql = new StringBuilder();
-        wholeSql.append(" SELECT DISTINCT a.cpickmid,b.cpickm_bid" +
-                " FROM" +
-                " mm_pickm a" +
-                " INNER JOIN mm_pickm_b b ON b.cpickmid = a.cpickmid" +
-                " WHERE" +
-                " a.dr = 0 AND b.dr = 0 and a.APPROVERTIME > '2024-10-01'");
+        wholeSql.append(" SELECT DISTINCT a.cpickmid,b.cpickm_bid");
+        wholeSql.append(" FROM");
+        wholeSql.append(" (");
+        wholeSql.append(" SELECT cpickmid");
+        wholeSql.append(this.psor.getFinalFromWhere());
+        wholeSql.append(" AND APPROVERTIME > '2024-10-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");
+        NCCForUAPLogger.debug("wholeSql = " + wholeSql);
         return wholeSql;
     }
 
-    protected PickmReqAppVO[] processQueryResult(PickmReqAppVO[] queryResult) {
+    protected StoreReqAppVO[] processQueryResult(StoreReqAppVO[] queryResult) {
         if (ArrayUtils.isEmpty(queryResult)) {
             return null;
         } else {
-            AroundProcesser<PickmReqAppVO> processer = new AroundProcesser(StoreReqAppPluginPoint.PULL_4455);
+            AroundProcesser<StoreReqAppVO> processer = new AroundProcesser(StoreReqAppPluginPoint.PULL_4455);
             this.addRule(processer);
-            return (PickmReqAppVO[]) processer.after(queryResult);
+            return (StoreReqAppVO[]) processer.after(queryResult);
         }
     }
 }