报表基础模块：新增支持生产单报表 （板材明细-按房间/板材）导出

cf-module-prod-executor/cf-module-prod-executor-api/src/main/java/com/cf/imes/module/executor/api/datasource/OrderPlateDatasourceApi.java

@@ -21,8 +21,13 @@ import java.util.List;
 public interface OrderPlateDatasourceApi {
     String PREFIX = ApiConstants.PREFIX + "/order-plate";
 
-    @GetMapping(PREFIX + "/summary/byPlate")
+    @GetMapping(PREFIX + "/summary")
-    @Operation(summary = "按板材汇总板材数据")
+    @Operation(summary = "板材汇总")
     @Parameter(name = "orderId", description = "生产单id", required = true, example = "1")
     CommonResult<List<PlateGoodsRespDTO>> selectPlateGoodsListSummary(@RequestParam("orderId") Long orderId);
+
+    @GetMapping(PREFIX + "/detail")
+    @Operation(summary = "板材明细")
+    @Parameter(name = "orderId", description = "生产单id", required = true, example = "1")
+    CommonResult<List<PlateGoodsRespDTO>> selectPlateGoodsList(@RequestParam("orderId") Long orderId);
 }

cf-module-prod-executor/cf-module-prod-executor-api/src/main/java/com/cf/imes/module/executor/api/datasource/dto/PlateGoodsRespDTO.java

@@ -154,7 +154,7 @@ public class PlateGoodsRespDTO {
     @Schema(description = "是否孤形对角")
     private Boolean isArcAcross;
 
-    @Schema(description = "是否异性")
+    @Schema(description = "是否异形")
     private Boolean isSpecialShaped;
 
     @Schema(description = "是否造型")

cf-module-prod-executor/cf-module-prod-executor-api/src/main/java/com/cf/imes/module/executor/enums/OrderPlateOpenDoorTypeEnum.java

@@ -0,0 +1,40 @@
+package com.cf.imes.module.executor.enums;
+
+/**
+ * 板材开门类型枚举
+ *
+ * @author Gqr
+ * @since 2024/7/29 9:58
+ */
+public enum OrderPlateOpenDoorTypeEnum {
+    NO(0, "无"),
+    LEFT(1, "左"),
+    RIGHT(2, "右"),
+    UP(3, "上"),
+    DOWN(4, "下");
+
+    private final int code;
+    private final String desc;
+
+    OrderPlateOpenDoorTypeEnum(int code, String desc) {
+        this.code = code;
+        this.desc = desc;
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public static String getDescFromCode(int code) {
+        for (OrderPlateOpenDoorTypeEnum orderPlateOpenDoorTypeEnum : OrderPlateOpenDoorTypeEnum.values()) {
+            if (orderPlateOpenDoorTypeEnum.getCode() == code) {
+                return orderPlateOpenDoorTypeEnum.getDesc();
+            }
+        }
+        return null;
+    }
+}

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/api/datasource/OrderPlateDatasourceApiImpl.java

@@ -31,4 +31,12 @@ public class OrderPlateDatasourceApiImpl implements OrderPlateDatasourceApi {
         List<PlateGoodsRespVO> plateGoodsRespVOS = plateMapper.selectPlateGoodsListSummary(orderId, SecurityFrameworkUtils.getLoginUser().getOrganId(), notDeletedStatus);
         return CommonResult.success(BeanUtils.toBean(plateGoodsRespVOS, PlateGoodsRespDTO.class));
     }
+
+    @Override
+    public CommonResult<List<PlateGoodsRespDTO>> selectPlateGoodsList(Long orderId) {
+        // 查询分组统计
+        Integer notDeletedStatus = OrderDeletedEnum.NOT_DELETED.getStatus();
+        List<PlateGoodsRespVO> plateGoodsRespVOS = plateMapper.selectPlateGoodsList(orderId, SecurityFrameworkUtils.getLoginUser().getOrganId(), notDeletedStatus);
+        return CommonResult.success(BeanUtils.toBean(plateGoodsRespVOS, PlateGoodsRespDTO.class));
+    }
 }

cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/framework/ureport/bean/OrderSummaryBeanDatasource.java

@@ -7,6 +7,7 @@ import com.cf.imes.module.executor.api.datasource.OrderDatasourceApi;
 import com.cf.imes.module.executor.api.datasource.OrderPlateDatasourceApi;
 import com.cf.imes.module.executor.api.datasource.dto.OrderDTO;
 import com.cf.imes.module.executor.api.datasource.dto.PlateGoodsRespDTO;
+import com.cf.imes.module.executor.enums.OrderPlateOpenDoorTypeEnum;
 import com.cf.imes.module.report.framework.ureport.annotation.CfReportSpringbeanDatasource;
 import lombok.extern.slf4j.Slf4j;
 
@@ -76,15 +77,15 @@ public class OrderSummaryBeanDatasource {
     }
 
     /**
-     * 板材汇总-按板材
+     * 板材汇总
      *
      * @param dsName
      * @param datasetName
      * @param parameters
      * @return
      */
-    public List<Map<String, Object>> orderPlateSummaryByPlate(String dsName, String datasetName, Map<String, Object> parameters) {
+    public List<Map<String, Object>> orderPlateGoodsSummary(String dsName, String datasetName, Map<String, Object> parameters) {
-        log.info("报表数据源[OrderSummaryBeanDatasource][orderPlateSummaryByPlate][{}][{}]调用开始", dsName, datasetName);
+        log.info("报表数据源[OrderSummaryBeanDatasource][orderPlateGoodsSummary][{}][{}]调用开始", dsName, datasetName);
         List<Map<String, Object>> resultList = new ArrayList<>();
 
         Object orderId = parameters.get(ORDER_ID_FIELD_NAME);
@@ -100,19 +101,94 @@ public class OrderSummaryBeanDatasource {
                 // 构造报表所需结构
                 resultMap.put("roomName", p.getRoomName());
                 resultMap.put("bodyName", p.getBodyName());
-                resultMap.put("thickness", p.getThickness());
+                resultMap.put("thickness", stripTrailingZeros(p.getThickness()));
                 resultMap.put("name", p.getName());
-                resultMap.put("height", p.getHeight());
+                resultMap.put("height", stripTrailingZeros(p.getHeight()));
-                resultMap.put("width", p.getWidth());
+                resultMap.put("width", stripTrailingZeros(p.getWidth()));
                 resultMap.put("count", count);
-                resultMap.put("area", area);
+                resultMap.put("area", stripTrailingZeros(area));
-                resultMap.put("openDoorType", p.getOpenDoorType());
+                resultMap.put("openDoorType", OrderPlateOpenDoorTypeEnum.getDescFromCode(p.getOpenDoorType()));
+                resultMap.put("material", p.getMaterial());
+                resultMap.put("color", p.getColor());
                 resultMap.put("remark", p.getRemark());
-                resultMap.put("areaAll", area.multiply(BigDecimal.valueOf(count)));
+                resultMap.put("areaAll", stripTrailingZeros(area.multiply(BigDecimal.valueOf(count))));
                 resultList.add(resultMap);
             });
         }
-        log.info("报表数据源[OrderSummaryBeanDatasource][orderPlateSummaryByPlate][{}][{}]调用结束", dsName, datasetName);
+        log.info("报表数据源[OrderSummaryBeanDatasource][orderPlateGoodsSummary][{}][{}]调用结束", dsName, datasetName);
         return resultList;
     }
