|
|
|
@ -27,6 +27,7 @@ import java.util.ArrayList;
|
|
|
|
|
import java.util.Arrays;
|
|
|
|
|
import java.util.List;
|
|
|
|
|
import java.util.UUID;
|
|
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* <p>
|
|
|
|
@ -146,7 +147,10 @@ public class RouterServiceImpl extends ServiceImpl<RouterMapper, Router> impleme
|
|
|
|
|
|
|
|
|
|
for (int i = 0; i < disRouter.getDisRouterStepDtoList().size(); i++) {
|
|
|
|
|
DisRouterStepDto routerStepDto = routerStepDtoList.get(i);
|
|
|
|
|
String stepId = "90" + routerStepDto.getStep();
|
|
|
|
|
String stepId = routerStepDto.getStep();
|
|
|
|
|
if (stepId.substring(0,2) != "90"){
|
|
|
|
|
stepId = "90" + stepId;
|
|
|
|
|
}
|
|
|
|
|
if (StringUtil.isBlank(entryRouterStep)) {
|
|
|
|
|
entryRouterStep = stepId;
|
|
|
|
|
}
|
|
|
|
@ -203,9 +207,8 @@ public class RouterServiceImpl extends ServiceImpl<RouterMapper, Router> impleme
|
|
|
|
|
customFields = new CustomFields();
|
|
|
|
|
customFields.setHandle(routerOperationBO);
|
|
|
|
|
customFields.setAttribute("OUT_SOURCE");
|
|
|
|
|
customFields.setValue("N");
|
|
|
|
|
customFields.setValue(stepId);
|
|
|
|
|
customFieldsList.add(customFields);
|
|
|
|
|
//
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
RouterStepcontent routerStepcontent=new RouterStepcontent();
|
|
|
|
@ -219,8 +222,12 @@ public class RouterServiceImpl extends ServiceImpl<RouterMapper, Router> impleme
|
|
|
|
|
}catch (Exception e){
|
|
|
|
|
throw BusinessException.build(e.getMessage().trim());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//图片路径
|
|
|
|
|
try {
|
|
|
|
|
this.fileUpload(disRouter,routerBo,stepId);
|
|
|
|
|
}catch (Exception e){
|
|
|
|
|
throw BusinessException.build("图片保存失败");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
String lastStepId = "9999";
|
|
|
|
@ -257,12 +264,6 @@ public class RouterServiceImpl extends ServiceImpl<RouterMapper, Router> impleme
|
|
|
|
|
//工艺路线创建
|
|
|
|
|
routerConfigurationService.createRouter(routerConfiguration);
|
|
|
|
|
|
|
|
|
|
//图片路径
|
|
|
|
|
try {
|
|
|
|
|
this.fileUpload(disRouter,routerBo);
|
|
|
|
|
}catch (Exception e){
|
|
|
|
|
throw BusinessException.build("图片保存失败");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//自定义数据保存
|
|
|
|
|
if (customFieldsList != null && customFieldsList.size() > 0) {
|
|
|
|
@ -281,29 +282,33 @@ public class RouterServiceImpl extends ServiceImpl<RouterMapper, Router> impleme
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public void fileUpload(DisRouter disRouter,String routerBo) {
|
|
|
|
|
public void fileUpload(DisRouter disRouter,String routerBo,String stepId) {
|
|
|
|
|
String user = CommonMethods.getUser();
|
|
|
|
|
LocalDateTime now = LocalDateTime.now();
|
|
|
|
|
String site = CommonMethods.getSite();
|
|
|
|
|
String status = "N";
|
|
|
|
|
String status = stepId;
|
|
|
|
|
List<String> name = Arrays.asList(disRouter.getFileName().split(","));
|
|
|
|
|
name = name.stream().filter(item -> item.split("/")[0].equals(stepId)).collect(Collectors.toList());
|
|
|
|
|
if(name.size() != 0){
|
|
|
|
|
UploadPicturesDto uploadPictures = new UploadPicturesDto();
|
|
|
|
|
uploadPictures.setHandle("UploadPicturesBO:"+site+","+disRouter.getRouter()+"_"+disRouter.getAbnormalNo()+","+status);
|
|
|
|
|
uploadPictures.setSite(site);
|
|
|
|
|
uploadPictures.setPicturePath(disRouter.getFilePath());
|
|
|
|
|
//文件路径 = 物料编号异常单号 + 步骤
|
|
|
|
|
String filePath = disRouter.getFilePath() + "/" + status;
|
|
|
|
|
uploadPictures.setPicturePath(filePath);
|
|
|
|
|
StringBuilder pictureAddress = new StringBuilder();
|
|
|
|
|
for (int i = 0; i <= name.size() -1; i++) {
|
|
|
|
|
if(i != name.size() -1){
|
|
|
|
|
pictureAddress.append(disRouter.getFilePath()).append("/").append(name.get(i)).append(",");
|
|
|
|
|
pictureAddress.append(filePath).append("/").append(name.get(i).split("/")[1]).append(",");
|
|
|
|
|
}else{
|
|
|
|
|
pictureAddress.append(disRouter.getFilePath()).append("/").append(name.get(i));
|
|
|
|
|
pictureAddress.append(filePath).append("/").append(name.get(i).split("/")[1]);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
uploadPictures.setStatus(status);
|
|
|
|
|
uploadPictures.setPictureAddress(pictureAddress.toString());
|
|
|
|
|
uploadPictures.setObjectBo(routerBo);
|
|
|
|
|
uploadPictures.setNum(disRouter.getFileNum());
|
|
|
|
|
Integer num = name.size();
|
|
|
|
|
uploadPictures.setNum(num.toString());
|
|
|
|
|
uploadPictures.setType("Repair");
|
|
|
|
|
uploadPictures.setCreatedUser(user);
|
|
|
|
|
uploadPictures.setCreatedDateTime(now);
|
|
|
|
|