|
|
@ -29,6 +29,7 @@ import com.chanko.yunxi.mes.module.biz.enums.*;
|
|
|
|
import com.chanko.yunxi.mes.module.biz.manager.CrossOrderManager;
|
|
|
|
import com.chanko.yunxi.mes.module.biz.manager.CrossOrderManager;
|
|
|
|
import com.chanko.yunxi.mes.module.biz.service.serialnumber.SerialNumberService;
|
|
|
|
import com.chanko.yunxi.mes.module.biz.service.serialnumber.SerialNumberService;
|
|
|
|
import com.chanko.yunxi.mes.module.system.dal.dataobject.user.AdminUserDO;
|
|
|
|
import com.chanko.yunxi.mes.module.system.dal.dataobject.user.AdminUserDO;
|
|
|
|
|
|
|
|
import com.chanko.yunxi.mes.module.system.dal.mysql.user.AdminUserMapper;
|
|
|
|
import com.chanko.yunxi.mes.module.system.service.user.AdminUserService;
|
|
|
|
import com.chanko.yunxi.mes.module.system.service.user.AdminUserService;
|
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
@ -40,10 +41,7 @@ import java.math.BigDecimal;
|
|
|
|
import java.math.RoundingMode;
|
|
|
|
import java.math.RoundingMode;
|
|
|
|
import java.text.SimpleDateFormat;
|
|
|
|
import java.text.SimpleDateFormat;
|
|
|
|
import java.time.LocalDateTime;
|
|
|
|
import java.time.LocalDateTime;
|
|
|
|
import java.util.Arrays;
|
|
|
|
import java.util.*;
|
|
|
|
import java.util.Date;
|
|
|
|
|
|
|
|
import java.util.List;
|
|
|
|
|
|
|
|
import java.util.Map;
|
|
|
|
|
|
|
|
import java.util.stream.Collectors;
|
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
|
|
|
|
import static com.chanko.yunxi.mes.framework.common.exception.util.ServiceExceptionUtil.exception;
|
|
|
|
import static com.chanko.yunxi.mes.framework.common.exception.util.ServiceExceptionUtil.exception;
|
|
|
@ -76,6 +74,8 @@ public class TaskDispatchServiceImpl implements TaskDispatchService {
|
|
|
|
|
|
|
|
|
|
|
|
@Resource
|
|
|
|
@Resource
|
|
|
|
private WorkshopMapper workshopMapper;
|
|
|
|
private WorkshopMapper workshopMapper;
|
|
|
|
|
|
|
|
@Resource
|
|
|
|
|
|
|
|
private AdminUserMapper adminUserMapper;
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
@ -227,7 +227,22 @@ public class TaskDispatchServiceImpl implements TaskDispatchService {
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public List<TaskDispatchDetailDO> getTaskDispatchDetailListByDispatchId(Long dispatchId) {
|
|
|
|
public List<TaskDispatchDetailDO> getTaskDispatchDetailListByDispatchId(Long dispatchId) {
|
|
|
|
return taskDispatchDetailMapper.selectListByDispatchId(dispatchId);
|
|
|
|
List<TaskDispatchDetailDO> result = taskDispatchDetailMapper.selectListByDispatchId(dispatchId);
|
|
|
|
|
|
|
|
result.forEach(map ->{
|
|
|
|
|
|
|
|
List<Long> ids = new ArrayList<>();
|
|
|
|
|
|
|
|
List<String> names = new ArrayList<>();
|
|
|
|
|
|
|
|
if(map.getOwnerIds() != null){
|
|
|
|
|
|
|
|
Arrays.stream(map.getOwnerIds().split(",")).forEach(item ->{
|
|
|
|
|
|
|
|
ids.add(Long.parseLong(item.trim()));
|
|
|
|
|
|
|
|
names.add(adminUserMapper.selectById(Long.parseLong(item.trim())).getNickname());
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
map.setOwners(ids);
|
|
|
|
|
|
|
|
map.setOwnerNames(names);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
@ -380,7 +395,10 @@ public class TaskDispatchServiceImpl implements TaskDispatchService {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
private void createTaskDispatchDetailList(Long dispatchId, List<TaskDispatchDetailDO> list) {
|
|
|
|
private void createTaskDispatchDetailList(Long dispatchId, List<TaskDispatchDetailDO> list) {
|
|
|
|
list.forEach(o -> o.setDispatchId(dispatchId));
|
|
|
|
list.forEach(o -> {
|
|
|
|
|
|
|
|
o.setDispatchId(dispatchId);
|
|
|
|
|
|
|
|
o.setOwnerIds(o.getOwners().toString().replace("[","").replace("]",""));
|
|
|
|
|
|
|
|
});
|
|
|
|
// 分组更新与插入
|
|
|
|
// 分组更新与插入
|
|
|
|
List<TaskDispatchDetailDO> updateList = list.stream().filter(o -> o.getId() != null).collect(Collectors.toList());
|
|
|
|
List<TaskDispatchDetailDO> updateList = list.stream().filter(o -> o.getId() != null).collect(Collectors.toList());
|
|
|
|
List<TaskDispatchDetailDO> insertList = list.stream().filter(o -> o.getId() == null).collect(Collectors.toList());
|
|
|
|
List<TaskDispatchDetailDO> insertList = list.stream().filter(o -> o.getId() == null).collect(Collectors.toList());
|
|
|
|