生产实时查询，过站信息修改 制令单关联的工单数据 未找到日志输出

shicf

6 天以前 aba4b755a3afc61a07538e4bfd8217979919907d

 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表display_group='N/A',查不出数据
    * 改为查 da_t_wip_detail表 更改了display_group->group_name字段，去掉routeendflage 和routeendflage条件
    * 2025-09-03改
    * 生产实时数据，查询导出增加过站信息
    * @param fse
    * @return
    * @throws BaseException