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

优化

Browse Source
This commit is contained in:
zds
2022-11-11 18:23:04 +08:00
parent 50553b0344
commit 26831b9970
2 changed files with 11 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -714,7 +714,6 @@ public class AcceptFormulaServiceImpl implements AcceptFormulaService {
bomdlts_plan_map.put(bomdtl_material_id,bomdlt);
}
else{//抑制剂
bomdlt.put("finished_qty",0);
bomdlt.put("need_sum_qty",nedd_qty);
bomdlt.put("dtl_pcsn","");
@@ -777,7 +776,7 @@ public class AcceptFormulaServiceImpl implements AcceptFormulaService {
String tjj_material_id = tjj_map_jo.getString("material_id");
JSONObject tjj_finished = WQL.getWO("QPF_AUTOFORMULA02")
.addParam("material_id",bomdlt_Cr3C2.getString("material_id"))
.addParam("pcsn",bomdlt_Cr3C2.getString("pcsn"))
.addParam("pcsn",material_pcsn)
.addParam("item_material_id",tjj_material_id)
.addParam("flag","5")
.process()
@@ -850,7 +849,7 @@ public class AcceptFormulaServiceImpl implements AcceptFormulaService {
String tjj_material_id = tjj_map_jo.getString("material_id");
JSONObject tjj_finished = WQL.getWO("QPF_AUTOFORMULA02")
.addParam("material_id",bomdlt_Cr3C2.getString("material_id"))
.addParam("pcsn",bomdlt_Cr3C2.getString("pcsn"))
.addParam("pcsn",material_pcsn)
.addParam("item_material_id",tjj_material_id)
.addParam("flag","5")
.process()
@@ -893,7 +892,7 @@ public class AcceptFormulaServiceImpl implements AcceptFormulaService {
String tjj_material_id = tjj_map_jo.getString("material_id");
JSONObject tjj_finished = WQL.getWO("QPF_AUTOFORMULA02")
.addParam("material_id",bomdlt_Cr3C2.getString("material_id"))
.addParam("pcsn",bomdlt_Cr3C2.getString("pcsn"))
.addParam("pcsn",material_pcsn)
.addParam("item_material_id",tjj_material_id)
.addParam("flag","5")
.process()
@@ -962,28 +961,6 @@ public class AcceptFormulaServiceImpl implements AcceptFormulaService {
//该批次配粉重量
double X22p = bomdlt_Cr3C2.getDouble("bom_ivt_qty");
AtomicReference<Double> Z_sum = new AtomicReference<>(0.0);
//计算不需要移库的添加剂(抑制剂)
yzj_map.forEach((key,tjj_map_jo)->{
//获取添加剂id
String tjj_material_id = tjj_map_jo.getString("material_id");
JSONObject tjj_finished = WQL.getWO("QPF_AUTOFORMULA01")
.addParam("material_id",bomdlt_Cr3C2.getString("material_id"))
.addParam("pcsn",bomdlt_Cr3C2.getString("pcsn"))
.addParam("item_material_id",tjj_material_id)
.addParam("flag","5")
.process()
.uniqueResult(0);
if(tjj_finished!=null){
//质保书含量比
double value = tjj_finished.getDouble("value");
//当前含量重量
double finished = X22p*value/100.0;
//累计各碳化钨中已含添加剂重量
Z_sum.set(Z_sum.get() + finished);
}
});
// X21p减=[(X21p)* X21碳含量+软废含碳量-产品碳平衡*(X21p+软废碳化钨)]/X21碳含量
//解得钨粉重量
double X22_jian = (CT1 - (c_balance/100.0)*(CT1_weight)) / (X22/100.0);
@@ -994,13 +971,15 @@ public class AcceptFormulaServiceImpl implements AcceptFormulaService {
}
bomdlt_Cr3C2.put("bom_ivt_qty",bom_ivt_qty);
bomdlts_plan_map.put(bomdlt_Cr3C2.getString("material_id"),bomdlt_Cr3C2);
//计算不需要移库的添加剂
AtomicReference<Double> Z_sum = new AtomicReference<>(0.0);
//计算不需要移库的添加剂(抑制剂)
yzj_map.forEach((key,tjj_map_jo)->{
//获取添加剂id
String tjj_material_id = tjj_map_jo.getString("material_id");
JSONObject tjj_finished = WQL.getWO("QPF_AUTOFORMULA02")
JSONObject tjj_finished = WQL.getWO("QPF_AUTOFORMULA01")
.addParam("material_id",bomdlt_Cr3C2.getString("material_id"))
.addParam("pcsn",bomdlt_Cr3C2.getString("pcsn"))
.addParam("pcsn",material_pcsn)
.addParam("item_material_id",tjj_material_id)
.addParam("flag","5")
.process()
@@ -1013,6 +992,8 @@ public class AcceptFormulaServiceImpl implements AcceptFormulaService {
//当前含量重量
double finished = bom_ivt_qty*value/100.0;
//累计各碳化钨中已含添加剂重量
Z_sum.set(Z_sum.get() + finished);
//累计各碳化钨中已含添加剂重量
tjj_map_jo.put("finished_qty",finished_qty+finished);
yzj_map.put(tjj_material_id,tjj_map_jo);
}

2
mes/qd/src/App.vue
View File

@@ -24,7 +24,7 @@ export default {
this.timmer = setTimeout(() => {
sessionStorage.clear()
this.logout()
}, 1000 * 60 * 1) // 15分钟 https://blog.csdn.net/qq_42345108/article/details/103496456
}, 1000 * 60 * 15) // 15分钟 https://blog.csdn.net/qq_42345108/article/details/103496456
},
logout() {
this.$store.dispatch('LogOut').then(() => {