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

es字段修改

Browse Source
This commit is contained in:
lym
2024-09-18 11:18:31 +08:00
parent ef8654f946
commit 7493703f34
5 changed files with 24 additions and 18 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/controller/admin/order/OrderController.java
+4 -3
View File
@@ -188,7 +188,7 @@ public class OrderController {
@Operation(summary = "生产单api数据导入新增")
@Parameter(name = "orderNo", description = "原订单号", required = true, example = "20230809027818")
@PreAuthorize("@ss.hasPermission('production:manager-list:create')")
public CommonResult<Long> getApiData(@RequestParam(value = "orderNo") String orderNo){
public CommonResult<String> getApiData(@RequestParam(value = "orderNo") String orderNo){
try {
Long orderId = (Long) identifierGenerator.nextId(null);
@@ -222,10 +222,11 @@ public class OrderController {
orderNo,// 原始板编号
orderId,
organId);
return success(orderService.importApiData(listMap));
Long id = orderService.importApiData(listMap);
return success(String.valueOf(id));
} catch (Exception e) {
log.error("api数据导入异常", e);
throw exception(PLATE_PLAN_DATA_ERROR);
return success(e.getMessage());
}
}
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/ordermodel/OrderModelDO.java
+5 -2
View File
@@ -1,5 +1,6 @@
package com.cf.imes.module.executor.dal.dataobject.ordermodel;
import com.alibaba.fastjson.JSONObject;
import com.cf.imes.framework.es.core.dal.ESDocument;
import com.cf.imes.module.executor.util.deviseData.structure.BasePosition;
import com.cf.imes.module.executor.util.deviseData.structure.HoleDetail;
@@ -73,8 +74,10 @@ public class OrderModelDO extends ESDocument {
@Schema(description = "侧面孔明细列表")
private List<HoleDetail> sideHoleDetail;
@Schema(description = "生产封边备注")
@Schema(description = "生产封边备注 弃用")
private Map<String,String> sideRemark;// 封边备注
@Schema(description = "板材扩展备注")
private JSONObject plateExtraRemark;// 封边备注
@Schema(description = "扩展备注(包含铰链备注、订单板件流水号)")
private String extraRemark; // 扩展备注(包含铰链备注、订单板件流水号)（板材明细中）
@@ -93,4 +96,4 @@ public class OrderModelDO extends ESDocument {
private String remarkJson; // 普通备注（板材数据中）
@Schema(description = "特殊备注(板材数据中)")
private String specialRemark; // 特殊备注（板材数据中）
}
}
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/structure/PlateDetail.java
+1
View File
@@ -102,6 +102,7 @@ public class PlateDetail{
// 备注
private Map<String,String> plateRemark;// 板件备注 (生产数据接口中）
private Map<String,String> sideRemark;// 封边备注
private JSONObject plateExtraRemark;// 板材扩展备注
private String extraRemark; // 扩展备注(包含铰链备注、订单板件流水号)（板材明细中）
private String specialRemarkDei; // 特殊备注(Json字符串)
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/api/webcad/ApiTypeRealize.java
+13 -12
View File
@@ -563,8 +563,8 @@ public class ApiTypeRealize {
.getData().getValue());
Long plateId = (Long) identifierGenerator.nextId(null);
String remarkJson = plate.getString("RemarkJson").replace("[", "").replace("]", "");
String remark = remarkJson != null && !remarkJson.trim().isEmpty() ? remarkJson : "";
String remarkJson = plate.getString("RemarkJson").replace("\"", "").trim();
String remark = !remarkJson.trim().isEmpty() ? remarkJson : "";
PlateDO plateInfo = PlateDO.builder()
.id(plateId)
@@ -625,12 +625,12 @@ public class ApiTypeRealize {
Long blockNo = plate.getLong("BlockNo");
if (plateDetail.get(blockNo) != null) {
plateDetail.get(blockNo).setPlateId(plateId)
.setExtraRemark(plate.getString("ExtraRemark"))
.setSpecialRemarkDei(plate.getString("SpecialRemark"))
.setExtraHandleRemark(plate.getString("ExtraHandleRemark"))
.setDrillsRemark(plate.getString("DrillsRemark"))
.setInfoRemark(plate.getString("InfoRemark"))
.setRemarkJsonDei(plate.getString("RemarkJson"));
.setExtraRemark(plate.getString("ExtraRemark").replace("\"", "").trim())
.setSpecialRemarkDei(plate.getString("SpecialRemark").replace("\"", "").trim())
.setExtraHandleRemark(plate.getString("ExtraHandleRemark").replace("\"", "").trim())
.setDrillsRemark(plate.getString("DrillsRemark").replace("\"", "").trim())
.setInfoRemark(plate.getString("InfoRemark").replace("\"", "").trim())
.setRemarkJsonDei(plate.getString("RemarkJson").replace("\"", "").trim());
plateInfo.setHoleFace(plateDetail.get(blockNo).getTypographicFace()).setIsDoor(plateDetail.get(blockNo).getOpenDoorType() == 0)
.setOffsetX(plateDetail.get(blockNo).getOffsetX()).setOffsetY(plateDetail.get(blockNo).getOffsetY());
@@ -654,8 +654,8 @@ public class ApiTypeRealize {
JSONObject jsonObject = plateMap.get(blockNo);
if (plateDetail.get(blockNo) != null){
plateDetail.get(blockNo)
.setRemarkJson(jsonObject.getString("RemarkJson"))
.setSpecialRemark(jsonObject.getString("SpecialRemark"));
.setRemarkJson(jsonObject.getString("RemarkJson").replace("\"", "").trim())
.setSpecialRemark(jsonObject.getString("SpecialRemark").replace("\"", "").trim());
}
}
}
@@ -795,8 +795,9 @@ public class ApiTypeRealize {
.setThroughModelCount(Double.valueOf(block.getJSONObject("ExtraRemark").getJSONObject("extra").getString("throughModelCount")))
.setHas2DModel(Boolean.valueOf(block.getJSONObject("ExtraRemark").getJSONObject("extra").getString("has2DModel")))
.setHas3DModel(Boolean.valueOf(block.getJSONObject("ExtraRemark").getJSONObject("extra").getString("has3DModel")))
.setPlateRemark(remarkToMap(block));
// .setSideRemark(edgeRemarkToMap(block.getJSONObject("ExtraRemark").getJSONObject("extra")));
.setPlateRemark(remarkToMap(block))
.setPlateExtraRemark(block.getJSONObject("ExtraRemark"))
.setSideRemark(edgeRemarkToMap(block.getJSONObject("ExtraRemark").getJSONObject("extra")));
}
plateDetails.put(block.getLong("BlockNo"), plateDetail);
}
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/xml/XmlTypeRealize.java
+1 -1
View File
@@ -593,7 +593,7 @@ public class XmlTypeRealize {
.contourDetail(new ArrayList<>())
.sideHoleDetail(new ArrayList<>())
.plateRemark(new HashMap<>())
// .sideRemark(new HashMap<>())
.plateExtraRemark(new JSONObject())
.isUnRegular(plateDO.getIsSpecialShaped())
.build();
// 小板、es 封边值