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 bc7af522f..422b0dc2c 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 @@ -1306,7 +1306,7 @@ public class PlateServiceImpl implements PlateService { @Override public OrderPlateWechatMiniProgramCadInfoRespVO getPlateInfoByPlateNo(String plateNo) { // 1、解析组织id,查询板件信息 - Integer organId = Integer.parseInt(plateNo.substring(0, 6), 16); + Integer organId = Integer.parseInt(plateNo.substring(0, 5)); organApi.validOrgan(organId.longValue()).checkError(); PlateDO plateDO = plateMapper.selectOne(new LambdaQueryWrapper() @@ -1372,7 +1372,7 @@ public class PlateServiceImpl implements PlateService { public OrderWechatMiniProgramCadInfoRespVO getOrderInfoByPlateNo(String plateNo) { OrderWechatMiniProgramCadInfoRespVO result = new OrderWechatMiniProgramCadInfoRespVO(); // 1、解析组织id,查询板件信息 - Integer organId = Integer.parseInt(plateNo.substring(0, 6), 16); + Integer organId = Integer.parseInt(plateNo.substring(0, 5)); Long organIdLong = organId.longValue(); organApi.validOrgan(organId.longValue()).checkError(); @@ -1403,7 +1403,7 @@ public class PlateServiceImpl implements PlateService { @Override public OrdersViewCadViewInfoRespVO getOrderDetailsByPlateNo(String plateNo, OrderWechatMiniProgramDetailReqVO reqVO) { // 1、解析组织id,查询板件信息 - Integer organId = Integer.parseInt(plateNo.substring(0, 6), 16); + Integer organId = Integer.parseInt(plateNo.substring(0, 5)); Long organIdLong = organId.longValue(); organApi.validOrgan(organId.longValue()).checkError(); 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 2f00bb705..6e1da25d5 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 @@ -780,7 +780,7 @@ public class WebCadOrderImportAsyncFactory { .id(plateId) .orderId(orderId) .name(block.getName()) - .plateNo(obtainingTime + Long.toString(plateNo).substring(2)) + .plateNo(String.format("%05d", 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 f7f632dd9..46e1a247e 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 @@ -977,7 +977,7 @@ public class WebCadOrderImportFactory { .id(plateId) .orderId(orderId) .name(block.getName()) - .plateNo(obtainingTime + Long.toString(plateNo).substring(2)) + .plateNo(String.format("%05d", organId) + obtainingTime + Long.toString(plateNo).substring(2)) .type(block.getType()) .goodsId(goodsDO.getId()) .width(getBigDecimalOrNull(block.getWidth()))