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

修改

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2022-10-13 19:45:35 +08:00
parent 4ae6106bf1
commit 88af97e6dd
1 changed files with 32 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
mes/hd/nladmin-system/src/main/java/org/nl/pda/pdm/service/impl/PdmWorkTaskServiceImpl.java
View File

@@ -759,13 +759,26 @@ public class PdmWorkTaskServiceImpl implements PdmWorkTaskService {
} }
data2.put("code", para.getString("ext_name")); data2.put("code", para.getString("ext_name"));
data2.put("value", row.getString("value")); data2.put("value", row.getString("value"));
//预磨1酒精设定值：开单重量*工艺参数"预磨1酒精设定值（改为比例）"
double masterbucket_qty = form_jo.getDoubleValue("masterbucket_qty");
if (para.getString("para_code").equals("QM006")) {
data2.put("value", NumberUtil.round(data2.getDoubleValue("value") * 0.01 * masterbucket_qty, 3));
}
//球磨时间从配方表主桶配方中获取 //球磨时间从配方表主桶配方中获取
if (para.getString("para_code").equals("QM008")) { if (para.getString("para_code").equals("QM008")) {
data2.put("value", form_jo.getString("ball_time")); data2.put("value", form_jo.getString("ball_time"));
} }
//工艺酒精加量设定值：工令重量*液料比，液料比从扩展属性中取； //工艺酒精加量设定值：开单重量*[1-工艺参数"预磨1酒精量（改为比例）"]
if (para.getString("para_code").equals("QM009")) { if (para.getString("para_code").equals("QM009")) {
data2.put("value", NumberUtil.mul(work_order.getDouble("workorder_qty"), material_ext.getDouble("liquid_rate"))); //查询预磨1酒精设定值
JSONObject qm006 = WQLObject.getWQLObject("PDM_BI_WorkProcedureParaProduct").query("material_id = '" + material_id + "' AND workprocedure_id = '" + workprocedure_id + "' AND para_code = 'QM006'").uniqueResult(0);
double a = (1.0-qm006.getDoubleValue("value")*0.01);
double b = work_order.getDouble("workorder_qty");
data2.put("value", NumberUtil.round(NumberUtil.mul(b,a),3));
}
//卸料酒精每次加量设定值：开单重量*工艺参数"每次卸料酒精加量（改为比例）"
if (para.getString("para_code").equals("QM014")) {
data2.put("value", NumberUtil.round(data2.getDoubleValue("value") * 0.01 * masterbucket_qty, 3));
} }
array.add(data2); array.add(data2);
} }