From baa28b5530fbd8ddbd2a695b3ed38e120bf01f9f Mon Sep 17 00:00:00 2001
From: "ZHOUZ\\Noble'lift" <1014987728@qq.com>
Date: Tue, 18 Jul 2023 17:28:35 +0800
Subject: [PATCH] =?UTF-8?q?rev:=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/AutoformulaServiceImpl.java   | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 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 9035e039..df3fd383 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
@@ -166,10 +166,12 @@ public class AutoformulaServiceImpl implements AutoformulaService {
                 JSONArray ivts = new JSONArray();
                 JSONArray now_ivts = WQL.getWO("QPF_AUTOFORMULA01")
                         .addParam("mater_ids",allmaterialId)
+                        .addParam("product_material_id",material_id)
+                        .addParam("set_type","01")
                         .addParam("is_active",value_is_active)
                         .addParam("quality_scode","02")
                         .addParam("workorder_id",workorder_id)
-                        .addParam("flag","22")
+                        .addParam("flag","23")
                         .process().getResultJSONArray(0);
                 for(int j=0;j<now_ivts.size();j++){
                     JSONObject jo = now_ivts.getJSONObject(j);
@@ -1609,10 +1611,12 @@ public class AutoformulaServiceImpl implements AutoformulaService {
         for(int i=0;i<MaterialSets.size();i++){
             JSONObject MaterialSet = MaterialSets.getJSONObject(i);
             String set_material_id = MaterialSet.getString("set_material_id");
+            String set_prior_level = MaterialSet.getString("set_prior_level");
             JSONArray now_ivts = WQL.getWO("QPF_AUTOFORMULA01")
                     .addParam("material_id",set_material_id)
                     .addParam("workorder_id",workorder_id)
                     .addParam("is_active",value_is_active)
+                    .addParam("set_prior_level",set_prior_level)
                     .addParam("quality_scode","02")
                     .addParam("flag","22")
                     .process().getResultJSONArray(0);
@@ -2937,9 +2941,11 @@ public class AutoformulaServiceImpl implements AutoformulaService {
                 JSONArray now_ivts = WQL.getWO("QPF_AUTOFORMULA01")
                         .addParam("mater_ids",allmaterialId)
                         .addParam("is_active",value_is_active)
+                        .addParam("product_material_id",material_id)
+                        .addParam("set_type","02")
                         .addParam("quality_scode","02")
                         .addParam("workorder_id",workorder_id)
-                        .addParam("flag","22")
+                        .addParam("flag","23")
                         .process().getResultJSONArray(0);
                 for(int j=0;j<now_ivts.size();j++){
                     JSONObject jo = now_ivts.getJSONObject(j);
@@ -3296,9 +3302,11 @@ public class AutoformulaServiceImpl implements AutoformulaService {
         for(int i=0;i<MaterialSets.size();i++){
             JSONObject MaterialSet = MaterialSets.getJSONObject(i);
             String set_material_id = MaterialSet.getString("set_material_id");
+            String set_prior_level = MaterialSet.getString("set_prior_level");
             JSONArray now_ivts = WQL.getWO("QPF_AUTOFORMULA01")
                     .addParam("material_id",set_material_id)
                     .addParam("is_active",value_is_active)
+                    .addParam("set_prior_level",set_prior_level)
                     .addParam("quality_scode","02")
                     .addParam("workorder_id",workorder_id)
                     .addParam("flag","22")
@@ -4619,9 +4627,11 @@ public class AutoformulaServiceImpl implements AutoformulaService {
                 JSONArray now_ivts = WQL.getWO("QPF_AUTOFORMULA01")
                         .addParam("mater_ids",allmaterialId)
                         .addParam("is_active",value_is_active)
+                        .addParam("product_material_id",material_id)
+                        .addParam("set_type","02")
                         .addParam("quality_scode","02")
                         .addParam("workorder_id",workorder_id)
-                        .addParam("flag","9")
+                        .addParam("flag","92")
                         .process().getResultJSONArray(0);
 
                 for(int j=0;j<now_ivts.size();j++){
@@ -5051,9 +5061,11 @@ public class AutoformulaServiceImpl implements AutoformulaService {
         for(int i=0;i<MaterialSets.size();i++){
             JSONObject MaterialSet = MaterialSets.getJSONObject(i);
             String set_material_id = MaterialSet.getString("set_material_id");
+            String set_prior_level = MaterialSet.getString("set_prior_level");
             JSONArray now_ivts = WQL.getWO("QPF_AUTOFORMULA01")
                     .addParam("material_id",set_material_id)
                     .addParam("is_active",value_is_active)
+                    .addParam("set_prior_level",set_prior_level)
                     .addParam("quality_scode","02")
                     .addParam("workorder_id",workorder_id)
                     .addParam("flag","9")