|
|
@@ -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(); |
|
|
|