From ed040e5c9fe3e6291f02d05640c445ff3720cc48 Mon Sep 17 00:00:00 2001
From: lihao <Lglh@10086>
Date: Thu, 25 Sep 2025 08:59:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=B7=E8=B4=AD=E5=A2=9E=E5=8A=A0=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pickm/action/PickmToBuyingreqAction.java  | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 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 32dd3311..b5830e50 100644
--- a/mmpac/src/client/nccloud/web/mmpac/pickm/action/PickmToBuyingreqAction.java
+++ b/mmpac/src/client/nccloud/web/mmpac/pickm/action/PickmToBuyingreqAction.java
@@ -99,18 +99,19 @@ public class PickmToBuyingreqAction implements ICommonAction {
 
             IPraybillMaintain maintain= ServiceLocator.find(IPraybillMaintain.class);
             PraybillVO[] insertVos = maintain.insert(prayVOs);
-            IPraybillApprove approve= ServiceLocator.find(IPraybillApprove.class);
-            Object res= PfServiceScmUtil.processBatch("APPROVE", "20", insertVos, null, null);
-
-            Map<String, Object> returnMap = new HashMap<>();
-            returnMap.put("data", res);
-            returnMap.put("success", true);
             if(!pk.isEmpty()){
                 updetaPmo(pk);
             }
             if(!updateList.isEmpty()){
                 updetaPmoNum(updateList);
             }
+            IPraybillApprove approve= ServiceLocator.find(IPraybillApprove.class);
+            Object res= PfServiceScmUtil.processBatch("APPROVE", "20", insertVos, null, null);
+
+            Map<String, Object> returnMap = new HashMap<>();
+            returnMap.put("data", res);
+            returnMap.put("success", true);
+
             return returnMap;
         } catch (BusinessException e) {
             try {
@@ -229,6 +230,13 @@ public class PickmToBuyingreqAction implements ICommonAction {
                         continue;
                     }
 
+                    String mrlstocksql = " select def18 from bd_materialstock  where pk_material='" + child.getCbmaterialvid() + "'   and pk_org='"+child.getPk_org()+"' and dr=0";
+
+                    String def18 = (String) dao.executeQuery(mrlstocksql, new ColumnProcessor());
+                    if(null != def18 && def18.equals("Y") ){
+                        continue;
+                    }
+
 
                     // 物料类型过滤逻辑：仅当不是来自cpickmbids时才执行过滤
                     String materalType = child.getVbdef14();