From f9c9cbff0f45343c3e53aef461e44443f0578717 Mon Sep 17 00:00:00 2001
From: mzr <mengzhaorui@qq.com>
Date: Tue, 5 Aug 2025 18:13:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=87=E6=96=99=E8=AE=A1=E5=88=92-=E5=80=9F?=
 =?UTF-8?q?=E6=96=99=E5=85=A5=E5=BA=93=E5=BC=B9=E7=AA=97-=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pickm/query/PickmByIdsQueryAction.java    | 56 +++++++++++++++++++
 .../mmpac/pickm/query/PickmItemsQuery.java    |  2 +-
 .../config/authorize/mmpac_authorize.xml      |  2 +-
 .../mmpac/pickm/config/action/pickm_query.xml |  7 ++-
 4 files changed, 64 insertions(+), 3 deletions(-)
 create mode 100644 mmpac/src/client/nccloud/web/mmpac/pickm/query/PickmByIdsQueryAction.java

diff --git a/mmpac/src/client/nccloud/web/mmpac/pickm/query/PickmByIdsQueryAction.java b/mmpac/src/client/nccloud/web/mmpac/pickm/query/PickmByIdsQueryAction.java
new file mode 100644
index 0000000..194edc1
--- /dev/null
+++ b/mmpac/src/client/nccloud/web/mmpac/pickm/query/PickmByIdsQueryAction.java
@@ -0,0 +1,56 @@
+package nccloud.web.mmpac.pickm.query;
+
+import nc.itf.mmpac.pickm.IPickmQueryService;
+import nc.util.mmf.framework.base.MMValueCheck;
+import nc.vo.ml.NCLangRes4VoTransl;
+import nc.vo.mmpac.pickm.entity.AggPickmVO;
+import nc.vo.mmpac.pickm.entity.PickmItemVO;
+import nc.vo.mmpac.pickm.util.PickmSortUtil;
+import nccloud.dto.mmpac.pickm.pub.entity.PickmQueryInfoDTO;
+import nccloud.framework.core.exception.ExceptionUtils;
+import nccloud.framework.core.json.IJson;
+import nccloud.framework.service.ServiceLocator;
+import nccloud.framework.web.action.itf.ICommonAction;
+import nccloud.framework.web.container.IRequest;
+import nccloud.framework.web.json.JsonFactory;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 备料计划-借料入库弹窗-列表查询
+ *
+ * @author mzr
+ * @date 2025/7/8
+ */
+public class PickmByIdsQueryAction implements ICommonAction {
+    public Object doAction(IRequest request) {
+        String read = request.read();
+        IJson json = JsonFactory.create();
+        PickmQueryInfoDTO query = json.fromJson(read, PickmQueryInfoDTO.class);
+        try {
+            String[] pks = query.getPks();
+            IPickmQueryService service = ServiceLocator.find(IPickmQueryService.class);
+            AggPickmVO[] vos = service.queryBillsByPks(pks);
+            if (null == vos || vos.length == 0) {
+                ExceptionUtils.wrapBusinessException(NCLangRes4VoTransl.getNCLangRes().getStrByID("5008100_0", "05008100-0005"));
+            }
+            for (AggPickmVO vo : vos) {
+                PickmItemVO[] childrenVO = (PickmItemVO[]) vo.getChildrenVO();
+                if (MMValueCheck.isNotEmpty(childrenVO)) {
+                    vo.setChildrenVO(PickmSortUtil.sortItemsByRowNo(childrenVO));
+                }
+            }
+            Map<String, Object> returnMap = new HashMap<>();
+            returnMap.put("data", vos);
+            returnMap.put("success", true);
+            return returnMap;
+        } catch (Exception ex) {
+            ExceptionUtils.wrapBusinessException(ex.getMessage());
+            Map<String, Object> returnMap = new HashMap<>();
+            returnMap.put("data", null);
+            returnMap.put("success", false);
+            return returnMap;
+        }
+    }
+}
diff --git a/mmpac/src/client/nccloud/web/mmpac/pickm/query/PickmItemsQuery.java b/mmpac/src/client/nccloud/web/mmpac/pickm/query/PickmItemsQuery.java
index 902238b..5704ce9 100644
--- a/mmpac/src/client/nccloud/web/mmpac/pickm/query/PickmItemsQuery.java
+++ b/mmpac/src/client/nccloud/web/mmpac/pickm/query/PickmItemsQuery.java
@@ -16,7 +16,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * 备料计划-借料入库弹窗查询
+ * 备料计划-借料入库弹窗-数据校验
  *
  * @author mzr
  * @date 2025/7/8
diff --git a/mmpac/src/client/yyconfig/modules/mmpac/config/authorize/mmpac_authorize.xml b/mmpac/src/client/yyconfig/modules/mmpac/config/authorize/mmpac_authorize.xml
index bc7d69f..991f4bf 100644
--- a/mmpac/src/client/yyconfig/modules/mmpac/config/authorize/mmpac_authorize.xml
+++ b/mmpac/src/client/yyconfig/modules/mmpac/config/authorize/mmpac_authorize.xml
@@ -258,10 +258,10 @@
 			<action>mmpac.pickm.queryByCond</action>
 			<action>mmpac.pickm.pushrzmes</action>
 			<action>mmpac.pickm.convertOtherIn</action>
-
 			<action>mmpac.pickm.buyingreq</action>
 			<action>mmpac.pickm.pom</action>
 			<action>mmpac.pickm.pickmItemsQuery</action>
+			<action>mmpac.pickm.pickmByIdsQuery</action>
 		</actions>
 	</authorize>
 	<authorize><!-- 娴佺▼鐢熶骇鎶ュ憡 -->
diff --git a/mmpac/src/client/yyconfig/modules/mmpac/pickm/config/action/pickm_query.xml b/mmpac/src/client/yyconfig/modules/mmpac/pickm/config/action/pickm_query.xml
index 1d3ce4d..884cf7e 100644
--- a/mmpac/src/client/yyconfig/modules/mmpac/pickm/config/action/pickm_query.xml
+++ b/mmpac/src/client/yyconfig/modules/mmpac/pickm/config/action/pickm_query.xml
@@ -68,7 +68,12 @@
   </action>
   <action>
     <name>mmpac.pickm.pickmItemsQuery</name>
-    <label>澶囨枡璁″垝-鍊熸枡鍏ュ簱寮圭獥鏌ヨ</label>
+    <label>澶囨枡璁″垝-鍊熸枡鍏ュ簱寮圭獥-鏁版嵁鏍￠獙</label>
     <clazz>nccloud.web.mmpac.pickm.query.PickmItemsQuery</clazz>
   </action>
+  <action>
+    <name>mmpac.pickm.pickmByIdsQuery</name>
+    <label>澶囨枡璁″垝-鍊熸枡鍏ュ簱寮圭獥-鍒楄〃鏌ヨ</label>
+    <clazz>nccloud.web.mmpac.pickm.query.PickmByIdsQueryAction</clazz>
+  </action>
 </actions>
\ No newline at end of file