+
+    /**
+     * 板材明细
+     *
+     * @param dsName
+     * @param datasetName
+     * @param parameters
+     * @return
+     */
+    public List<Map<String, Object>> orderPlateGoodsList(String dsName, String datasetName, Map<String, Object> parameters) {
+        log.info("报表数据源[OrderSummaryBeanDatasource][orderPlateGoodsList][{}][{}]调用开始", dsName, datasetName);
+        List<Map<String, Object>> resultList = new ArrayList<>();
+
+        Object orderId = parameters.get(ORDER_ID_FIELD_NAME);
+        // 查询统计信息
+        CommonResult<List<PlateGoodsRespDTO>> commonResult = orderPlateDatasourceApi.selectPlateGoodsList(Long.parseLong(orderId.toString()));
+        List<PlateGoodsRespDTO> plateGoodsRespDTOS = commonResult.getData();
+
+        if (CollUtil.isNotEmpty(plateGoodsRespDTOS)) {
+            plateGoodsRespDTOS.forEach(p -> {
+                Map<String, Object> resultMap = new HashMap<>();
+                BigDecimal area = p.getArea();
+                Integer count = p.getCount();
+                // 构造报表所需结构
+                resultMap.put("goodsName", p.getGoodsName());
+                resultMap.put("name", p.getName());
+                resultMap.put("material", p.getMaterial());
+                resultMap.put("color", p.getColor());
+                resultMap.put("goodsThickness", p.getGoodsThickness());
+                resultMap.put("count", p.getCount());
+                resultMap.put("roomName", p.getRoomName());
+                resultMap.put("bodyName", p.getBodyName());
+                resultMap.put("plateNo", p.getPlateNo());
+                resultMap.put("height", stripTrailingZeros(p.getHeight()));
+                resultMap.put("width", stripTrailingZeros(p.getWidth()));
+                resultMap.put("thickness", stripTrailingZeros(p.getThickness()));
+                resultMap.put("area", stripTrailingZeros(area));
+                resultMap.put("remark", p.getRemark());
+                resultMap.put("isSpecialShaped", getBooleanString(p.getIsSpecialShaped()));
+                resultMap.put("isSculpt", getBooleanString(p.getIsSculpt()));
+                resultMap.put("openDoorType", OrderPlateOpenDoorTypeEnum.getDescFromCode(p.getOpenDoorType()));
+                resultMap.put("seal", String.join(",", stripTrailingZeros(p.getSealLeft()), stripTrailingZeros(p.getSealRight()), stripTrailingZeros(p.getSealUp()), stripTrailingZeros(p.getSealDown())));
+                resultMap.put("areaAll", stripTrailingZeros(area.multiply(BigDecimal.valueOf(count))));
+                resultList.add(resultMap);
+            });
+        }
+        log.info("报表数据源[OrderSummaryBeanDatasource][orderPlateGoodsList][{}][{}]调用结束", dsName, datasetName);
+        return resultList;
+    }
+
+    /**
+     * 移除尾数的0，600.000 -> 600
+     *
+     * @param data
+     * @return
+     */
+    private String stripTrailingZeros(BigDecimal data) {
+        if (ObjectUtil.isNotNull(data)) {
+            return data.stripTrailingZeros().toPlainString();
+        } else {
+            return "";
+        }
+    }
+
+    /**
+     * 布尔值转是否
+     *
+     * @param b
+     * @return
+     */
+    private String getBooleanString(Boolean b) {
+        return b ? "是" : "否";
+    }
 }