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 71ee6ac..da08128 100644
--- a/uapbd/src/private/nc/impl/bd/material/baseinfo/MaterialStockAsstsChangedListener.java
+++ b/uapbd/src/private/nc/impl/bd/material/baseinfo/MaterialStockAsstsChangedListener.java
@@ -42,23 +42,24 @@ public class MaterialStockAsstsChangedListener implements IBusinessListener {
             List<String> fixlist=new ArrayList();
 
 
-
-            if(fixasst2.booleanValue()){
-                fixlist.add("2");
-            }
-            if(fixasst4.booleanValue()){
-                fixlist.add("4");
-            }
-            if(fixlist.isEmpty()){
-                return;
-            }else{
+            fixlist.add(fixasst2.toString());
+            fixlist.add(fixasst4.toString());
+//            if(fixasst2.booleanValue()){
+//                fixlist.add("Y");
+//            }
+//            if(fixasst4.booleanValue()){
+//                fixlist.add("Y");
+//            }
+//            if(fixlist.isEmpty()){
+//                return;
+//            }else{
                 //成本
                 this.updateMaterialCostUpdateAssts(fixlist,newVO.getPk_org(), pk_material);
                 //生产信息
                 this.updateMaterialProdAssts(fixlist,newVO.getPk_org(), pk_material);
                 //更新计划信息
                 this.updateMaterialPlanAssts(fixlist,newVO.getPk_org(), pk_material);
-            }
+//            }
 
         }
 
@@ -99,26 +100,26 @@ public class MaterialStockAsstsChangedListener implements IBusinessListener {
             return;
         }
         //更新计价方式
-        String update2 = "update bd_materialcostmod set marasst2 = ? where pk_materialcost = ? ";
-        String update4 = "update bd_materialcostmod set marasst4 = ? where pk_materialcost = ? ";
+//        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")){
+//        if(fixlist.contains("2") && fixlist.contains("4")){
             SQLParameter param1 = new SQLParameter();
-            param1.addParam("Y");
-            param1.addParam("Y");
+            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);
-        }
+//        }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);
+//        }
 
     }
 
@@ -143,23 +144,11 @@ public class MaterialStockAsstsChangedListener implements IBusinessListener {
         String update2 = "update bd_materialprod set costvalutasst2 = ? where pk_materialprod = ? ";
         String update4 = "update bd_materialprod set costvalutasst4 = ? where pk_materialprod = ? ";
         String update24 = "update bd_materialprod set costvalutasst2 = ?,costvalutasst4 = ? where pk_materialprod = ? ";
-        if(fixlist.contains("2") && fixlist.contains("4")){
-            SQLParameter param1 = new SQLParameter();
-            param1.addParam("Y");
-            param1.addParam("Y");
-            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);
 
     }
     private void updateMaterialPlanAssts(List<String> fixlist,String pk_org, String pk_material) throws DAOException {
@@ -183,23 +172,11 @@ public class MaterialStockAsstsChangedListener implements IBusinessListener {
         String update2 = "update bd_materialplan set marasst2 = ? where pk_materialplan = ? ";
         String update4 = "update bd_materialplan set marasst4 = ? where pk_materialplan = ? ";
         String update24 = "update bd_materialplan set marasst2 = ?,marasst4 = ? where pk_materialplan = ? ";
-        if(fixlist.contains("2") && fixlist.contains("4")){
-            SQLParameter param1 = new SQLParameter();
-            param1.addParam("Y");
-            param1.addParam("Y");
-            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);
 
     }
 }