|
|
|
@ -15,11 +15,13 @@ import com.chanko.yunxi.mes.module.biz.controller.admin.taskdispatch.vo.*;
|
|
|
|
|
import com.chanko.yunxi.mes.module.biz.dal.dataobject.material.MaterialDO;
|
|
|
|
|
import com.chanko.yunxi.mes.module.biz.dal.dataobject.systemparameters.SystemParametersDO;
|
|
|
|
|
import com.chanko.yunxi.mes.module.biz.dal.dataobject.taskdispatch.TaskDispatchDetailOwnerDO;
|
|
|
|
|
import com.chanko.yunxi.mes.module.biz.dal.dataobject.taskdispatchdetailratio.TaskDispatchDetailRatioDO;
|
|
|
|
|
import com.chanko.yunxi.mes.module.biz.dal.dataobject.workshop.WorkshopDO;
|
|
|
|
|
import com.chanko.yunxi.mes.module.biz.dal.mysql.systemparameters.SystemParametersMapper;
|
|
|
|
|
import com.chanko.yunxi.mes.module.biz.dal.mysql.taskdispatch.TaskDispatchDetailMapper;
|
|
|
|
|
import com.chanko.yunxi.mes.module.biz.dal.mysql.taskdispatch.TaskDispatchDetailOwnerMapper;
|
|
|
|
|
import com.chanko.yunxi.mes.module.biz.dal.mysql.taskdispatch.TaskDispatchMapper;
|
|
|
|
|
import com.chanko.yunxi.mes.module.biz.dal.mysql.taskdispatchdetailratio.TaskDispatchDetailRatioMapper;
|
|
|
|
|
import com.chanko.yunxi.mes.module.biz.dal.mysql.taskreport.TaskReportMapper;
|
|
|
|
|
import com.chanko.yunxi.mes.module.biz.dal.dataobject.serialnumber.SerialNumberDO;
|
|
|
|
|
import com.chanko.yunxi.mes.module.biz.dal.dataobject.taskdispatch.TaskDispatchDO;
|
|
|
|
@ -89,6 +91,9 @@ public class TaskDispatchServiceImpl implements TaskDispatchService {
|
|
|
|
|
@Resource
|
|
|
|
|
private OperateLogFrameworkService operateLogFrameworkService;
|
|
|
|
|
|
|
|
|
|
@Resource
|
|
|
|
|
private TaskDispatchDetailRatioMapper taskDispatchDetailRatioMapper;
|
|
|
|
|
|
|
|
|
|
@Resource
|
|
|
|
|
private HttpServletRequest request;
|
|
|
|
|
|
|
|
|
@ -441,8 +446,26 @@ public class TaskDispatchServiceImpl implements TaskDispatchService {
|
|
|
|
|
List<TaskDispatchDetailOwnerDO> updateList = list.stream().filter(o -> o.getId() != null).collect(Collectors.toList());
|
|
|
|
|
List<TaskDispatchDetailOwnerDO> insertList = list.stream().filter(o -> o.getId() == null).collect(Collectors.toList());
|
|
|
|
|
|
|
|
|
|
if(!updateList.isEmpty()) taskDispatchDetailOwnerMapper.updateBatch(updateList);
|
|
|
|
|
if(!insertList.isEmpty()) taskDispatchDetailOwnerMapper.insertBatch(insertList);
|
|
|
|
|
// if(!insertList.isEmpty()) taskDispatchDetailOwnerMapper.insertBatch(insertList);
|
|
|
|
|
// if(!updateList.isEmpty()) taskDispatchDetailOwnerMapper.updateBatch(updateList);
|
|
|
|
|
insertList.forEach(vo ->{
|
|
|
|
|
taskDispatchDetailOwnerMapper.insert(vo);
|
|
|
|
|
vo.getRatioSettings().forEach(ro->{
|
|
|
|
|
ro.setDetailOwnerId(vo.getId());
|
|
|
|
|
taskDispatchDetailRatioMapper.insert(BeanUtils.toBean(ro, TaskDispatchDetailRatioDO.class));
|
|
|
|
|
});
|
|
|
|
|
});
|
|
|
|
|
updateList.forEach(vo ->{
|
|
|
|
|
taskDispatchDetailOwnerMapper.updateById(vo);
|
|
|
|
|
vo.getRatioSettings().forEach(ro->{
|
|
|
|
|
ro.setDetailOwnerId(vo.getId());
|
|
|
|
|
if(ro.getId()!=null && ro.getId()>0){
|
|
|
|
|
taskDispatchDetailRatioMapper.updateById(BeanUtils.toBean(ro, TaskDispatchDetailRatioDO.class));
|
|
|
|
|
}else{
|
|
|
|
|
taskDispatchDetailRatioMapper.insert(BeanUtils.toBean(ro, TaskDispatchDetailRatioDO.class));
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
// 获取派工单全部明细
|
|
|
|
|
List<TaskDispatchDetailOwnerDO> detailOwnerList = taskDispatchDetailOwnerMapper.selectListByDispatchId(dispatchId);
|
|
|
|
|