diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java index 75221f00c..7ba14ad4a 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java @@ -569,6 +569,8 @@ public class PlateServiceImpl implements PlateService { Map orderGoodsPlanPlateNumAndAreaRespVOMap = new HashMap<>(); + Long organId = getUserOrganId(); + // 组装新增数据 reqVO.forEach(f -> { @@ -585,7 +587,7 @@ public class PlateServiceImpl implements PlateService { // 生成板编号 long obtainingTime = idWorker.obtainingTime(); - String plateNo = "1" + obtainingTime + Long.toString(idWorker.nextId()).substring(2); + String plateNo = String.valueOf(organId) + obtainingTime + Long.toString(idWorker.nextId()).substring(2); String remake1 = f.getRemake1() == null ? "" : f.getRemake1() + ";"; @@ -602,6 +604,7 @@ public class PlateServiceImpl implements PlateService { plateDOS.add(PlateDO.builder() .id(plateId) .orderId(orderId) + .organId(organId) .name(f.getName()) .plateNo(plateNo) .type(OrderPlateTypeEnum.SELFINCREASINGBOARD.getType()) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/api/webcad/ApiTypeRealize.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/api/webcad/ApiTypeRealize.java index 962630b79..cca832a37 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/api/webcad/ApiTypeRealize.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/api/webcad/ApiTypeRealize.java @@ -984,7 +984,7 @@ public class ApiTypeRealize { .id(plateId) .orderId(orderId) .name(plate.getString(ProduceApiConstants.BD_BOARD_NAME)) - .plateNo("1" + obtainingTime + Long.toString(plateNo).substring(2)) + .plateNo(String.valueOf(organId) + obtainingTime + Long.toString(plateNo).substring(2)) .type(type) .goodsId(plate.getLong(ProduceApiConstants.BD_GOODS_ID)) .splitHeight(BigDecimal.valueOf(plate.getDouble(ProduceApiConstants.BD_SPLIT_HEIGHT))) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/excel/ExcelTypeRealize.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/excel/ExcelTypeRealize.java index 53994c46c..53c9a0605 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/excel/ExcelTypeRealize.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/excel/ExcelTypeRealize.java @@ -293,7 +293,7 @@ public class ExcelTypeRealize { .plateNo(combination.getPlateNo()) .goodsId(combination.getGoodId()) .width(BigDecimal.valueOf(Double.parseDouble(combination.getWidth()))) - .plateNo("1" + obtainingTime + Long.toString(plateNo).substring(2)) + .plateNo(String.valueOf(organId) + obtainingTime + Long.toString(plateNo).substring(2)) .height(BigDecimal.valueOf(Double.parseDouble(combination.getHeight()))) .thickness(BigDecimal.valueOf(Double.parseDouble(combination.getThickness()))) .splitWidth(BigDecimal.valueOf(Double.parseDouble(combination.getSplitWidth()))) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/xml/XmlTypeRealize.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/xml/XmlTypeRealize.java index 33fb5e7ec..073a358c1 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/xml/XmlTypeRealize.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/xml/XmlTypeRealize.java @@ -865,7 +865,7 @@ public class XmlTypeRealize { .organId(organId) .orderId(orderId) .name(blockXmlVO.getName()) - .plateNo("1" + obtainingTime + Long.toString(plateNo).substring(2)) + .plateNo(String.valueOf(organId) + obtainingTime + Long.toString(plateNo).substring(2)) .type(plateType) .goodsId(goodsId) .width(BigDecimal.valueOf(Double.parseDouble(blockXmlVO.getWidth()))) diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/DefaultExcelOrderImportFactory.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/DefaultExcelOrderImportFactory.java index 5c7751dce..3a1dae42c 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/DefaultExcelOrderImportFactory.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/DefaultExcelOrderImportFactory.java @@ -674,7 +674,7 @@ public class DefaultExcelOrderImportFactory { .name(combination.getName()) .type(OrderPlateTypeEnum.LAYERBOARD.getType()) .goodsId(goodsId) - .plateNo("1" + String.format("%05d", organId) + obtainingTime + Long.toString(plateNo).substring(2)) + .plateNo(String.valueOf(organId) + obtainingTime + Long.toString(plateNo).substring(2)) .height(BigDecimal.valueOf(Double.parseDouble(height))) .width(BigDecimal.valueOf(Double.parseDouble(width))) .thickness(BigDecimal.valueOf(Double.parseDouble(combination.getThickness()))) diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/DefaultXmlOrderImportFactory.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/DefaultXmlOrderImportFactory.java index d541d264c..460bb85f0 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/DefaultXmlOrderImportFactory.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/DefaultXmlOrderImportFactory.java @@ -515,7 +515,7 @@ public class DefaultXmlOrderImportFactory { .id(plateId) .orderId(orderId) .name(blockXmlVO.getName()) - .plateNo("1" + String.format("%05d", organId) + obtainingTime + Long.toString(plateNo).substring(2)) + .plateNo(String.valueOf(organId) + obtainingTime + Long.toString(plateNo).substring(2)) .type(plateType) .goodsId(goodsId) .width(BigDecimal.valueOf(Double.parseDouble(blockXmlVO.getWidth()))) diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/ProducingOrderImportFactory.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/ProducingOrderImportFactory.java index 95d7545ad..48f11d829 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/ProducingOrderImportFactory.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/ProducingOrderImportFactory.java @@ -1269,7 +1269,7 @@ public class ProducingOrderImportFactory { .id(plateId) .orderId(orderId) .name(block.getName()) - .plateNo("1" + String.format("%05d", organId) + obtainingTime + Long.toString(plateNo).substring(2)) + .plateNo(String.valueOf(organId) + obtainingTime + Long.toString(plateNo).substring(2)) .type(block.getType()) .goodsId(goodsDO.getId()) .width(getBigDecimalOrNull(block.getWidth())) diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportAsyncFactory.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportAsyncFactory.java index b25b7926e..9855db9e3 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportAsyncFactory.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportAsyncFactory.java @@ -797,7 +797,7 @@ public class WebCadOrderImportAsyncFactory { .id(plateId) .orderId(orderId) .name(block.getName()) - .plateNo("1" + String.format("%05d", organId) + obtainingTime + Long.toString(plateNo).substring(2)) + .plateNo(String.valueOf(organId) + obtainingTime + Long.toString(plateNo).substring(2)) .type(block.getType()) .goodsId(goodsDO.getId()) .width(getBigDecimalOrNull(block.getWidth())) diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java index e9b1cf9c8..ca2935f14 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java @@ -978,7 +978,7 @@ public class WebCadOrderImportFactory { .id(plateId) .orderId(orderId) .name(block.getName()) - .plateNo("1" + String.format("%05d", organId) + obtainingTime + Long.toString(plateNo).substring(2)) + .plateNo(String.valueOf(organId) + obtainingTime + Long.toString(plateNo).substring(2)) .type(block.getType()) .goodsId(goodsDO.getId()) .width(getBigDecimalOrNull(block.getWidth()))