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-08 15:41:34 +08:00
parent 41fa644bf0
commit aa16d2c2d2
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/impl/HandPFOutIvtServiceImpl.java
View File

@@ -843,9 +843,8 @@ public class HandPFOutIvtServiceImpl implements HandPFOutIvtService {
AbstractAcsTask intask = new InTask(); AbstractAcsTask intask = new InTask();
//调用ACS接受任务接口 //调用ACS接受任务接口
WQLObject taskTable = WQLObject.getWQLObject("sch_base_task"); WQLObject taskTable = WQLObject.getWQLObject("sch_base_task");
JSONArray taskObjja = taskTable.query("vehicle_code='" + storagevehicle_code + "' ").getResultJSONArray(0);
JSONObject taskObj = taskTable.query("vehicle_code='" + storagevehicle_code + "' and task_status='01' is_delete = '0'").uniqueResult(0); JSONObject taskObj = taskTable.query("vehicle_code='" + storagevehicle_code + "' and task_status='01' and is_delete ='0'").uniqueResult(0);
if (ObjectUtil.isEmpty(taskObj)) { if (ObjectUtil.isEmpty(taskObj)) {
throw new PdaRequestException("托盘为【'" + storagevehicle_code + "'】指令未找到"); throw new PdaRequestException("托盘为【'" + storagevehicle_code + "'】指令未找到");
} }

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/task/OutTask.java
View File

@@ -149,7 +149,7 @@ public class OutTask extends AbstractAcsTask {
//任务表 //任务表
WQLObject wo_Task = WQLObject.getWQLObject("SCH_BASE_Task"); WQLObject wo_Task = WQLObject.getWQLObject("SCH_BASE_Task");
JSONObject task = wo_Task.query("task_status='01' and taskdtl_id='"+taskdtl_id+"'").uniqueResult(0); JSONObject task = wo_Task.query("is_delete ='0' and task_status='01' and taskdtl_id='"+taskdtl_id+"'").uniqueResult(0);
if(task==null){ if(task==null){
throw new BadRequestException("只能取消生成状态的任务！"); throw new BadRequestException("只能取消生成状态的任务！");
} }

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java
View File

@@ -946,7 +946,7 @@ public class HandMoveStorServiceImpl implements HandMoveStorService {
map.put("update_optid", currentUserId + ""); map.put("update_optid", currentUserId + "");
map.put("update_optname", nickName); map.put("update_optname", nickName);
map.put("update_time", now); map.put("update_time", now);
wo_Task.update(map, "task_status='01' and taskdtl_id='" + taskdtl_id + "'"); wo_Task.update(map, "is_delete ='0' and task_status='01' and taskdtl_id='" + taskdtl_id + "'");
} else { } else {
throw new BadRequestException("任务下发失败，请稍后重试！"); throw new BadRequestException("任务下发失败，请稍后重试！");
} }