From 7c2f69ddcc1a35a314768bae203b7bd5df875429 Mon Sep 17 00:00:00 2001
From: 6c <420680616@qq.com>
Date: 星期四, 18 九月 2025 10:29:31 +0800
Subject: [PATCH] 请求历史特殊处理-若是多次维修导致报表库数据重复，那么按照主键取最新数据
---
product-server-data-center/src/main/java/com/product/data/center/service/ProductionRealTimeInfoService.java | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/product-server-data-center/src/main/java/com/product/data/center/service/ProductionRealTimeInfoService.java b/product-server-data-center/src/main/java/com/product/data/center/service/ProductionRealTimeInfoService.java
index b689509..015c95b 100644
--- a/product-server-data-center/src/main/java/com/product/data/center/service/ProductionRealTimeInfoService.java
+++ b/product-server-data-center/src/main/java/com/product/data/center/service/ProductionRealTimeInfoService.java
@@ -54,6 +54,7 @@
String fileName = URLEncoder.encode("鍒朵护鍗曠敓浜т俊鎭�" + DateUtil.format(new Date(), "yyyyMMddHHmmss") + ".xlsx", "UTF-8");
response.setHeader("Content-disposition", "attachment;filename=" + fileName);
List<ManufacturingOrderEntity> manufacturingOrderEntityList = new ArrayList<>();
+ int page=1;
for (int i = 0; i < manufacturingCommandSheet.getRows(); i++) {
FieldSetEntity fieldSetEntity = manufacturingCommandSheet.getFieldSetEntity(i);
Map<Object, Object> values = fieldSetEntity.getValues();
@@ -75,7 +76,6 @@
// writeSheet = EasyExcel.writerSheet(3, "鍒朵护鍗曚俊鎭�").build();
// excelWriter.write(manufacturingOrderEntityList, writeSheet);
String process = fse.getString("process");
- int page=0;
String[] moNumbers = manufacturingCommandSheet.getData().stream().map(item -> item.getString("mo_number")).toArray(String[]::new);
for (int i = 1; i <= moNumbers.length; i++) {
String moNumber = moNumbers[i - 1];
@@ -87,8 +87,9 @@
if (DataTableEntity.isEmpty(processSheet)) {
continue;
}
- fileName = moNumber + "鐨勭敓浜ф槑缁�";
- writeSheet = EasyExcel.writerSheet(++page, fileName).head(ProductionDetailEntity.class).build();
+ page++;
+ fileName = moNumber + "鐢熶骇鏄庣粏";
+ writeSheet = EasyExcel.writerSheet(page, fileName).head(ProductionDetailEntity.class).build();
List<ProductionDetailEntity> productionDetailEntities = new ArrayList<>();
for (int k = 0; k < processSheet.getRows(); k++) {
JSONObject jsonObject = new JSONObject((Map) processSheet.getFieldSetEntity(k).getValues());
@@ -96,22 +97,24 @@
productionDetailEntities.add(productionDetail);
}
excelWriter.write(productionDetailEntities, writeSheet);
+ //2025-09-03鏀� 澧炲姞杩囨护淇℃伅-------------------------------
+
//鏌ュ嚭璁㈠崟鐨勬墍鏈夎繃绔欐槑缁�
- DataTableEntity detail = getProcessSheet(ff);
- if (DataTableEntity.isEmpty(processSheet)) {
+ DataTableEntity detailSheet = getProductDetailSheet(ff);
+ if (DataTableEntity.isEmpty(detailSheet)) {
continue;
}
- fileName = moNumber + "鐨勮繃绔欐槑缁�";
- writeSheet = EasyExcel.writerSheet(++page, fileName).head(ProductDetailEntity.class).build();
-
- DataTableEntity detailSheet = getProductDetailSheet(ff);
+ page++;
+ fileName = moNumber + "杩囩珯鏄庣粏";
+ writeSheet = EasyExcel.writerSheet(page, fileName).head(ProductDetailEntity.class).build();
List<ProductDetailEntity> productDetailEntity = new ArrayList<>();
- for (int k = 0; k < processSheet.getRows(); k++) {
+ for (int k = 0; k < detailSheet.getRows(); k++) {
JSONObject jsonObject = new JSONObject((Map) detailSheet.getFieldSetEntity(k).getValues());
ProductDetailEntity productDetail = jsonObject.toJavaObject(ProductDetailEntity.class);
productDetailEntity.add(productDetail);
}
excelWriter.write(productDetailEntity, writeSheet);
+ //2025-09-03鏀�-------------------------------------------
}
} catch (Exception e) {
throw e;
@@ -287,9 +290,8 @@
return dataTableEntity;
}
/**
- * 2025-09-02鏀�
- * 鐢熶骇瀹炴椂鏁版嵁锛屽洜da_t_wip_tracking琛╠isplay_group='N/A',鏌ヤ笉鍑烘暟鎹�
- * 鏀逛负鏌� da_t_wip_detail琛� 鏇存敼浜哾isplay_group->group_name瀛楁锛屽幓鎺塺outeendflage 鍜宺outeendflage鏉′欢
+ * 2025-09-03鏀�
+ * 鐢熶骇瀹炴椂鏁版嵁锛屾煡璇㈠鍑哄鍔犺繃绔欎俊鎭�
* @param fse
* @return
* @throws BaseException
--
Gitblit v1.9.2