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文件导入板编号补充组织编号、xml文件导入板编号补充组织编号/开料长宽厚取值修正；

Browse Source
This commit is contained in:
gaoqr
2026-06-17 11:52:48 +08:00
parent 044e3ee9a4
commit de1fc23784
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/DefaultExcelOrderImportFactory.java
+2 -3
View File
@@ -686,12 +686,11 @@ public class DefaultExcelOrderImportFactory {
.id(plateId) .id(plateId)
.orderId(orderId) .orderId(orderId)
.name(combination.getName()) .name(combination.getName())
.plateNo(combination.getPlateNo())
.type(OrderPlateTypeEnum.LAYERBOARD.getType()) .type(OrderPlateTypeEnum.LAYERBOARD.getType())
.goodsId(goodsId) .goodsId(goodsId)
.width(BigDecimal.valueOf(Double.parseDouble(width))) .plateNo(String.format("%05d", organId) + ((obtainingTime) + Long.toString(plateNo).substring(2)))
.plateNo(((obtainingTime) + Long.toString(plateNo).substring(2)))
.height(BigDecimal.valueOf(Double.parseDouble(height))) .height(BigDecimal.valueOf(Double.parseDouble(height)))
.width(BigDecimal.valueOf(Double.parseDouble(width)))
.thickness(BigDecimal.valueOf(Double.parseDouble(combination.getThickness()))) .thickness(BigDecimal.valueOf(Double.parseDouble(combination.getThickness())))
.splitWidth(BigDecimal.valueOf(NumberUtil.parseDouble(combination.getSplitWidth()))) .splitWidth(BigDecimal.valueOf(NumberUtil.parseDouble(combination.getSplitWidth())))
.splitHeight(BigDecimal.valueOf(NumberUtil.parseDouble(combination.getSplitHeight()))) .splitHeight(BigDecimal.valueOf(NumberUtil.parseDouble(combination.getSplitHeight())))
cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/DefaultXmlOrderImportFactory.java
+4 -4
View File
@@ -515,15 +515,15 @@ public class DefaultXmlOrderImportFactory {
.id(plateId) .id(plateId)
.orderId(orderId) .orderId(orderId)
.name(blockXmlVO.getName()) .name(blockXmlVO.getName())
.plateNo((obtainingTime) + Long.toString(plateNo).substring(2)) .plateNo(String.format("%05d", organId) + (obtainingTime) + Long.toString(plateNo).substring(2))
.type(plateType) .type(plateType)
.goodsId(goodsId) .goodsId(goodsId)
.width(BigDecimal.valueOf(Double.parseDouble(blockXmlVO.getWidth()))) .width(BigDecimal.valueOf(Double.parseDouble(blockXmlVO.getWidth())))
.height(BigDecimal.valueOf(Double.parseDouble(blockXmlVO.getLength()))) .height(BigDecimal.valueOf(Double.parseDouble(blockXmlVO.getLength())))
.thickness(BigDecimal.valueOf(Double.parseDouble(blockXmlVO.getThickness()))) .thickness(BigDecimal.valueOf(Double.parseDouble(blockXmlVO.getThickness())))
.splitHeight(BigDecimal.valueOf(Double.parseDouble(blockXmlVO.getLength()))) .splitHeight(BigDecimal.valueOf(Double.parseDouble(blockXmlVO.getCuttingLength())))
.splitThickness(BigDecimal.valueOf(Double.parseDouble(blockXmlVO.getThickness()))) .splitThickness(BigDecimal.valueOf(Double.parseDouble(blockXmlVO.getCuttingThickness())))
.splitWidth(BigDecimal.valueOf(Double.parseDouble(blockXmlVO.getWidth()))) .splitWidth(BigDecimal.valueOf(Double.parseDouble(blockXmlVO.getCuttingWidth())))
.reservedEdgeLeft(BigDecimal.ZERO) .reservedEdgeLeft(BigDecimal.ZERO)
.reservedEdgeRight(BigDecimal.ZERO) .reservedEdgeRight(BigDecimal.ZERO)
.reservedEdgeUp(BigDecimal.ZERO) .reservedEdgeUp(BigDecimal.ZERO)