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-13 10:36:34 +08:00
parent dc0c050eea
commit 793ae06319
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -143,6 +143,7 @@ public class WorkTaskServiceImpl implements WorkTaskService {
Long currentUserId = SecurityUtils.getCurrentUserId(); Long currentUserId = SecurityUtils.getCurrentUserId();
String nickName = SecurityUtils.getNickName(); String nickName = SecurityUtils.getNickName();
String now = DateUtil.now(); String now = DateUtil.now();
WQLObject em_bi_deviceinfo = WQLObject.getWQLObject("em_bi_deviceinfo");
WQLObject PDM_BI_WorkOrder = WQLObject.getWQLObject("PDM_BI_WorkOrder"); // 工艺路线主表 WQLObject PDM_BI_WorkOrder = WQLObject.getWQLObject("PDM_BI_WorkOrder"); // 工艺路线主表
WQLObject mstTab = WQLObject.getWQLObject("PDM_BI_WorkTask"); // 工艺路线主表 WQLObject mstTab = WQLObject.getWQLObject("PDM_BI_WorkTask"); // 工艺路线主表
WQLObject PDM_BI_WorkTaskJob = WQLObject.getWQLObject("PDM_BI_WorkTaskJob"); // 工艺路线主表 WQLObject PDM_BI_WorkTaskJob = WQLObject.getWQLObject("PDM_BI_WorkTaskJob"); // 工艺路线主表
@@ -161,6 +162,19 @@ public class WorkTaskServiceImpl implements WorkTaskService {
if (StrUtil.isEmpty(device_id)) { if (StrUtil.isEmpty(device_id)) {
throw new BadRequestException(jo.getString("worktask_code") + "当前记录未指定设备！"); throw new BadRequestException(jo.getString("worktask_code") + "当前记录未指定设备！");
} }
String workprocedure_code = jsonMst.getString("workprocedure_code");
if("GX002".contains(workprocedure_code)){
JSONArray others = mstTab.query("worktask_id<>'"+worktask_id+"' and device_id='"+device_id+"' and status in('30')").getResultJSONArray(0);
if(others.size()>0){
throw new BadRequestException(jo.getString("worktask_code") + "指定设备有其它已开始生产但未完成任务！");
}
}
JSONObject device = em_bi_deviceinfo.query("is_delete='0' and device_id='"+device_id+"'").uniqueResult(0);
if(!workprocedure_code.equals(device.getString("workprocedure_code"))){
throw new BadRequestException(jo.getString("worktask_code") + "指定设备所属工序与当前工序任务不一致！");
}
//更新任务 //更新任务
HashMap<String, String> map = new HashMap<>(); HashMap<String, String> map = new HashMap<>();
map.put("status", "30"); map.put("status", "30");