mirror of
http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git
synced 2026-08-12 21:02:08 +08:00
webcad拆单补充正面孤岛造型数据
This commit is contained in:
+5
-3
@@ -1107,6 +1107,8 @@ public class WebCadOrderImportAsyncFactory {
|
||||
WebCadDataBlockReqVO.PointInfoDTO.ModelDetailDTO.OriginModelingDTO.OutlineDTO cadOutline = cadOriginModeling.getOutline();
|
||||
originModelingData.setOutline(getOriginModelingOutlineList(cadOutline));
|
||||
|
||||
originModelingData.setHoles(getModelingHoles(cadOriginModeling.getHoles()));
|
||||
|
||||
modelDetail.setOriginModeling(originModelingData);
|
||||
}
|
||||
List<WebCadDataBlockReqVO.PointInfoDTO.ModelDetailDTO.PointListDTO> pointList = cadModelDetail.getPointList();
|
||||
@@ -1234,7 +1236,7 @@ public class WebCadOrderImportAsyncFactory {
|
||||
|
||||
originModelingData.setOutline(getOriginModelingOutlineList(cadSideOriginModeling.getOutline()));
|
||||
|
||||
originModelingData.setHoles(getSideModelingHoles(cadSideOriginModeling.getHoles()));
|
||||
originModelingData.setHoles(getModelingHoles(cadSideOriginModeling.getHoles()));
|
||||
|
||||
modelDetail.setOriginModeling(originModelingData);
|
||||
}
|
||||
@@ -1250,12 +1252,12 @@ public class WebCadOrderImportAsyncFactory {
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取侧面孤岛造型
|
||||
* 获取孤岛造型
|
||||
*
|
||||
* @param cadSideHoles
|
||||
* @return
|
||||
*/
|
||||
private List<List<IContourData>> getSideModelingHoles(List<WebCadDataBlockReqVO.PointInfoDTO.ModelDetailDTO.OriginModelingDTO.HolesDTO> cadSideHoles) {
|
||||
private List<List<IContourData>> getModelingHoles(List<WebCadDataBlockReqVO.PointInfoDTO.ModelDetailDTO.OriginModelingDTO.HolesDTO> cadSideHoles) {
|
||||
if (CollUtil.isNotEmpty(cadSideHoles)) {
|
||||
List<List<IContourData>> icontourDataList = new ArrayList<>();
|
||||
for (WebCadDataBlockReqVO.PointInfoDTO.ModelDetailDTO.OriginModelingDTO.HolesDTO sideHole : cadSideHoles) {
|
||||
|
||||
+5
-3
@@ -930,6 +930,8 @@ public class WebCadOrderImportFactory {
|
||||
WebCadDataBlockReqVO.PointInfoDTO.ModelDetailDTO.OriginModelingDTO.OutlineDTO cadOutline = cadOriginModeling.getOutline();
|
||||
originModelingData.setOutline(getOriginModelingOutlineList(cadOutline));
|
||||
|
||||
originModelingData.setHoles(getModelingHoles(cadOriginModeling.getHoles()));
|
||||
|
||||
modelDetail.setOriginModeling(originModelingData);
|
||||
}
|
||||
List<WebCadDataBlockReqVO.PointInfoDTO.ModelDetailDTO.PointListDTO> pointList = cadModelDetail.getPointList();
|
||||
@@ -1057,7 +1059,7 @@ public class WebCadOrderImportFactory {
|
||||
|
||||
originModelingData.setOutline(getOriginModelingOutlineList(cadSideOriginModeling.getOutline()));
|
||||
|
||||
originModelingData.setHoles(getSideModelingHoles(cadSideOriginModeling.getHoles()));
|
||||
originModelingData.setHoles(getModelingHoles(cadSideOriginModeling.getHoles()));
|
||||
|
||||
modelDetail.setOriginModeling(originModelingData);
|
||||
}
|
||||
@@ -1073,12 +1075,12 @@ public class WebCadOrderImportFactory {
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取侧面孤岛造型
|
||||
* 获取孤岛造型
|
||||
*
|
||||
* @param cadSideHoles
|
||||
* @return
|
||||
*/
|
||||
private List<List<IContourData>> getSideModelingHoles(List<WebCadDataBlockReqVO.PointInfoDTO.ModelDetailDTO.OriginModelingDTO.HolesDTO> cadSideHoles) {
|
||||
private List<List<IContourData>> getModelingHoles(List<WebCadDataBlockReqVO.PointInfoDTO.ModelDetailDTO.OriginModelingDTO.HolesDTO> cadSideHoles) {
|
||||
if (CollUtil.isNotEmpty(cadSideHoles)) {
|
||||
List<List<IContourData>> icontourDataList = new ArrayList<>();
|
||||
for (WebCadDataBlockReqVO.PointInfoDTO.ModelDetailDTO.OriginModelingDTO.HolesDTO sideHole : cadSideHoles) {
|
||||
|
||||
Reference in New Issue
Block a user