mt-ck/mt-qj-wms-hd
7
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: mt-ck:1ea55bd39a5c67a1c11a0838a02b246614ce1ecf
Branches Tags
mt-ck:master
mt-ck:mt-qj-wms
mt-ck:mt-qj-wcs
..
compare: mt-ck:4af20b8551602a3067a2cd99d50629722090fe26
Branches Tags
mt-ck:master
mt-ck:mt-qj-wms
mt-ck:mt-qj-wcs

No commits in common. "1ea55bd39a5c67a1c11a0838a02b246614ce1ecf" and "4af20b8551602a3067a2cd99d50629722090fe26" have entirely different histories.
1ea55bd39a ... 4af20b8551

2 changed files with 1 additions and 6 deletions
Show Stats Expand all files Collapse all files

2
6.program/wms-empty/src/main/java/com/mt/wms/empty/service/impl/TaskDetHisServiceImpl.java
View File

@ -88,7 +88,7 @@ public class TaskDetHisServiceImpl extends BaseService implements TaskDetHisServ
//如果是多步骤任务且不是第一步,移除对象 //如果是多步骤任务且不是第一步,移除对象
if (byId.getIsAuto()==1){ if (byId.getIsAuto()==1){
AutoExeTask autoExeTask = autoExeTaskServiceBiz.getById(byId.getAutoExeTaskId()); AutoExeTask autoExeTask = autoExeTaskServiceBiz.getById(byId.getAutoExeTaskId());
if (!byId.getTaskId().equals(autoExeTask.getFTaskId())){ if (!byId.getId().equals(autoExeTask.getFTaskId())){
iterator.remove(); iterator.remove();
} }
} }

5
6.program/wms-empty/src/main/java/com/mt/wms/empty/vo/CurrTaskVo.java
View File

@ -138,9 +138,4 @@ public class CurrTaskVo extends BaseVo implements PageVo.ConvertVo {
*/ */
@TableField("auto_exe_task_id") @TableField("auto_exe_task_id")
private Long autoExeTaskId; private Long autoExeTaskId;
/**
* currid
*/
@TableField("auto_exe_task_id")
private Long taskId;
} }