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-07-08 10:57:16 +08:00
parent f1b8c67e99
commit 12484acb0d
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkOrderServiceImpl.java
View File

@@ -736,6 +736,7 @@ public class WorkOrderServiceImpl implements WorkOrdereService {
return ret; return ret;
} }
@Transactional(rollbackFor = Exception.class)
void updatePcsn(JSONObject from){ void updatePcsn(JSONObject from){
String pcsn = from.getString("pcsn"); String pcsn = from.getString("pcsn");
String material_id = from.getString("material_id"); String material_id = from.getString("material_id");

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

@@ -689,6 +689,8 @@ public class AutoformulaServiceImpl implements AutoformulaService {
//设X21p减=0，解方程 //设X21p减=0，解方程
if(flag){ if(flag){
// X22p减 =产品碳平衡*(X11p+X12p+X21p+X22p)-总碳/(1- X22碳含量) // X22p减 =产品碳平衡*(X11p+X12p+X21p+X22p)-总碳/(1- X22碳含量)
//C=X22p减
//X22p减=产品碳平衡*(X11p+X12p+X21p+X22p)+ X22p减*X22碳含量-CT1
double C = ((c_balance/100.0)*CT1_weight-CT1)/(1-X22/100.0); double C = ((c_balance/100.0)*CT1_weight-CT1)/(1-X22/100.0);
if(C<0){ if(C<0){
flag = false; flag = false;
@@ -773,6 +775,9 @@ public class AutoformulaServiceImpl implements AutoformulaService {
if(!flag){ if(!flag){
//设X22p减=X22p，解方程 //设X22p减=X22p，解方程
//X21p减*=产品碳平衡*(X11p+X12p+X21p+X22p)-(X11p* X11碳含量+X12p* X12碳含量+(X21p)* X21碳含量)-X22p/(1- X21碳含量) //X21p减*=产品碳平衡*(X11p+X12p+X21p+X22p)-(X11p* X11碳含量+X12p* X12碳含量+(X21p)* X21碳含量)-X22p/(1- X21碳含量)
//
//X21p减=[产品碳平衡*(X11p+X12p+X21p+X22p)-( X11p* X11碳含量+X12p* X12碳含量+X21p* X21碳含量+X22p)]/ (1-X21碳含量)
double X21_jian = ((c_balance/100.0)*CT1_weight - (CT1-X22c) - X22p)/(1-X21/100.0); double X21_jian = ((c_balance/100.0)*CT1_weight - (CT1-X22c) - X22p)/(1-X21/100.0);
if(X21_jian<0){ if(X21_jian<0){
throw new BadRequestException("碳化钨减掉结果为负数，当前配粉无解！"); throw new BadRequestException("碳化钨减掉结果为负数，当前配粉无解！");