diff --git a/uapbd/src/private/nc/impl/bd/material/baseinfo/MaterialStockAsstsChangedListener.java b/uapbd/src/private/nc/impl/bd/material/baseinfo/MaterialStockAsstsChangedListener.java
index da08128..2f0b3e3 100644
--- a/uapbd/src/private/nc/impl/bd/material/baseinfo/MaterialStockAsstsChangedListener.java
+++ b/uapbd/src/private/nc/impl/bd/material/baseinfo/MaterialStockAsstsChangedListener.java
@@ -88,38 +88,28 @@ public class MaterialStockAsstsChangedListener implements IBusinessListener {
                 "FROM " +
                 " bd_materialcost " +
                 "WHERE " +
-                " pk_org = (SELECT PK_COSTREGION FROM org_cr_stockorg WHERE pk_stockorg= ?) " +
+                " pk_org = (SELECT PK_COSTREGION FROM org_cr_stockorg WHERE pk_stockorg= ?) or pk_org in (SELECT PK_COSTREGION FROM org_cr_stockstore WHERE pk_stockorg= ?)  " +
                 " AND " +
                 " pk_material = ? ";
         SQLParameter param = new SQLParameter();
         param.addParam(pk_org);
+        param.addParam(pk_org);
         param.addParam(pk_material);
         List list =( (List) this.getBaseDAO().executeQuery(sql, param, new ColumnListProcessor()));
+        if(list.isEmpty()){
+            return;
+        }
         String pk_materialcost = list.get(0).toString();
         if(pk_materialcost == null){
             return;
         }
         //更新计价方式
-//        String update2 = "update bd_materialcostmod set marasst2 = ? where pk_materialcost = ? ";
-//        String update4 = "update bd_materialcostmod set marasst4 = ? where pk_materialcost = ? ";
         String update24 = "update bd_materialcostmod set marasst2 = ?,marasst4 = ? where pk_materialcost = ? ";
-//        if(fixlist.contains("2") && fixlist.contains("4")){
-            SQLParameter param1 = new SQLParameter();
-            param1.addParam(fixlist.get(0));
-            param1.addParam(fixlist.get(1));
-            param1.addParam(pk_materialcost);
-            this.getBaseDAO().executeUpdate(update24, param1);
-//        }else if(fixlist.contains("2")){
-//            SQLParameter param1 = new SQLParameter();
-//            param1.addParam("Y");
-//            param1.addParam(pk_materialcost);
-//            this.getBaseDAO().executeUpdate(update2, param1);
-//        }else if(fixlist.contains("4")){
-//            SQLParameter param1 = new SQLParameter();
-//            param1.addParam("Y");
-//            param1.addParam(pk_materialcost);
-//            this.getBaseDAO().executeUpdate(update4, param1);
-//        }
+        SQLParameter param1 = new SQLParameter();
+        param1.addParam(fixlist.get(0));
+        param1.addParam(fixlist.get(1));
+        param1.addParam(pk_materialcost);
+        this.getBaseDAO().executeUpdate(update24, param1);
 
     }
 
@@ -136,6 +126,9 @@ public class MaterialStockAsstsChangedListener implements IBusinessListener {
         param.addParam(pk_org);
         param.addParam(pk_material);
         List list =( (List) this.getBaseDAO().executeQuery(sql, param, new ColumnListProcessor()));
+        if(list.isEmpty()){
+            return;
+        }
         String pk_materialcost = list.get(0).toString();
         if(pk_materialcost == null){
             return;
@@ -164,6 +157,9 @@ public class MaterialStockAsstsChangedListener implements IBusinessListener {
         param.addParam(pk_org);
         param.addParam(pk_material);
         List list =( (List) this.getBaseDAO().executeQuery(sql, param, new ColumnListProcessor()));
+        if(list.isEmpty()){
+            return;
+        }
         String pk_materialcost = list.get(0).toString();
         if(pk_materialcost == null){
             return;