Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-12 21:02:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

excel读取修改，api导入房间名添加

Browse Source
This commit is contained in:
lym
2025-01-17 16:39:05 +08:00
parent 2025f35965
commit addbf16eed
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/api/webcad/ApiTypeRealize.java
+2 -2
View File
@@ -975,8 +975,8 @@ public class ApiTypeRealize {
.filterType("") .filterType("")
.remark(remark) .remark(remark)
.organId(organId) .organId(organId)
// .roomName(bodyInfos.get(plate.getLong(ProduceApiConstants.BD_BOX_ID)).getRoomName()) .roomName(plate.getString(ProduceApiConstants.BD_ROOM_NAME))
.bodyName(plate.getString(ProduceApiConstants.BD_BOX_ID)) // 之后再改成名称 .bodyName(plate.getString(ProduceApiConstants.BD_BOX_NAME)) // 之后再改成名称
.customPlateNoBuilder(new StringBuilder()) .customPlateNoBuilder(new StringBuilder())
.build(); .build();
partsInfos.put(plate.getString(ProduceApiConstants.BD_BLOCK_NO), plateInfo); partsInfos.put(plate.getString(ProduceApiConstants.BD_BLOCK_NO), plateInfo);
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/excel/ExcelCheckListUtil.java
+2 -2
View File
@@ -337,8 +337,8 @@ public class ExcelCheckListUtil {
isNotEmptyAndBack(vo.getGoodsThickness(), errList, "板材厚度", flag); isNotEmptyAndBack(vo.getGoodsThickness(), errList, "板材厚度", flag);
isEmptyAndPositiveNumberSize(vo.getGoodsThickness(), Double.class, 5, 3, errList, "板材厚度", flag); isEmptyAndPositiveNumberSize(vo.getGoodsThickness(), Double.class, 5, 3, errList, "板材厚度", flag);
// 房间、柜体、板名称 不可以为空 // 房间、柜体、板名称 不可以为空
isEmpty(vo.getRoomsName(), errList, "房间名称", 64, flag); isEmptyAndSize(vo.getRoomsName(), 64, errList, "房间名称" , flag);
isEmpty(vo.getCabinetsName(), errList, "柜体名称", 64, flag); isEmptyAndSize(vo.getCabinetsName(), 64, errList, "柜体名称", flag);
isEmpty(vo.getName(), errList, "板材名称", 64, flag); isEmpty(vo.getName(), errList, "板材名称", 64, flag);
//成品长、成品宽、拆单长、拆单宽、厚、左封边、右封边、上封边、下封边 不能为空 //成品长、成品宽、拆单长、拆单宽、厚、左封边、右封边、上封边、下封边 不能为空
isNotEmptyAndBack(vo.getHeight(), errList, "成品长度", flag); isNotEmptyAndBack(vo.getHeight(), errList, "成品长度", flag);
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/excel/LargeFilesUtils.java
+3 -3
View File
@@ -101,17 +101,17 @@ public class LargeFilesUtils {
private OrderPlateImportExcelVO createOrderPlateFromRow(Row row) { private OrderPlateImportExcelVO createOrderPlateFromRow(Row row) {
OrderPlateImportExcelVO vo = new OrderPlateImportExcelVO(); OrderPlateImportExcelVO vo = new OrderPlateImportExcelVO();
int columnIndex = 0;
for (Cell cell : row) { for (Cell cell : row) {
setOrderPlateProperty(vo, cell, columnIndex++); setOrderPlateProperty(vo, cell);
} }
return vo; return vo;
} }
private void setOrderPlateProperty(OrderPlateImportExcelVO vo, Cell cell, int index) { private void setOrderPlateProperty(OrderPlateImportExcelVO vo, Cell cell) {
String value = cell.getStringCellValue(); String value = cell.getStringCellValue();
int index = cell.getColumnIndex();
switch (index) { switch (index) {
case 0: case 0:
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/excel/OrderPlateImportExcelVO.java
+3 -3
View File
@@ -117,9 +117,9 @@ public class OrderPlateImportExcelVO {
@JsonIgnore @JsonIgnore
private String cabinetsName; private String cabinetsName;
@ExcelIgnore // @ExcelIgnore
@JsonIgnore // @JsonIgnore
private String synthesis; // private String synthesis;
@JsonIgnore @JsonIgnore
@ExcelProperty(value = "加工组类型") @ExcelProperty(value = "加工组类型")