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 10:03:20 +08:00
parent b60b9d0d73
commit d10adccd83
1 changed files with 64 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -264,7 +264,11 @@ public class PdmWorkTaskServiceImpl implements PdmWorkTaskService {
throw new PdaRequestException("当前工令工序任务状态不为检查确认！"); throw new PdaRequestException("当前工令工序任务状态不为检查确认！");
} }
// JSONObject device = WQLObject.getWQLObject("em_bi_deviceinfo").query("device_code = '"+device_code+"'").uniqueResult(0); JSONObject device = WQLObject.getWQLObject("em_bi_deviceinfo").query("device_code = '" + device_code + "'").uniqueResult(0);
if (!work_task.getString("workprocedure_code").equals(device.getString("workprocedure_code"))) {
throw new PdaRequestException("当前工序设备选择错误!");
}
work_task.put("status", "30"); work_task.put("status", "30");
work_task.put("start_id", currentUserId); work_task.put("start_id", currentUserId);
work_task.put("start_name", nickName); work_task.put("start_name", nickName);
@@ -292,8 +296,12 @@ public class PdmWorkTaskServiceImpl implements PdmWorkTaskService {
} }
} }
if (work_task.getString("workprocedure_code").equals("GX002")||work_task.getString("workprocedure_code").equals("GX003")) { if (!work_task.getString("workprocedure_code").equals("GX003")) {
//判断该设备是否存在未完成的工序任务
JSONObject device_task = WQLObject.getWQLObject("PDM_BI_WorkTask").query("device_id = '"+device.getString("device_id")+"' AND status = '30'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(device_task)){
throw new PdaRequestException("该设备已经存在生产中的工序任务！");
}
} }
//更新工令表实际开始时间 //更新工令表实际开始时间
if (topDtl.getString("workprocedure_code").equals(work_task.getString("workprocedure_code"))) { if (topDtl.getString("workprocedure_code").equals(work_task.getString("workprocedure_code"))) {