mt-ck/mt-qj-wms-hd
7
0
Fork 0
Código Issues Pull requests Versões Wiki Atividade

通过标识卡查询订单余量bug修改多步骤任务只计算一次

Ver código fonte
Esse commit está contido em:
李广豪 2022-08-02 23:31:48 +08:00
commit af9b7a83cb
3 arquivos alterados com 34 adições e 0 exclusões
Mostrar estatísticas Baixar arquivo de patch Baixar arquivo de diferenças Expandir todos os arquivos Colapsar todos os arquivos

11
6.program/wms-empty/src/main/java/com/mt/wms/empty/service/impl/CurrTaskDetServiceImpl.java
Ver arquivo

@ -3,8 +3,10 @@ package com.mt.wms.empty.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.mt.wms.core.base.BaseService;
import com.mt.wms.core.dal.entity.AutoExeTask;
import com.mt.wms.core.dal.entity.CurrTaskDet;
import com.mt.wms.core.dal.entity.OrderInfo;
import com.mt.wms.core.dal.service.AutoExeTaskServiceBiz;
import com.mt.wms.core.dal.service.CurrTaskDetServiceBiz;
import com.mt.wms.core.dal.service.OrderInfoServiceBiz;
import com.mt.wms.core.params.IdParam;
@ -44,6 +46,8 @@ public class CurrTaskDetServiceImpl extends BaseService implements CurrTaskDetSe
CurrTaskService currTaskService;
@Autowired
OrderInfoServiceBiz orderInfoService;
@Autowired
AutoExeTaskServiceBiz autoExeTaskServiceBiz;
@Override
public PageVo<OrderInfoTaskDetVo> getCurrOrderCurrTask(OrderInfoTaskDetParam param) {
@ -120,6 +124,13 @@ public class CurrTaskDetServiceImpl extends BaseService implements CurrTaskDetSe
{
list.remove(e);
}
//如果是多步骤任务且不是第一步,移除对象
if (byId.getIsAuto()==1){
AutoExeTask autoExeTask = autoExeTaskServiceBiz.getById(byId.getAutoExeTaskId());
if (!byId.getId().equals(autoExeTask.getFTaskId())){
list.remove(e);
}
}
});
//计算加工总数
double sumWeight = list.stream().mapToDouble(CurrTaskDet::getWeight).sum();

11
6.program/wms-empty/src/main/java/com/mt/wms/empty/service/impl/TaskDetHisServiceImpl.java
Ver arquivo

@ -3,8 +3,10 @@ package com.mt.wms.empty.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.mt.wms.core.base.BaseService;
import com.mt.wms.core.dal.entity.AutoExeTask;
import com.mt.wms.core.dal.entity.OrderInfo;
import com.mt.wms.core.dal.entity.TaskDetHis;
import com.mt.wms.core.dal.service.AutoExeTaskServiceBiz;
import com.mt.wms.core.dal.service.OrderInfoServiceBiz;
import com.mt.wms.core.dal.service.TaskDetHisServiceBiz;
import com.mt.wms.core.params.IdParam;
@ -41,6 +43,8 @@ public class TaskDetHisServiceImpl extends BaseService implements TaskDetHisServ
TaskHisService taskhisService;
@Autowired
OrderInfoServiceBiz orderInfoService;
@Autowired
AutoExeTaskServiceBiz autoExeTaskServiceBiz;
@Override
public R<String> save(TaskDetHis taskDetHis) {
@ -78,6 +82,13 @@ public class TaskDetHisServiceImpl extends BaseService implements TaskDetHisServ
{
list.remove(e);
}
//如果是多步骤任务且不是第一步,移除对象
if (byId.getIsAuto()==1){
AutoExeTask autoExeTask = autoExeTaskServiceBiz.getById(byId.getAutoExeTaskId());
if (!byId.getId().equals(autoExeTask.getFTaskId())){
list.remove(e);
}
}
});
//计算加工总数
double sumWeight = list.stream().mapToDouble(TaskDetHis::getWeight).sum();

12
6.program/wms-empty/src/main/java/com/mt/wms/empty/vo/CurrTaskVo.java
Ver arquivo

@ -1,5 +1,6 @@
package com.mt.wms.empty.vo;
import com.baomidou.mybatisplus.annotation.TableField;
import com.mt.wms.core.base.BaseVo;
import com.mt.wms.core.vo.PageVo;
import io.swagger.annotations.ApiModel;
@ -126,4 +127,15 @@ public class CurrTaskVo extends BaseVo implements PageVo.ConvertVo {
*/
@ApiModelProperty("location_name")
private String locationName;
/**
* 是否自动执行： 0手动，1自动，如果是自动任务这里要监控进出和到缓存区的调度任务
*/
@TableField("is_auto")
private Integer isAuto;
/**
* 任务流程ID，关联流程表：t_auto_exe_task
*/
@TableField("auto_exe_task_id")
private Long autoExeTaskId;
}