优化报表

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/param/WaybillOrderRawOreReportResp.java

@@ -26,7 +26,7 @@ public class WaybillOrderRawOreReportResp implements Serializable {
      * 序号（导出用，汇总行设为null）
      */
     @Schema(description = "序号")
-    private Integer serialNumber;
+    private String serialNumber;
 
     /**
      * 运单id

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/param/WaybillOrderReportResp.java

@@ -25,7 +25,7 @@ public class WaybillOrderReportResp implements Serializable {
      * 序号（导出用，汇总行设为null）
      */
     @Schema(description = "序号")
-    private Integer serialNumber;
+    private String serialNumber;
 
     /**
      * 运单id

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/WaybillOrderRawOreReportRespExcelVO.java

@@ -27,7 +27,7 @@ public class WaybillOrderRawOreReportRespExcelVO implements Serializable {
      * 序号（汇总行显示为空）
      */
     @ExcelProperty(value = "序号", index = 0)
-    private Integer serialNumber;
+    private String serialNumber;
 
 
     @ExcelProperty(value = "运单订单编号")

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/WaybillOrderReportRespExcelVO.java

@@ -27,7 +27,7 @@ public class WaybillOrderReportRespExcelVO implements Serializable {
      * 序号（汇总行显示为空）
      */
     @ExcelProperty(value = "序号", index = 0)
-    private Integer serialNumber;
+    private String serialNumber;
 
     /**
      * 采购单位名称

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/app/WaybillOrderService.java

@@ -2237,7 +2237,7 @@ public class WaybillOrderService {
             WaybillOrderReportResp firstItem = details.get(0);
             // A. 添加明细行和设置序号
             for (WaybillOrderReportResp detail : details) {
-                detail.setSerialNumber(serialNumber++);
+                detail.setSerialNumber(String.valueOf(serialNumber++));
                 resultList.add(detail);
             }
 
@@ -2322,8 +2322,15 @@ public class WaybillOrderService {
      * @return
      */
     private List<WaybillOrderRawOreReportResp> getWaybillOrderRawOreRepoost(WaybillOrderReportQueryParam param) {
+        // 友盛山上山下原矿数据一样，按照山上企业查询
+        List<Long> mockEntIds = Arrays.asList(538039617157337089L, 538040297439891457L);
+        if (!mockEntIds.contains(param.getEntId())) {
+            log.info("当前登录企业不属于友盛山上/山下企业！，entId:{}", param.getEntId());
+            return Collections.emptyList();
+        }
+
         // 1. 物流企业
-        List<KwtLogisticsOrderUnit> logOrderUnits = logisticsOrderUnitRepository.queryByEntIdAndUnitType(param.getEntId(), Global.NUMERICAL_ONE);
+        List<KwtLogisticsOrderUnit> logOrderUnits = logisticsOrderUnitRepository.queryByEntIdAndUnitType(mockEntIds.get(0), Global.NUMERICAL_ONE);
         if (CollectionUtils.isEmpty(logOrderUnits)) {
             log.info("当前企业无物流订单企业信息！，entId:{}", param.getEntId());
             return Collections.emptyList();
@@ -2499,7 +2506,7 @@ public class WaybillOrderService {
             WaybillOrderRawOreReportResp firstItem = details.get(0);
             // A. 添加明细行和设置序号
             for (WaybillOrderRawOreReportResp detail : details) {
-                detail.setSerialNumber(serialNumber++);
+                detail.setSerialNumber(String.valueOf(serialNumber++));
                 resultList.add(detail);
             }