From a640eacff74fcae5723e11e412159b895c4bf300 Mon Sep 17 00:00:00 2001
From: zds <2388969634@qq.com>
Date: Thu, 27 Oct 2022 19:16:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pdm/service/impl/PdmWorkTaskServiceImpl.java   | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/pda/pdm/service/impl/PdmWorkTaskServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/pda/pdm/service/impl/PdmWorkTaskServiceImpl.java
index aa3b0dbd..dc65deac 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/pda/pdm/service/impl/PdmWorkTaskServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/pda/pdm/service/impl/PdmWorkTaskServiceImpl.java
@@ -725,7 +725,7 @@ public class PdmWorkTaskServiceImpl implements PdmWorkTaskService {
         if (ObjectUtil.isEmpty(device_jo)) {
             throw new PdaRequestException("请输入配粉工位设备编码！");
         }
-        JSONObject form_jo = WQLObject.getWQLObject("PDM_BI_Formula").query("workorder_code = '" + work_task.getString("workorder_code") + "' AND bucket_type = '01'").uniqueResult(0);
+        JSONObject form_jo = WQLObject.getWQLObject("PDM_BI_Formula").query("is_delete='0' and workorder_code = '" + work_task.getString("workorder_code") + "' AND bucket_type = '01'").uniqueResult(0);
         JSONObject material_ext = WQLObject.getWQLObject("MD_ME_ProducMaterialExt").query("material_id = '" + work_order.getString("material_id") + "'").uniqueResult(0);
 
         if (StrUtil.isEmpty(work_task.getString("device_id"))) {
@@ -745,6 +745,9 @@ public class PdmWorkTaskServiceImpl implements PdmWorkTaskService {
         }
 
         JSONArray array = new JSONArray();
+
+        //预磨1酒精设定值：开单重量*工艺参数"预磨1酒精设定值（改为比例）"
+        BigDecimal QM006_qty = BigDecimal.valueOf(0);
         //调用ACS接口
         for (int i = 0; i < work_para.size(); i++) {
             JSONObject row = work_para.getJSONObject(i);
@@ -763,6 +766,7 @@ public class PdmWorkTaskServiceImpl implements PdmWorkTaskService {
             //预磨1酒精设定值：开单重量*工艺参数"预磨1酒精设定值（改为比例）"
             double masterbucket_qty = form_jo.getDoubleValue("masterbucket_qty");
             if (para.getString("para_code").equals("QM006")) {
+                QM006_qty = NumberUtil.round(data2.getDoubleValue("value") * 0.01 * masterbucket_qty, 3);
                 data2.put("value", NumberUtil.round(data2.getDoubleValue("value") * 0.01 * masterbucket_qty, 3));
             }
             //球磨时间从配方表主桶配方中获取
@@ -771,12 +775,12 @@ public class PdmWorkTaskServiceImpl implements PdmWorkTaskService {
             }
             //工艺酒精加量设定值：开单重量*液料比-开单重量*工艺参数"预磨1酒精量（改为比例）"
             if (para.getString("para_code").equals("QM009")) {
+                //0.35
                 double liquid_rate = material_ext.getDouble("liquid_rate");
+                //500*0.35
                 double a = NumberUtil.mul(masterbucket_qty, liquid_rate);
-                BigDecimal b = NumberUtil.round(data2.getDoubleValue("value") * 0.01 * masterbucket_qty, 3);
-                //查询预磨1酒精设定值
-                JSONObject qm006 = WQLObject.getWQLObject("PDM_BI_WorkProcedureParaProduct").query("material_id = '" + material_id + "' AND workprocedure_id = '" + workprocedure_id + "' AND para_code = 'QM006'").uniqueResult(0);
-                data2.put("value", NumberUtil.round(NumberUtil.sub(a, b), 3));
+
+                data2.put("value", NumberUtil.round(NumberUtil.sub(a, QM006_qty), 3));
             }
             //卸料酒精每次加量设定值：开单重量*工艺参数"每次卸料酒精加量（改为比例）"
             if (para.getString("para_code").equals("QM014")) {