From 0c8aa979949482f1776a18badb2e73a26b09e3a9 Mon Sep 17 00:00:00 2001
From: zds <2388969634@qq.com>
Date: Mon, 8 Aug 2022 16:30:18 +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

---
 .../pf/service/impl/AutoformulaServiceImpl.java    | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

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 af25961d..50361da5 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
@@ -67,8 +67,6 @@ public class AutoformulaServiceImpl implements AutoformulaService {
         String material_id = json.getString("material_id");
         //成品物料编码
         String material_code = json.getString("material_code");
-        //成品纯粉系数
-        double material_net_rate = json.getDouble("net_rate");
         //需配软废集合
         JSONArray rf_list = new JSONArray();
         //需配新料集合
@@ -496,8 +494,6 @@ public class AutoformulaServiceImpl implements AutoformulaService {
         String material_id = json.getString("material_id");
         //成品物料编码
         String material_code = json.getString("material_code");
-        //成品纯粉系数
-        double material_net_rate = json.getDouble("net_rate");
         //需配软废集合
         JSONArray rf_list = new JSONArray();
         //需配新料集合
@@ -1423,8 +1419,6 @@ public class AutoformulaServiceImpl implements AutoformulaService {
         String material_id = json.getString("material_id");
         //成品物料编码
         String material_code = json.getString("material_code");
-        //成品纯粉系数
-        double material_net_rate = json.getDouble("net_rate");
         //需配软废集合
         JSONArray rf_list = new JSONArray();
         //需配新料集合
@@ -1515,15 +1509,15 @@ public class AutoformulaServiceImpl implements AutoformulaService {
                 for(int i=0;i<ivts_new.size();i++){
                     JSONObject ivt_new = ivts_new.getJSONObject(i);
                     double ivt_qty = ivt_new.getDouble("sum_ivt_qty");
+                    double net_rate = ivt_new.getDouble("net_rate");
                     ivt_qty = NumberUtil.roundDown(ivt_qty,3).doubleValue();
                     double formula_qty = 0;
-                    double rf_up = rf_left_weight.doubleValue()/(material_net_rate/100.0);
+                    double rf_up = rf_left_weight.doubleValue()/(net_rate/100.0);
                     if(ivt_qty<rf_up){
                         formula_qty = ivt_qty;
                     }else{
                         formula_qty = rf_up;
                     }
-                    double net_rate = ivt_new.getDouble("net_rate");
                     double now_ivt_qty = formula_qty * net_rate / 100.0;
 
                     //已分配软废总量
@@ -2506,8 +2500,6 @@ public class AutoformulaServiceImpl implements AutoformulaService {
         String material_id = json.getString("material_id");
         //成品物料编码
         String material_code = json.getString("material_code");
-        //成品纯粉系数
-        double material_net_rate = json.getDouble("net_rate");
         //需配软废集合
         JSONArray rf_list = new JSONArray();
         //需配新料集合
@@ -2807,8 +2799,6 @@ public class AutoformulaServiceImpl implements AutoformulaService {
         String material_id = json.getString("material_id");
         //成品物料编码
         String material_code = json.getString("material_code");
-        //成品纯粉系数
-        double material_net_rate = json.getDouble("net_rate");
         //需配软废集合
         JSONArray rf_list = new JSONArray();
         //需配新料集合