From 92f4ffc6f16ca397737a165ac60c42821b150d0c Mon Sep 17 00:00:00 2001
From: zds <2388969634@qq.com>
Date: Sat, 22 Oct 2022 12:39:35 +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

---
 .../nl/wms/pf/service/impl/FormulaServiceImpl.java  | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

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 bc040c54..8d25231f 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
@@ -229,6 +229,7 @@ public class FormulaServiceImpl implements FormulaService {
             if("1".equals(jo.getString("is_need_manage"))){
                 billpure_qty = billpure_qty+jo.getDouble("formula_qty");
             }
+            bill_qty = bill_qty+jo.getDouble("formula_qty");
             JSONObject md_jo = md_me_materialbase.query("is_delete='0' and material_id='"+jo.getString("material_id")+"'").uniqueResult(0);
             if(md_jo!=null){
                 //是否软废
@@ -319,18 +320,6 @@ public class FormulaServiceImpl implements FormulaService {
         Formula.put("total_qty",Formula.getDouble("masterbucket_qty")+Formula.getDouble("extadd_qty"));
         PDM_BI_Formula.update(Formula);
 
-        JSONArray Formulas = PDM_BI_Formula.query("is_delete='0' and workorder_id='"+workorder_id+"'").getResultJSONArray(0);
-        for(int i = 0;i<Formulas.size();i++){
-            JSONObject jo = Formulas.getJSONObject(i);
-            JSONArray dtls = PDM_BI_FormulaDtl.query("formula_id='"+jo.getString("formula_id")+"'").getResultJSONArray(0);
-            for(int j = 0;j<dtls.size();j++){
-                JSONObject dtl = dtls.getJSONObject(j);
-                if("1".equals(dtl.getString("is_need_manage"))){
-                    billpure_qty = billpure_qty + dtl.getDouble("formula_qty");
-                }
-                bill_qty = bill_qty+dtl.getDouble("formula_qty");
-            }
-        }
         //更新工令、工序
         order.put("billpure_qty",billpure_qty);
         order.put("bill_qty",bill_qty);