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 998b8ab7..6bbb0e81 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
@@ -789,13 +789,30 @@ public class FormulaServiceImpl implements FormulaService {
                 oneMap.put("para_name", json92jj.getString("para_name"));
             }
         }
+        String masterbucket_qty = jsonMst.getString("masterbucket_qty"); // 开单重量
         JSONObject jsonQM13 = paraTab.query("material_id = '" + material_id + "' and para_code = 'QM013'").uniqueResult(0);
         JSONObject jsonQM14 = paraTab.query("material_id = '" + material_id + "' and para_code = 'QM014'").uniqueResult(0);
         JSONObject jsonPW02 = paraTab.query("material_id = '" + material_id + "' and para_code = 'PW002'").uniqueResult(0);
         JSONObject jsonPW03 = paraTab.query("material_id = '" + material_id + "' and para_code = 'PW003'").uniqueResult(0);
         JSONObject jsonPW04 = paraTab.query("material_id = '" + material_id + "' and para_code = 'PW004'").uniqueResult(0);
+        JSONObject jsonQM04 = paraTab.query("material_id = '" + material_id + "' and para_code = 'QM004'").uniqueResult(0);
+        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)) oneMap.put("number_2", jsonQM14.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());
+        }
+
+        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());
+
+            double liquid_rate = jsonMaterExt.getDoubleValue("liquid_rate");
+            String put_fas = NumberUtil.mul(jsonMst.getDoubleValue("masterbucket_qty"), liquid_rate, 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"));
         }