diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/AutoformulaServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/AutoformulaServiceImpl.java
index c1535e8b..0ce13972 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/AutoformulaServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/AutoformulaServiceImpl.java
@@ -696,8 +696,8 @@ public class AutoformulaServiceImpl implements AutoformulaService {
                     JSONObject FactoryWarranty = bomdlts_plan_map.get(bomdlt_Cr3C2.getString("stockrecord_id"));
                     //该批次含碳比
                     double X22 = FactoryWarranty.getDouble("is_tan");
-                    //解得碳粉重量 X22p减=[产品碳平衡*(X22p+Z已总)-Z已总- (X22p)* X22碳含量]/(1- X22碳含量)
-                    double X22_jian = ((c_balance/100.0)*(CT1_weight+Z_sum.get())-(CT1+Z_sum.get()))/(1-X22/100.0);
+                    //X22p减=[产品碳平衡*(X11p+X12p+X21p+X22p+软废碳化钨)-(X11p* X11碳含量+X12p* X12碳含量+X21p* X21碳含量+X22p* X22碳含量+软废含碳量)]/(1-X22碳含量)
+                    double X22_jian = ((c_balance/100.0)*(CT1_weight)-CT1)/(1-X22/100.0);
                     //更新碳化钨配粉重量
                     double bom_ivt_qty = X22p-X22_jian;
                     if(bom_ivt_qty < 0){
@@ -821,8 +821,8 @@ public class AutoformulaServiceImpl implements AutoformulaService {
                     boolean flag = true;
                     //设X21p减=0，解方程
                     if(flag){
-                        // X22p减=[产品碳平衡*(X11p+X12p+X21p+X22p+Z已总) - (X11p* X11碳含量+X12p* X12碳含量+(X21)* X21碳含量+(X22p)* X22碳含量+Z已总)]/(1-X22碳含量)
-                        double X22_jian = ((c_balance/100.0)*(CT1_weight+Z_sum.get())-(CT1+Z_sum.get()))/(1-X22/100.0);
+                        //X22p减=[产品碳平衡*(X11p+X12p+X21p+X22p+软废碳化钨)-(X11p* X11碳含量+X12p* X12碳含量+X21p* X21碳含量+X22p* X22碳含量+软废含碳量)]/(1-X22碳含量)
+                        double X22_jian = ((c_balance/100.0)*(CT1_weight)-CT1)/(1-X22/100.0);
                         //更新碳化钨配粉重量
                         double bom_ivt_qty = X22p-X22_jian;
                         if(bom_ivt_qty<0){
@@ -908,7 +908,7 @@ public class AutoformulaServiceImpl implements AutoformulaService {
                     if(!flag){
                         //设X22p减=X22p，解方程
                         // X21p减=[产品碳平衡*(X11p+X12p+X21p+X22p+Z已总) - (X11p* X11碳含量+X12p* X12碳含量+(X21p)* X21碳含量+Z已总+X22p)]/(1-X21碳含量)
-                        double X21_jian = ((c_balance/100.0)*(CT1_weight+Z_sum.get()) - (CT1-X22c) - X22p-Z_sum.get())/(1-X21/100.0);
+                        double X21_jian = ((c_balance/100.0)*(CT1_weight) - (CT1-X22c) - X22p)/(1-X21/100.0);
 
                         //解得钨粉重量
                         double C = X22p + X21_jian + Z_sum.get();
@@ -1784,8 +1784,8 @@ public class AutoformulaServiceImpl implements AutoformulaService {
                                 Z_sum.set(Z_sum.get() + finished);
                             }
                         });
-                        //解得碳粉重量 X22p减=[产品碳平衡*(X22p+Z已总)-Z已总- (X22p)* X22碳含量]/(1- X22碳含量)
-                        double X22_jian = ((c_balance/100.0)*(CT1_weight+Z_sum.get())-(CT1+Z_sum.get()))/(1-X22/100.0);
+                        //X22p减=[产品碳平衡*(X11p+X12p+X21p+X22p+软废碳化钨)-(X11p* X11碳含量+X12p* X12碳含量+X21p* X21碳含量+X22p* X22碳含量+软废含碳量)]/(1-X22碳含量)
+                        double X22_jian = ((c_balance/100.0)*(CT1_weight)-CT1)/(1-X22/100.0);
                         //更新碳化钨配粉重量
                         double bom_ivt_qty = X22p-X22_jian;
                         if(bom_ivt_qty < 0){
@@ -1909,8 +1909,8 @@ public class AutoformulaServiceImpl implements AutoformulaService {
                         boolean flag = true;
                         //设X21p减=0，解方程
                         if(flag){
-                            // X22p减=[产品碳平衡*(X11p+X12p+X21p+X22p+Z已总) - (X11p* X11碳含量+X12p* X12碳含量+(X21)* X21碳含量+(X22p)* X22碳含量+Z已总)]/(1-X22碳含量)
-                            double X22_jian = ((c_balance/100.0)*(CT1_weight+Z_sum.get())-(CT1+Z_sum.get()))/(1-X22/100.0);
+                            //X22p减=[产品碳平衡*(X11p+X12p+X21p+X22p+软废碳化钨)-(X11p* X11碳含量+X12p* X12碳含量+X21p* X21碳含量+X22p* X22碳含量+软废含碳量)]/(1-X22碳含量)
+                            double X22_jian = ((c_balance/100.0)*(CT1_weight)-CT1)/(1-X22/100.0);
                             //更新碳化钨配粉重量
                             double bom_ivt_qty = X22p-X22_jian;
                             if(bom_ivt_qty<0){
@@ -1996,8 +1996,7 @@ public class AutoformulaServiceImpl implements AutoformulaService {
                         if(!flag){
                             //设X22p减=X22p，解方程
                             // X21p减=[产品碳平衡*(X11p+X12p+X21p+X22p+Z已总) - (X11p* X11碳含量+X12p* X12碳含量+(X21p)* X21碳含量+Z已总+X22p)]/(1-X21碳含量)
-                            double X21_jian = ((c_balance/100.0)*(CT1_weight+Z_sum.get()) - (CT1-X22c) - X22p-Z_sum.get())/(1-X21/100.0);
-
+                            double X21_jian = ((c_balance/100.0)*(CT1_weight) - (CT1-X22c) - X22p)/(1-X21/100.0);
                             //解得钨粉重量
                             double C = X22p + X21_jian + Z_sum.get();
                             if(C<0){
diff --git a/mes/qd/src/views/wms/basedata/em/equipmentfile/AddDialog.vue b/mes/qd/src/views/wms/basedata/em/equipmentfile/AddDialog.vue
index bb0f4bec..ecfe5d26 100644
--- a/mes/qd/src/views/wms/basedata/em/equipmentfile/AddDialog.vue
+++ b/mes/qd/src/views/wms/basedata/em/equipmentfile/AddDialog.vue
@@ -327,9 +327,6 @@ export default {
         use_deptid: [
           { required: true, message: '使用部门不能为空', trigger: 'blur' }
         ],
-        device_bom_id: [
-          { required: true, message: '设备Bom不能为空', trigger: 'blur' }
-        ],
         is_produceuse: [
           { required: true, message: '生产用途不能为空', trigger: 'blur' }
         ]