diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FormulaServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FormulaServiceImpl.java
index 5be7d6ff..18529b8d 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FormulaServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FormulaServiceImpl.java
@@ -799,20 +799,20 @@ public class FormulaServiceImpl implements FormulaService {
         JSONObject jsonQM06 = paraTab.query("material_id = '" + material_id + "' and para_code = 'QM006'").uniqueResult(0);
         if (ObjectUtil.isNotEmpty(jsonQM13)) oneMap.put("number_1", jsonQM13.getString("value"));
         if (ObjectUtil.isNotEmpty(jsonQM14)) {
-//            String number_2 = NumberUtil.mul(masterbucket_qty, NumberUtil.div(jsonQM14.getString("value"), "100").toString()).toString();
-//            oneMap.put("number_2", NumberUtil.round(number_2, 2).toString());
-            oneMap.put("number_2", jsonQM14.getString("value")); // 待删除
+            String number_2 = NumberUtil.mul(masterbucket_qty, NumberUtil.div(jsonQM14.getString("value"), "100").toString()).toString();
+            oneMap.put("number_2", NumberUtil.round(number_2, 2).toString());
+//            oneMap.put("number_2", jsonQM14.getString("value")); // 待删除
         }
 
-//        if (ObjectUtil.isNotEmpty(jsonQM04)) oneMap.put("pre_time", jsonQM04.getString("value"));
-//        if (ObjectUtil.isNotEmpty(jsonQM06)) {
-//            String pre_fas = NumberUtil.mul(masterbucket_qty, NumberUtil.div(jsonQM06.getString("value"), "100").toString()).toString();
-//            oneMap.put("pre_fas", NumberUtil.round(pre_fas, 2).toString());
-//
-//            String put_fas = NumberUtil.mul(jsonMst.getDoubleValue("masterbucket_qty"), NumberUtil.div(jsonQM06.getString("value"), "100")).toString();
-//            oneMap.put("put_fas", NumberUtil.round(put_fas, 2).toString());
-//
-//        }
+        if (ObjectUtil.isNotEmpty(jsonQM04)) oneMap.put("pre_time", jsonQM04.getString("value"));
+        if (ObjectUtil.isNotEmpty(jsonQM06)) {
+            String pre_fas = NumberUtil.mul(masterbucket_qty, NumberUtil.div(jsonQM06.getString("value"), "100").toString()).toString();
+            oneMap.put("pre_fas", NumberUtil.round(pre_fas, 2).toString());
+
+            String put_fas = NumberUtil.mul(jsonMst.getDoubleValue("masterbucket_qty"), NumberUtil.div(jsonQM06.getString("value"), "100")).toString();
+            oneMap.put("put_fas", NumberUtil.round(put_fas, 2).toString());
+
+        }
         if (ObjectUtil.isNotEmpty(jsonPW02)) {
             oneMap.put("number_8", jsonPW02.getString("value"));
         }