root/wuHanXinRui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rev:解决冲突

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2023-07-18 17:28:35 +08:00
parent 80a50ee4bd
commit baa28b5530
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/AutoformulaServiceImpl.java
View File

@@ -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")