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-14 17:43:23 +08:00
parent 824c2b9f8e
commit ec5a1e89e8
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,6 +28,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
@@ -768,13 +769,14 @@ public class PdmWorkTaskServiceImpl implements PdmWorkTaskService {
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酒精量（改为比例）"] //工艺酒精加量设定值：开单重量*液料比-开单重量*工艺参数"预磨1酒精量（改为比例）"
if (para.getString("para_code").equals("QM009")) { if (para.getString("para_code").equals("QM009")) {
double liquid_rate = material_ext.getDouble("liquid_rate");
double a = NumberUtil.mul(masterbucket_qty, liquid_rate);
BigDecimal b = NumberUtil.round(data2.getDoubleValue("value") * 0.01 * masterbucket_qty, 3);
//查询预磨1酒精设定值 //查询预磨1酒精设定值
JSONObject qm006 = WQLObject.getWQLObject("PDM_BI_WorkProcedureParaProduct").query("material_id = '" + material_id + "' AND workprocedure_id = '" + workprocedure_id + "' AND para_code = 'QM006'").uniqueResult(0); 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); data2.put("value", NumberUtil.round(NumberUtil.sub(a, b), 3));
double b = work_order.getDouble("workorder_qty");
data2.put("value", NumberUtil.round(NumberUtil.mul(b,a),3));
} }
//卸料酒精每次加量设定值：开单重量*工艺参数"每次卸料酒精加量（改为比例）" //卸料酒精每次加量设定值：开单重量*工艺参数"每次卸料酒精加量（改为比例）"
if (para.getString("para_code").equals("QM014")) { if (para.getString("para_code").equals("QM014")) {