rakor
/
nflg_project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

调整

This commit is contained in:
BF-202309241046\Administrator 2023-12-10 14:56:10 +08:00
parent 47672c0f50
commit 314f98c468
3 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/excel/ExportDeviceHelper.java
View File

@ -333,7 +333,12 @@ public class ExportDeviceHelper {
ImportExcelField excelField = new ImportExcelField(); ImportExcelField excelField = new ImportExcelField();
excelField.setCellFirst(optionParentDrawingNoName); excelField.setCellFirst(optionParentDrawingNoName);
excelField.setCellSecond(String.format("%s %s", optionChildDrawingNoName, opChildName)); excelField.setCellSecond(String.format("%s %s", optionChildDrawingNoName, opChildName));
excelField.setCellThird(String.format("%s %s：（%s）", item3.getDrawingNo(), item3.getMaterialName(), item3.getChooseStatus() == 1 ? "标配" : "可选")); if(StrUtil.isEmpty(item3.getDrawingNo())) {
excelField.setCellThird(String.format("%s：（%s）", item3.getMaterialName(), item3.getChooseStatus() == 1 ? "标配" : "可选"));
}else {
excelField.setCellThird(String.format("%s：%s（%s）", item3.getDrawingNo(), item3.getMaterialName(), item3.getChooseStatus() == 1 ? "标配" : "可选"));
}
items.add(excelField); items.add(excelField);
} }

4
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/OptionalEbomConfigListQuery.java
View File

@ -23,11 +23,11 @@ public class OptionalEbomConfigListQuery extends BasePageQuery implements Ser
@ApiModelProperty(value = "开始时间") @ApiModelProperty(value = "开始时间")
private Date startDate; private String startDate;
@ApiModelProperty(value = "结束时间") @ApiModelProperty(value = "结束时间")
private Date endDate; private String endDate;
//状态 //状态
private Integer editStatus; private Integer editStatus;

9
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/OptionalExcelService.java
View File

@ -63,9 +63,16 @@ public class OptionalExcelService {
} }
optionalEbomImportLevel2Dto.getChild().add(levelDto3); optionalEbomImportLevel2Dto.getChild().add(levelDto3);
String cloumn3=item.getCellThird().trim();
String materialName;
if(cloumn3.contains("：")) {
String[] optionName1 = item.getCellThird().trim().split("："); String[] optionName1 = item.getCellThird().trim().split("：");
String materialName = optionName1[1]; materialName = optionName1[1];
levelDto3.setDrawingNo(optionName1[0]); levelDto3.setDrawingNo(optionName1[0]);
}else{
materialName=cloumn3;
}
// levelDto3.setMaterialName(optionName1[1]); // levelDto3.setMaterialName(optionName1[1]);
levelDto3.setLineNo(item.getLineNo()); levelDto3.setLineNo(item.getLineNo());