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-07-11 01:07:22 +08:00
parent c57c5b9292
commit 3fb7ec658a
3 changed files with 20 additions and 3 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

@@ -263,6 +263,8 @@ public class PdmWorkTaskServiceImpl implements PdmWorkTaskService {
if (!now_status.equals("20")) {
throw new PdaRequestException("当前工令工序任务状态不为检查确认！");
}
// JSONObject device = WQLObject.getWQLObject("em_bi_deviceinfo").query("device_code = '"+device_code+"'").uniqueResult(0);
work_task.put("status", "30");
work_task.put("start_id", currentUserId);
work_task.put("start_name", nickName);
@@ -289,6 +291,10 @@ public class PdmWorkTaskServiceImpl implements PdmWorkTaskService {
work_task.put("device_id", device_info.getString("device_id"));
}
}
if (work_task.getString("workprocedure_code").equals("GX002")||work_task.getString("workprocedure_code").equals("GX003")) {
}
//更新工令表实际开始时间
if (topDtl.getString("workprocedure_code").equals(work_task.getString("workprocedure_code"))){
work_order.put("realstart_time", now);
@@ -685,7 +691,10 @@ public class PdmWorkTaskServiceImpl implements PdmWorkTaskService {
}
JSONObject work_task = WQLObject.getWQLObject("PDM_BI_WorkTask").query("worktask_id = '" + worktask_id + "'").uniqueResult(0);
JSONObject work_order = WQLObject.getWQLObject("PDM_BI_WorkOrder").query("workorder_code = '" + work_task.getString("workorder_code") + "'").uniqueResult(0);
JSONObject device_jo = WQLObject.getWQLObject("em_bi_deviceinfo").query("device_id = '"+work_task.getString("device_id")+"'").uniqueResult(0);
JSONObject form_jo = WQLObject.getWQLObject("PDM_BI_Formula").query("workorder_code = '"+work_task.getString("workorder_code")+"' AND bucket_type = '01'").uniqueResult(0);
JSONObject material_ext = WQLObject.getWQLObject("MD_ME_ProducMaterialExt").query("material_id = '"+work_order.getString("material_id")+"'").uniqueResult(0);
if (StrUtil.isEmpty(work_task.getString("device_id"))) {
throw new PdaRequestException("当前工序任务还未绑定设备！");
@@ -719,6 +728,14 @@ public class PdmWorkTaskServiceImpl implements PdmWorkTaskService {
}
data2.put("code", para.getString("ext_name"));
data2.put("value", row.getString("value"));
//球磨时间从配方表主桶配方中获取
if (para.getString("para_code").equals("QM008")){
data2.put("value", form_jo.getString("ball_time"));
}
//工艺酒精加量设定值：工令重量*液料比，液料比从扩展属性中取；
if (para.getString("para_code").equals("QM009")){
data2.put("value", NumberUtil.mul(work_order.getDouble("workorder_qty"),material_ext.getDouble("liquid_rate")));
}
array.add(data2);
}

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

@@ -130,7 +130,7 @@ public class PfScreenServiceImpl implements PfScreenService {
scr_jo.put("putfit_qty", bucket_jo.getDoubleValue("putfit_qty"));
}
//查询最新的配粉工位称重记录表
JSONObject err_mark = WQLObject.getWQLObject("PDM_BI_FormulaWeightRecord").query("device_code = '" + scr_jo2.getString("device_code") + "' order by record_time desc").uniqueResult(0);
JSONObject err_mark = WQLObject.getWQLObject("PDM_BI_FormulaWeightRecord").query("device_code = '" + scr_jo2.getString("device_code") + "' AND formula_code = '"+scr_jo2.getString("formula_code")+"' order by record_time desc").uniqueResult(0);
if (ObjectUtil.isNotEmpty(err_mark) && !err_mark.getString("error").equals("0")) {
//查询错误信息
scr_jo.put("msg", "投料确认异常！错误码："+err_mark.getString("error"));

4
mes/hd/nladmin-system/src/main/java/org/nl/pda/st/set/service/impl/EndProductServiceImpl.java
View File

@@ -202,7 +202,7 @@ public class EndProductServiceImpl implements EndProductService {
offlinejo.put("material_id", material_id);
offlinejo.put("pcsn", pcsn);
offlinejo.put("bucketunique", bucketunique);
offlinejo.put("ordernum", record_order);
offlinejo.put("ordernum", changeObj.getString("record_order"));
offlinejo.put("qty", result_qty);
offlinejo.put("qty_unit_id", materDto.getBase_unit_id());
offlinejo.put("qty_unit_name", materDto.getBase_unit_name());
@@ -216,7 +216,7 @@ public class EndProductServiceImpl implements EndProductService {
map.put("material_id", material_id);
map.put("pcsn", pcsn);
map.put("bucketunique", bucketunique);
map.put("ordernum", record_order+"");
map.put("ordernum", changeObj.getString("record_order"));
map.put("qty", result_qty+"");
map.put("qty_unit_id", materDto.getBase_unit_id()+"");
map.put("qty_unit_name", materDto.getBase_unit_name());