From efc51c7e9bc314757bf6fb6bfbc2079cd63ebe93 Mon Sep 17 00:00:00 2001
From: lihao <Lglh@10086>
Date: Wed, 17 Sep 2025 10:50:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=9E=E7=8E=B0=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E8=A1=8C=E6=8E=A8=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pickm/action/PickmToBuyingreqAction.java  |  6 ++-
 .../web/mmpac/pickm/action/PickmToPmo.java    | 46 +++++++++++++------
 2 files changed, 37 insertions(+), 15 deletions(-)

diff --git a/mmpac/src/client/nccloud/web/mmpac/pickm/action/PickmToBuyingreqAction.java b/mmpac/src/client/nccloud/web/mmpac/pickm/action/PickmToBuyingreqAction.java
index a65e427..a88974d 100644
--- a/mmpac/src/client/nccloud/web/mmpac/pickm/action/PickmToBuyingreqAction.java
+++ b/mmpac/src/client/nccloud/web/mmpac/pickm/action/PickmToBuyingreqAction.java
@@ -53,13 +53,15 @@ public class PickmToBuyingreqAction implements ICommonAction {
             PickmQueryInfoDTO paramDTO = json.fromJson(read, PickmQueryInfoDTO.class);
             // 获取主键
             String[] cpickmids = paramDTO.getCpickmids();
-//            String[] cpickmbids = paramDTO.getCpickmbids();
+            String[] cpickmbids = paramDTO.getCpickmbids();
 //            if (MMValueCheck.isEmpty(cpickmids) && (null == cpickmbids || cpickmbids.length == 0)) {
 //                return null;
 //            }
             AggPickmVO[] aggVOs = null;
             IPickmQueryService service = ServiceLocator.find(IPickmQueryService.class);
-            if (MMValueCheck.isNotEmpty(cpickmids)) {
+            if (MMValueCheck.isNotEmpty(cpickmbids)) {
+                aggVOs = service.queryAggPickmVObyBid(cpickmbids);
+            } else if (MMValueCheck.isNotEmpty(cpickmids)) {
                 aggVOs = service.queryBillsByPks(cpickmids);
             }
             if (MMValueCheck.isEmpty(aggVOs)) {
diff --git a/mmpac/src/client/nccloud/web/mmpac/pickm/action/PickmToPmo.java b/mmpac/src/client/nccloud/web/mmpac/pickm/action/PickmToPmo.java
index 6f127f6..448e1b0 100644
--- a/mmpac/src/client/nccloud/web/mmpac/pickm/action/PickmToPmo.java
+++ b/mmpac/src/client/nccloud/web/mmpac/pickm/action/PickmToPmo.java
@@ -47,13 +47,15 @@ public class PickmToPmo implements ICommonAction {
             PickmQueryInfoDTO paramDTO = json.fromJson(read, PickmQueryInfoDTO.class);
             // 获取主键
             String[] cpickmids = paramDTO.getCpickmids();
-//            String[] cpickmbids = paramDTO.getCpickmbids();
+            String[] cpickmbids = paramDTO.getCpickmbids();
 //            if (MMValueCheck.isEmpty(cpickmids) && (null == cpickmbids || cpickmbids.length == 0)) {
 //                return null;
 //            }
             AggPickmVO[] aggVOs = null;
             IPickmQueryService service = ServiceLocator.find(IPickmQueryService.class);
-            if (MMValueCheck.isNotEmpty(cpickmids)) {
+            if (MMValueCheck.isNotEmpty(cpickmbids)) {
+                aggVOs = service.queryAggPickmVObyBid(cpickmbids);
+            } else if (MMValueCheck.isNotEmpty(cpickmids)) {
                 aggVOs = service.queryBillsByPks(cpickmids);
             }
             if (MMValueCheck.isEmpty(aggVOs)) {
@@ -169,21 +171,39 @@ public class PickmToPmo implements ICommonAction {
             for (PMOItemVO itemVO: inVO.getChildrenVO()){
 //                 itemVO.setTplanendtime();
                 for(AggPickmVO aggPickmVO:sourceBillVOs){
-                    if(itemVO.getVsrcid().equals(aggPickmVO.getParentVO().getCpickmid())){
-                        String[] ids = new String[1];
-                        ids[0] = aggPickmVO.getParentVO().getVfirstmoid();
+//                    if(itemVO.getVsrcid().equals(aggPickmVO.getParentVO().getCpickmid())){
 
-                        PMOAggVO[] rvo = query.queryByPks(ids);
-                        if(null == rvo || rvo.length == 0){
-                            continue;
-                        }
-                        for (PMOItemVO ritem: rvo[0].getChildrenVO()){
-                            if(ritem.getVrowno().equals(aggPickmVO.getParentVO().getVfirstbillrowno())){
-                                itemVO.setTplanendtime(ritem.getTplanendtime());
+                        if(null!=aggPickmVO.getParentVO().getVfirstbilltype() &&aggPickmVO.getParentVO().getVfirstbilltype().equals("55A2") ){
+                            String[] ids = new String[1];
+                            ids[0] = aggPickmVO.getParentVO().getVfirstmoid();
 
+                            PMOAggVO[] rvo = query.queryByPks(ids);
+                            if(null == rvo || rvo.length == 0){
+                                continue;
+                            }
+                            for (PMOItemVO ritem: rvo[0].getChildrenVO()){
+                                if(ritem.getVrowno().equals(aggPickmVO.getParentVO().getVfirstbillrowno())){
+                                    itemVO.setTplanendtime(ritem.getTplanendtime());
+                                }
                             }
                         }
-                    }
+
+                        if(null!=aggPickmVO.getParentVO().getVsourcebilltype() &&aggPickmVO.getParentVO().getVsourcebilltype().equals("55A2") ){
+                            String[] ids = new String[1];
+                            ids[0] = aggPickmVO.getParentVO().getVsourcemoid();
+
+                            PMOAggVO[] rvo = query.queryByPks(ids);
+                            if(null == rvo || rvo.length == 0){
+                                continue;
+                            }
+                            for (PMOItemVO ritem: rvo[0].getChildrenVO()){
+                                if(ritem.getVrowno().equals(aggPickmVO.getParentVO().getVsourcebillrowno())){
+                                    itemVO.setTplanendtime(ritem.getTplanendtime());
+                                }
+                            }
+                        }
+
+//                    }
                 }
                 if(null !=itemVO.getCprojectid() && null!=itemVO.getCmaterialvid()){