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

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
gaoqr
2025-01-14 11:32:45 +08:00
parent 4fb49825b6 c23b8aa49b
commit e0023a68b2
3 changed files with 27 additions and 31 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/vo/order/OrderSaveReqVO.java
+1 -1
View File
@@ -22,7 +22,7 @@ public class OrderSaveReqVO {
private String apiOrderId; private String apiOrderId;
@Schema(description = "生产单日期", requiredMode = Schema.RequiredMode.REQUIRED) @Schema(description = "生产单日期", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "交付日期不能为空") @NotNull(message = "生产单日期不能为空")
private LocalDateTime orderDate; private LocalDateTime orderDate;
@Schema(description = "交付日期", requiredMode = Schema.RequiredMode.REQUIRED) @Schema(description = "交付日期", requiredMode = Schema.RequiredMode.REQUIRED)
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/api/webcad/ApiTypeRealize.java
+24 -28
View File
@@ -882,19 +882,6 @@ public class ApiTypeRealize {
Long organId) { Long organId) {
// System.out.println("开始时间 ：" + System.currentTimeMillis()); // System.out.println("开始时间 ：" + System.currentTimeMillis());
if (platesJSONObject == null || platesJSONObject.isEmpty()) {
return Collections.emptyMap();
}
if (blocksJSONObject == null || blocksJSONObject.isEmpty()) {
return Collections.emptyMap();
}
// 板材数据
Map<String, JSONObject> blocksMap = getBlocksData(blocksJSONObject);
JSONArray plateLists = platesJSONObject.getJSONObject(ProduceApiConstants.VALUE).getJSONArray(ProduceApiConstants.LIST);
// System.out.println(" 长度 " + plateLists.size());
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
Map<String, PlateDO> partsInfos = new HashMap<>(); Map<String, PlateDO> partsInfos = new HashMap<>();
List<PlateDO> plateList = new ArrayList<>(); List<PlateDO> plateList = new ArrayList<>();
@@ -909,6 +896,29 @@ public class ApiTypeRealize {
Map<String, Integer> totalPlateCountMapToGroup = new HashMap<>(); Map<String, Integer> totalPlateCountMapToGroup = new HashMap<>();
Map<String, Integer> irregularPlateCountMapToGroup = new HashMap<>(); Map<String, Integer> irregularPlateCountMapToGroup = new HashMap<>();
map.put(FieldConstants.PLATE, partsInfos);
map.put(FieldConstants.ITEM, platesItem);
map.put(BODY_PLATE_NUMBER , totalPlateCountMapToBody);
map.put(BODY_IRREGULAR_PLATE_NUMBER , irregularPlateCountMapToBody);
map.put(GROUP_PLATE_NUMBER , totalPlateCountMapToGroup);
map.put(GROUP_IRREGULAR_PLATE_NUMBER , irregularPlateCountMapToGroup);
map.put(PLATE_DETAILS_REMARKS, plateDetailMap);
if (platesJSONObject == null || platesJSONObject.isEmpty()) {
return map;
}
if (blocksJSONObject == null || blocksJSONObject.isEmpty()) {
return map;
}
// 板材数据
Map<String, JSONObject> blocksMap = getBlocksData(blocksJSONObject);
JSONArray plateLists = platesJSONObject.getJSONObject(ProduceApiConstants.VALUE).getJSONArray(ProduceApiConstants.LIST);
for (int i = 0; i < plateLists.size(); i++) { for (int i = 0; i < plateLists.size(); i++) {
long plateNo = idWorker.nextId(); long plateNo = idWorker.nextId();
@@ -1037,22 +1047,8 @@ public class ApiTypeRealize {
map.put(FieldConstants.PLATE, partsInfos);
map.put(FieldConstants.ITEM, platesItem);
map.put(BODY_PLATE_NUMBER , totalPlateCountMapToBody);
map.put(BODY_IRREGULAR_PLATE_NUMBER , irregularPlateCountMapToBody);
map.put(GROUP_PLATE_NUMBER , totalPlateCountMapToGroup);
map.put(GROUP_IRREGULAR_PLATE_NUMBER , irregularPlateCountMapToGroup);
map.put(PLATE_DETAILS_REMARKS, plateDetailMap);
// System.out.println(
// " platesItem " + platesItem.size() +
// " totalPlateCountMapToBody " + totalPlateCountMapToBody.size() +
// " irregularPlateCountMapToBody " + irregularPlateCountMapToBody.size() +
// " totalPlateCountMapToGroup " + totalPlateCountMapToGroup.size() +
// " irregularPlateCountMapToGroup " + irregularPlateCountMapToGroup.size() +
// " plateDetailMap " + plateDetailMap.size()
// );
return map; return map;
} }
cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/remain/RemainPlateSaveReqVO.java
+2 -2
View File
@@ -84,7 +84,7 @@ public class RemainPlateSaveReqVO {
private Integer placeStyle; private Integer placeStyle;
@Schema(description = "仓库名") @Schema(description = "仓库名")
@Size(max = 64, message = "品牌长度不能超过64个字符") @Size(max = 64, message = "仓库名长度不能超过64个字符")
private String store; private String store;
@Schema(description = "数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "18318") @Schema(description = "数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "18318")
@@ -92,7 +92,7 @@ public class RemainPlateSaveReqVO {
private Integer count; private Integer count;
@Schema(description = "备注", example = "随便") @Schema(description = "备注", example = "随便")
@Size(max = 255, message = "品牌长度不能超过255个字符") @Size(max = 255, message = "备注长度不能超过255个字符")
private String remark; private String remark;
@Schema(description = "轮廊数据，Json 串", requiredMode = Schema.RequiredMode.REQUIRED, example = "18318") @Schema(description = "轮廊数据，Json 串", requiredMode = Schema.RequiredMode.REQUIRED, example = "18318")