From 2e38637a6090dd5fa799e33c4e2a5e9ee0b8a642 Mon Sep 17 00:00:00 2001
From: shicf <shi_chongfu@163.com>
Date: 星期二, 02 九月 2025 16:41:46 +0800
Subject: [PATCH] Merge branch 'master' of http://nonxin.cn:8090/r/project/chkt
---
product-server-data-center/src/main/java/com/product/data/center/controller/ProductionRealTimeInfoController.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/product-server-data-center/src/main/java/com/product/data/center/controller/ProductionRealTimeInfoController.java b/product-server-data-center/src/main/java/com/product/data/center/controller/ProductionRealTimeInfoController.java
index 583192f..3f9cb84 100644
--- a/product-server-data-center/src/main/java/com/product/data/center/controller/ProductionRealTimeInfoController.java
+++ b/product-server-data-center/src/main/java/com/product/data/center/controller/ProductionRealTimeInfoController.java
@@ -93,7 +93,13 @@
public String getProductReport(HttpServletRequest request) {
try {
FieldSetEntity fse = BaseUtil.getFieldSetEntity(request);
- return OK_List(productionRealTimeInfoService.getProductSheet(fse));
+ /**
+ * 2025-09-02鏀�
+ * 鐢熶骇瀹炴椂鏁版嵁锛屽洜da_t_wip_tracking琛╠isplay_group='N/A',鏌ヤ笉鍑烘暟鎹�
+ * 鏀逛负鏌� t_wip_DETAIL琛�
+ */
+// return OK_List(productionRealTimeInfoService.getProductSheet(fse));
+ return OK_List(productionRealTimeInfoService.getProductSheetV2(fse));
} catch (BaseException e) {
e.printStackTrace();
return error(e);
--
Gitblit v1.9.2