Merge branch 'master' of http://nonxin.cn:8090/r/project/chkt

shicf

2025-09-02 2e38637a6090dd5fa799e33c4e2a5e9ee0b8a642

 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表display_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);