diff --git a/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/putBeforeCheckRule.java b/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/putBeforeCheckRule.java
index e1ce133..ba098e7 100644
--- a/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/putBeforeCheckRule.java
+++ b/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/putBeforeCheckRule.java
@@ -3,8 +3,10 @@ package nc.bs.mmpac.pmo.pac0002.bp.rule;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import nc.bs.dao.DAOException;
 import nc.bs.framework.common.NCLocator;
@@ -100,8 +102,9 @@ public class putBeforeCheckRule implements IRule<PMOAggVO> {
 
 	private Map<String, Object> getVbdef6(String vsrcbidStr) throws BusinessException {
 		IUAPQueryBS queryBS = NCLocator.getInstance().lookup(IUAPQueryBS.class);
-		String sql = " SELECT bt.pk_billtypecode,s.creationtime,b.vbdef12,d.nastnum FROM so_saleorder_b b\n"
+		String sql = " SELECT org_salesorg.CODE ,s.dbilldate, bt.pk_billtypecode,s.creationtime,b.vbdef12,d.nastnum FROM so_saleorder_b b\n"
 				+ "INNER JOIN so_saleorder s ON s.csaleorderid = b.csaleorderid\n"
+				+ " LEFT JOIN org_salesorg ON org_salesorg.PK_SALESORG = s.PK_ORG "
 				+ "left join (select mm_mo.Vsrcbid,sum(nastnum) as nastnum \n" + "from mm_mo\n" + "where mm_mo.dr=0\n"
 				+ "group by mm_mo.Vsrcbid) d on b.csaleorderbid=d.Vsrcbid\n"
 				+ "INNER JOIN bd_billtype bt on bt.pk_billtypeid=s.ctrantypeid\n" + "where b.csaleorderbid='"
@@ -127,7 +130,9 @@ public class putBeforeCheckRule implements IRule<PMOAggVO> {
 			DefdocVO[] defdocVOs = (DefdocVO[]) new HYSuperDMO().queryByWhereClause(DefdocVO.class, strWhere);
 			if (defdocVOs != null && defdocVOs.length > 0) {
 				for (DefdocVO defdocVO : defdocVOs) {
-					list.add(defdocVO.getCode());
+					if(defdocVO.getCode().equals("pmol")){
+						list= Arrays.stream(defdocVO.getMemo().split(",")).map(String::trim).collect(Collectors.toList());
+					}
 				}
 			}
 		} catch (DAOException e) {
diff --git a/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/saveBeforeCheckRule.java b/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/saveBeforeCheckRule.java
index b3de5f8..1abf4d4 100644
--- a/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/saveBeforeCheckRule.java
+++ b/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/saveBeforeCheckRule.java
@@ -17,10 +17,8 @@ import nccloud.baseapp.core.log.NCCForUAPLogger;
 
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 流程生成订单保存时验证销售订单累计排产状态，并验收首付款比例 zhangxinah 适配2312
@@ -155,7 +153,9 @@ public class saveBeforeCheckRule implements IRule<PMOAggVO> {
             DefdocVO[] defdocVOs = (DefdocVO[]) new HYSuperDMO().queryByWhereClause(DefdocVO.class, strWhere);
             if (defdocVOs != null && defdocVOs.length > 0) {
                 for (DefdocVO defdocVO : defdocVOs) {
-                    list.add(defdocVO.getCode());
+                    if(defdocVO.getCode().equals("pmol")){
+                        list= Arrays.stream(defdocVO.getMemo().split(",")).map(String::trim).collect(Collectors.toList());
+                    }
                 }
             }
         } catch (DAOException e) {