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-09-23 16:40:40 +08:00
parent 700bcbba6f
commit 24b3b4508b
2 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -696,8 +696,8 @@ public class AutoformulaServiceImpl implements AutoformulaService {
JSONObject FactoryWarranty = bomdlts_plan_map.get(bomdlt_Cr3C2.getString("stockrecord_id")); JSONObject FactoryWarranty = bomdlts_plan_map.get(bomdlt_Cr3C2.getString("stockrecord_id"));
//该批次含碳比 //该批次含碳比
double X22 = FactoryWarranty.getDouble("is_tan"); double X22 = FactoryWarranty.getDouble("is_tan");
//解得碳粉重量 X22p减=[产品碳平衡*(X22p+Z已总)-Z已总- (X22p)* X22碳含量]/(1- X22碳含量) //X22p减=[产品碳平衡*(X11p+X12p+X21p+X22p+软废碳化钨)-(X11p* X11碳含量+X12p* X12碳含量+X21p* X21碳含量+X22p* X22碳含量+软废含碳量)]/(1-X22碳含量)
double X22_jian = ((c_balance/100.0)*(CT1_weight+Z_sum.get())-(CT1+Z_sum.get()))/(1-X22/100.0); double X22_jian = ((c_balance/100.0)*(CT1_weight)-CT1)/(1-X22/100.0);
//更新碳化钨配粉重量 //更新碳化钨配粉重量
double bom_ivt_qty = X22p-X22_jian; double bom_ivt_qty = X22p-X22_jian;
if(bom_ivt_qty < 0){ if(bom_ivt_qty < 0){
@@ -821,8 +821,8 @@ public class AutoformulaServiceImpl implements AutoformulaService {
boolean flag = true; boolean flag = true;
//设X21p减=0，解方程 //设X21p减=0，解方程
if(flag){ if(flag){
// X22p减=[产品碳平衡*(X11p+X12p+X21p+X22p+Z已总) - (X11p* X11碳含量+X12p* X12碳含量+(X21)* X21碳含量+(X22p)* X22碳含量+Z已总)]/(1-X22碳含量) //X22p减=[产品碳平衡*(X11p+X12p+X21p+X22p+软废碳化钨)-(X11p* X11碳含量+X12p* X12碳含量+X21p* X21碳含量+X22p* X22碳含量+软废含碳量)]/(1-X22碳含量)
double X22_jian = ((c_balance/100.0)*(CT1_weight+Z_sum.get())-(CT1+Z_sum.get()))/(1-X22/100.0); double X22_jian = ((c_balance/100.0)*(CT1_weight)-CT1)/(1-X22/100.0);
//更新碳化钨配粉重量 //更新碳化钨配粉重量
double bom_ivt_qty = X22p-X22_jian; double bom_ivt_qty = X22p-X22_jian;
if(bom_ivt_qty<0){ if(bom_ivt_qty<0){
@@ -908,7 +908,7 @@ public class AutoformulaServiceImpl implements AutoformulaService {
if(!flag){ if(!flag){
//设X22p减=X22p，解方程 //设X22p减=X22p，解方程
// X21p减=[产品碳平衡*(X11p+X12p+X21p+X22p+Z已总) - (X11p* X11碳含量+X12p* X12碳含量+(X21p)* X21碳含量+Z已总+X22p)]/(1-X21碳含量) // X21p减=[产品碳平衡*(X11p+X12p+X21p+X22p+Z已总) - (X11p* X11碳含量+X12p* X12碳含量+(X21p)* X21碳含量+Z已总+X22p)]/(1-X21碳含量)
double X21_jian = ((c_balance/100.0)*(CT1_weight+Z_sum.get()) - (CT1-X22c) - X22p-Z_sum.get())/(1-X21/100.0); double X21_jian = ((c_balance/100.0)*(CT1_weight) - (CT1-X22c) - X22p)/(1-X21/100.0);
//解得钨粉重量 //解得钨粉重量
double C = X22p + X21_jian + Z_sum.get(); double C = X22p + X21_jian + Z_sum.get();
@@ -1784,8 +1784,8 @@ public class AutoformulaServiceImpl implements AutoformulaService {
Z_sum.set(Z_sum.get() + finished); Z_sum.set(Z_sum.get() + finished);
} }
}); });
//解得碳粉重量 X22p减=[产品碳平衡*(X22p+Z已总)-Z已总- (X22p)* X22碳含量]/(1- X22碳含量) //X22p减=[产品碳平衡*(X11p+X12p+X21p+X22p+软废碳化钨)-(X11p* X11碳含量+X12p* X12碳含量+X21p* X21碳含量+X22p* X22碳含量+软废含碳量)]/(1-X22碳含量)
double X22_jian = ((c_balance/100.0)*(CT1_weight+Z_sum.get())-(CT1+Z_sum.get()))/(1-X22/100.0); double X22_jian = ((c_balance/100.0)*(CT1_weight)-CT1)/(1-X22/100.0);
//更新碳化钨配粉重量 //更新碳化钨配粉重量
double bom_ivt_qty = X22p-X22_jian; double bom_ivt_qty = X22p-X22_jian;
if(bom_ivt_qty < 0){ if(bom_ivt_qty < 0){
@@ -1909,8 +1909,8 @@ public class AutoformulaServiceImpl implements AutoformulaService {
boolean flag = true; boolean flag = true;
//设X21p减=0，解方程 //设X21p减=0，解方程
if(flag){ if(flag){
// X22p减=[产品碳平衡*(X11p+X12p+X21p+X22p+Z已总) - (X11p* X11碳含量+X12p* X12碳含量+(X21)* X21碳含量+(X22p)* X22碳含量+Z已总)]/(1-X22碳含量) //X22p减=[产品碳平衡*(X11p+X12p+X21p+X22p+软废碳化钨)-(X11p* X11碳含量+X12p* X12碳含量+X21p* X21碳含量+X22p* X22碳含量+软废含碳量)]/(1-X22碳含量)
double X22_jian = ((c_balance/100.0)*(CT1_weight+Z_sum.get())-(CT1+Z_sum.get()))/(1-X22/100.0); double X22_jian = ((c_balance/100.0)*(CT1_weight)-CT1)/(1-X22/100.0);
//更新碳化钨配粉重量 //更新碳化钨配粉重量
double bom_ivt_qty = X22p-X22_jian; double bom_ivt_qty = X22p-X22_jian;
if(bom_ivt_qty<0){ if(bom_ivt_qty<0){
@@ -1996,8 +1996,7 @@ public class AutoformulaServiceImpl implements AutoformulaService {
if(!flag){ if(!flag){
//设X22p减=X22p，解方程 //设X22p减=X22p，解方程
// X21p减=[产品碳平衡*(X11p+X12p+X21p+X22p+Z已总) - (X11p* X11碳含量+X12p* X12碳含量+(X21p)* X21碳含量+Z已总+X22p)]/(1-X21碳含量) // X21p减=[产品碳平衡*(X11p+X12p+X21p+X22p+Z已总) - (X11p* X11碳含量+X12p* X12碳含量+(X21p)* X21碳含量+Z已总+X22p)]/(1-X21碳含量)
double X21_jian = ((c_balance/100.0)*(CT1_weight+Z_sum.get()) - (CT1-X22c) - X22p-Z_sum.get())/(1-X21/100.0); double X21_jian = ((c_balance/100.0)*(CT1_weight) - (CT1-X22c) - X22p)/(1-X21/100.0);
//解得钨粉重量 //解得钨粉重量
double C = X22p + X21_jian + Z_sum.get(); double C = X22p + X21_jian + Z_sum.get();
if(C<0){ if(C<0){

3
mes/qd/src/views/wms/basedata/em/equipmentfile/AddDialog.vue
View File

@@ -327,9 +327,6 @@ export default {
use_deptid: [ use_deptid: [
{ required: true, message: '使用部门不能为空', trigger: 'blur' } { required: true, message: '使用部门不能为空', trigger: 'blur' }
], ],
device_bom_id: [
{ required: true, message: '设备Bom不能为空', trigger: 'blur' }
],
is_produceuse: [ is_produceuse: [
{ required: true, message: '生产用途不能为空', trigger: 'blur' } { required: true, message: '生产用途不能为空', trigger: 'blur' }
] ]