From aba4b755a3afc61a07538e4bfd8217979919907d Mon Sep 17 00:00:00 2001
From: shicf <shi_chongfu@163.com>
Date: 星期一, 08 九月 2025 11:42:05 +0800
Subject: [PATCH] 生产实时查询，过站信息修改 制令单关联的工单数据 未找到日志输出
---
product-server-data-center/src/main/java/com/product/data/center/service/ProductionRealTimeInfoService.java | 28 +++++++++++++++-------------
product-server-data-center/src/main/java/com/product/data/center/entity/ProductDetailEntity.java | 5 +++--
product-server-data-center/src/main/java/com/product/data/center/service/DataExtractService.java | 12 ++++++++++++
3 files changed, 30 insertions(+), 15 deletions(-)
diff --git a/product-server-data-center/src/main/java/com/product/data/center/entity/ProductDetailEntity.java b/product-server-data-center/src/main/java/com/product/data/center/entity/ProductDetailEntity.java
index 9517c54..8343bbd 100644
--- a/product-server-data-center/src/main/java/com/product/data/center/entity/ProductDetailEntity.java
+++ b/product-server-data-center/src/main/java/com/product/data/center/entity/ProductDetailEntity.java
@@ -4,6 +4,7 @@
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
+//杩囩珯淇℃伅
@Getter
@Setter
@ToString
@@ -17,10 +18,10 @@
private String serialNumber;
@ExcelProperty("杩囩珯鏃堕棿")
- private Integer inStationTime;
+ private String inStationTime;
@ExcelProperty("鐘舵��")
- private Integer errorFlagText;
+ private String errorFlagText;
@ExcelProperty("鏁伴噺")
private Integer itemCount;
diff --git a/product-server-data-center/src/main/java/com/product/data/center/service/DataExtractService.java b/product-server-data-center/src/main/java/com/product/data/center/service/DataExtractService.java
index 31c710e..c96f279 100644
--- a/product-server-data-center/src/main/java/com/product/data/center/service/DataExtractService.java
+++ b/product-server-data-center/src/main/java/com/product/data/center/service/DataExtractService.java
@@ -599,6 +599,8 @@
if (DataTableEntity.isEmpty(dt) || !"T_PM_MO_BASE".equalsIgnoreCase(targetTable)) {
return;
}
+ StringBuilder b=new StringBuilder();
+ b.append("select * from T_PM_PROJECT_BASE where project_id in( ");
Map<String, FieldSetEntity> map = new HashMap<>();
List<Object> moNumberList = new ArrayList<>();
for (int i = 0; i < dt.getRows(); i++) {
@@ -607,8 +609,13 @@
continue;
}
moNumberList.add(moNumber);
+
+ if(i>0)b.append(",");
+ b.append(moNumber);
+
map.put(moNumber, dt.getFieldSetEntity(i));
}
+ b.append(" ) ");
//鏌ヨ鍒朵护鍗曞叧鑱旂殑宸ュ崟鏁版嵁
DataTableEntity projectBaseDt = targetDao.getList("T_PM_PROJECT_BASE", new String[]{"PROJECT_ID,PROJECT_BASE_ID"},
BaseUtil.buildQuestionMarkFilter("project_id", moNumberList.size(), true), moNumberList.toArray(), null, 1, dt.getRows());
@@ -625,6 +632,11 @@
}
}
if (!map.isEmpty()) {
+ b.append("\r\n鏈壘鍒板伐鍗曪細");
+ map.forEach((key, value) -> {
+ b.append(key).append(",");
+ });
+ SpringMVCContextHolder.getSystemLogger().error(b.toString());
throw new BaseException(ErrorCode.MO_NUMBER_MASTER_PROJECT_BASE_EMPTY);
}
}
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