Compare commits

...

2 Commits

Author SHA1 Message Date
lgh
1ea55bd39a Merge branch 'master' of http://git.picaiba.com/mt-ck/mt-qj-wms-hd 2022-08-15 11:05:44 +08:00
lgh
dd1a4b448e update:
finishQuantity计算bug修改
2022-08-15 11:05:34 +08:00
2 changed files with 6 additions and 1 deletions

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.getId().equals(autoExeTask.getFTaskId())){ if (!byId.getTaskId().equals(autoExeTask.getFTaskId())){
iterator.remove(); iterator.remove();
} }
} }

View File

@ -138,4 +138,9 @@ 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;
} }