From e76a4f94f4b1cae818416d2ca80c9bb14bf8b7bd Mon Sep 17 00:00:00 2001 From: lihao Date: Sun, 21 Sep 2025 19:35:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=87=E6=96=99=E8=AE=A1=E5=88=92=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mmpac/pickm/action/PickmToBuyingreqAction.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 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 21906cb3..32dd3311 100644 --- a/mmpac/src/client/nccloud/web/mmpac/pickm/action/PickmToBuyingreqAction.java +++ b/mmpac/src/client/nccloud/web/mmpac/pickm/action/PickmToBuyingreqAction.java @@ -220,8 +220,12 @@ public class PickmToBuyingreqAction implements ICommonAction { continue; } } -// 是否转为通用件若为Y，不下达请购单 - if(null != child.getAttributeValue("vbdef29") && child.getAttributeValue("vbdef29").equals("Y") ){ + // 是否转为通用件若为Y，不下达请购单 + BaseDAO dao = new BaseDAO(); + String mrlsql = " select def29 from bd_material where pk_material='" + child.getCbmaterialvid() + "' and dr=0"; + + String isCommon = (String) dao.executeQuery(mrlsql, new ColumnProcessor()); + if(null != isCommon && isCommon.equals("Y") ){ continue; } @@ -231,7 +235,7 @@ public class PickmToBuyingreqAction implements ICommonAction { if(!isFromBid) { // 核心修改：增加isFromBid判断 if(null == materalType){ String sql = " select cmaterialvid from mm_pickm where cpickmid='" + child.getCpickmid() + "' and dr=0"; - BaseDAO dao = new BaseDAO(); + String hmateral = (String) dao.executeQuery(sql, new ColumnProcessor()); sql="SELECT bd_defdoc.code FROM bd_bom_b " + @@ -273,7 +277,6 @@ public class PickmToBuyingreqAction implements ICommonAction { } }else { String sql="SELECT bd_defdoc.code FROM bd_defdoc where bd_defdoc.pk_defdoc='" + materalType + "'"; - BaseDAO dao = new BaseDAO(); String bomcode = (String) dao.executeQuery(sql, new ColumnProcessor()); if(null == bomcode || "1".equals(bomcode) || "".equals(bomcode) ){ continue; // 制造件或未知类型过滤