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

禅道bug#1705修复：excel导入拆单员不正确、excel/xml排版面不正确

Browse Source
This commit is contained in:
gaoqr
2026-06-16 18:02:18 +08:00
parent 9f9a7db9da
commit 98c42b69bd
3 changed files with 3 additions and 5 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/files/excel/DefaultOrderImportExcelListener.java
+1 -1
View File
@@ -267,7 +267,7 @@ public final class DefaultOrderImportExcelListener extends AnalysisEventListener
if (4 == rowIndex) { if (4 == rowIndex) {
validOrderInfoLength(leftKey, leftVal, 64); validOrderInfoLength(leftKey, leftVal, 64);
validOrderInfoLength(rightKey, rightVal, 255); validOrderInfoLength(rightKey, rightVal, 255);
orderDO.setSplitter(StringUtils.isNotEmpty(leftVal) ? leftKey : EMPTY_STRING); orderDO.setSplitter(StringUtils.isNotEmpty(leftVal) ? leftVal : EMPTY_STRING);
orderDO.setRemark(rightVal); orderDO.setRemark(rightVal);
} }
orderDO.setDataType(DataTypeEnum.FILE_IMPORT.getStatus()); orderDO.setDataType(DataTypeEnum.FILE_IMPORT.getStatus());
cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/DefaultExcelOrderImportFactory.java
+1 -2
View File
@@ -704,7 +704,7 @@ public class DefaultExcelOrderImportFactory {
.reservedEdgeRight(BigDecimal.ZERO) .reservedEdgeRight(BigDecimal.ZERO)
.reservedEdgeUp(BigDecimal.ZERO) .reservedEdgeUp(BigDecimal.ZERO)
.reservedEdgeDown(BigDecimal.ZERO) .reservedEdgeDown(BigDecimal.ZERO)
.holeFace(Integer.valueOf(typographyDTO.getValue())) .holeArrange(Integer.valueOf(typographyDTO.getValue()))
.texture(Integer.valueOf(grainDTO.getValue())) .texture(Integer.valueOf(grainDTO.getValue()))
.area(tempDataDO.getArea()) .area(tempDataDO.getArea())
.openDoorType(Integer.valueOf(doorDTO.getValue())) .openDoorType(Integer.valueOf(doorDTO.getValue()))
@@ -717,7 +717,6 @@ public class DefaultExcelOrderImportFactory {
.bodyName(bodyName) .bodyName(bodyName)
.customPlateNoBuilder(new StringBuilder()) .customPlateNoBuilder(new StringBuilder())
.organId(organId) .organId(organId)
.holeArrange(0)
.holeFace(0) .holeFace(0)
.unregularPointCount(0) .unregularPointCount(0)
.frontHoleCount(0) .frontHoleCount(0)
cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/DefaultXmlOrderImportFactory.java
+1 -2
View File
@@ -530,7 +530,7 @@ public class DefaultXmlOrderImportFactory {
.reservedEdgeDown(BigDecimal.ZERO) .reservedEdgeDown(BigDecimal.ZERO)
.area(area) .area(area)
.texture(Integer.valueOf(DictFrameworkUtils.parseDictDataValue(DictTypeConstants.GRAIN_TYPE, blockXmlVO.getTexture()))) .texture(Integer.valueOf(DictFrameworkUtils.parseDictDataValue(DictTypeConstants.GRAIN_TYPE, blockXmlVO.getTexture())))
.holeFace(Integer.valueOf(DictFrameworkUtils.parseDictDataValue(DictTypeConstants.TYPOGRAPHY_TYPE, blockXmlVO.getLayoutFace()))) .holeArrange(Integer.valueOf(DictFrameworkUtils.parseDictDataValue(DictTypeConstants.TYPOGRAPHY_TYPE, blockXmlVO.getLayoutFace())))
.isDoor(doorType != 0) .isDoor(doorType != 0)
.openDoorType(doorType) .openDoorType(doorType)
.isSculpt(false) .isSculpt(false)
@@ -539,7 +539,6 @@ public class DefaultXmlOrderImportFactory {
.isSide2v(false) .isSide2v(false)
.customPlateNoBuilder(new StringBuilder()) .customPlateNoBuilder(new StringBuilder())
.organId(organId) .organId(organId)
.holeArrange(0)
.holeFace(0) .holeFace(0)
.unregularPointCount(0) .unregularPointCount(0)
.frontHoleCount(0) .frontHoleCount(0)