Merge remote-tracking branch 'origin/mode-min-unit' into mode-min-unit

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/dao/ApsProductionOrderDao.java

@@ -107,6 +107,24 @@ public interface ApsProductionOrderDao extends BaseMapper<ApsProductionOrderDo>
     ApsReportCastRollPhoto selectCastRollPhotoAvg(@Param("tenantId") String tenantId);
 
     List<ApsReportCastRollPhoto> selectCastRollPhoto(@Param("tenantId") String tenantId);
+
+    List<ApsReportJzProcessTable> selectProcessTable(@Param("tenantId") String tenantId);
+
+    ApsReportJzProcessPhoto selectProcessAvg(@Param("tenantId") String tenantId);
+
+    List<ApsReportJzProcessPhoto> selectProcessTrend(@Param("tenantId") String tenantId);
+
+    List<ApsReportZjProcessTable> selectZjProcessTable(@Param("tenantId") String tenantId);
+
+    ApsReportZjProcessPhoto selectAvgZjProcessPhoto(@Param("tenantId") String tenantId);
+
+    List<ApsReportZjProcessPhoto> selectZjProcessPhoto(@Param("tenantId") String tenantId);
+
+    List<ApsReportThProcessTable> selectThProcessTable(@Param("tenantId") String tenantId);
+
+    ApsReportThProcessPhoto selectAvgThProcessPhoto(@Param("tenantId") String tenantId);
+
+    List<ApsReportThProcessPhoto> selectThProcessPhoto(@Param("tenantId") String tenantId);
 }
 
 

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/dao/ApsReportJzProcessPhotoMapper.java

@@ -0,0 +1,15 @@
+package com.rongwei.bscommon.sys.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rongwei.bsentity.domain.ApsReportJzProcessPhoto;
+
+/**
+ * @Entity generator.domain.ApsReportJzProcessPhoto
+ */
+public interface ApsReportJzProcessPhotoMapper extends BaseMapper<ApsReportJzProcessPhoto> {
+
+}
+
+
+
+

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/dao/ApsReportJzProcessTableMapper.java

@@ -0,0 +1,15 @@
+package com.rongwei.bscommon.sys.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rongwei.bsentity.domain.ApsReportJzProcessTable;
+
+/**
+ * @Entity generator.domain.ApsReportJzProcessTable
+ */
+public interface ApsReportJzProcessTableMapper extends BaseMapper<ApsReportJzProcessTable> {
+
+}
+
+
+
+

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/dao/ApsReportThProcessPhotoMapper.java

@@ -0,0 +1,15 @@
+package com.rongwei.bscommon.sys.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rongwei.bsentity.domain.ApsReportThProcessPhoto;
+
+/**
+ * @Entity generator.domain.ApsReportThProcessPhoto
+ */
+public interface ApsReportThProcessPhotoMapper extends BaseMapper<ApsReportThProcessPhoto> {
+
+}
+
+
+
+

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/dao/ApsReportThProcessTableMapper.java

@@ -0,0 +1,15 @@
+package com.rongwei.bscommon.sys.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rongwei.bsentity.domain.ApsReportThProcessTable;
+
+/**
+ * @Entity generator.domain.ApsReportThProcessTable
+ */
+public interface ApsReportThProcessTableMapper extends BaseMapper<ApsReportThProcessTable> {
+
+}
+
+
+
+

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/dao/ApsReportZjProcessPhotoMapper.java

@@ -0,0 +1,15 @@
+package com.rongwei.bscommon.sys.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rongwei.bsentity.domain.ApsReportZjProcessPhoto;
+
+/**
+ * @Entity generator.domain.ApsReportZjProcessPhoto
+ */
+public interface ApsReportZjProcessPhotoMapper extends BaseMapper<ApsReportZjProcessPhoto> {
+
+}
+
+
+
+

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/dao/ApsReportZjProcessTableMapper.java

@@ -0,0 +1,15 @@
+package com.rongwei.bscommon.sys.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rongwei.bsentity.domain.ApsReportZjProcessTable;
+
+/**
+ * @Entity generator.domain.ApsReportZjProcessTable
+ */
+public interface ApsReportZjProcessTableMapper extends BaseMapper<ApsReportZjProcessTable> {
+
+}
+
+
+
+

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/ApsReportJzProcessPhotoService.java

@@ -0,0 +1,11 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rongwei.bsentity.domain.ApsReportJzProcessPhoto;
+
+/**
+ *
+ */
+public interface ApsReportJzProcessPhotoService extends IService<ApsReportJzProcessPhoto> {
+
+}

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/ApsReportJzProcessTableService.java

@@ -0,0 +1,11 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rongwei.bsentity.domain.ApsReportJzProcessTable;
+
+/**
+ *
+ */
+public interface ApsReportJzProcessTableService extends IService<ApsReportJzProcessTable> {
+
+}

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/ApsReportThProcessPhotoService.java

@@ -0,0 +1,11 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rongwei.bsentity.domain.ApsReportThProcessPhoto;
+
+/**
+ *
+ */
+public interface ApsReportThProcessPhotoService extends IService<ApsReportThProcessPhoto> {
+
+}

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/ApsReportThProcessTableService.java

@@ -0,0 +1,11 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rongwei.bsentity.domain.ApsReportThProcessTable;
+
+/**
+ *
+ */
+public interface ApsReportThProcessTableService extends IService<ApsReportThProcessTable> {
+
+}

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/ApsReportZjProcessPhotoService.java

@@ -0,0 +1,11 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rongwei.bsentity.domain.ApsReportZjProcessPhoto;
+
+/**
+ *
+ */
+public interface ApsReportZjProcessPhotoService extends IService<ApsReportZjProcessPhoto> {
+
+}

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/ApsReportZjProcessTableService.java

@@ -0,0 +1,11 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rongwei.bsentity.domain.ApsReportZjProcessTable;
+
+/**
+ *
+ */
+public interface ApsReportZjProcessTableService extends IService<ApsReportZjProcessTable> {
+
+}

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsProductionOrderServiceImpl.java

@@ -143,6 +143,18 @@ public class ApsProductionOrderServiceImpl extends ServiceImpl<ApsProductionOrde
     private ApsReportCastRollTableService apsReportCastRollTableService;
     @Autowired
     private ApsReportCastRollPhotoService apsReportCastRollPhotoService;
+    @Autowired
+    private ApsReportJzProcessTableService apsReportJzProcessTableService;
+    @Autowired
+    private ApsReportJzProcessPhotoService apsReportJzProcessPhotoService;
+    @Autowired
+    private ApsReportZjProcessTableService apsReportZjProcessTableService;
+    @Autowired
+    private ApsReportZjProcessPhotoService apsReportZjProcessPhotoService;
+    @Autowired
+    private ApsReportThProcessTableService apsReportThProcessTableService;
+    @Autowired
+    private ApsReportThProcessPhotoService apsReportThProcessPhotoService;
 
 
     public static final String ERROR_MSG = "%s上诉订单的排程交货期大于承诺交货期";
@@ -1093,6 +1105,186 @@ public class ApsProductionOrderServiceImpl extends ServiceImpl<ApsProductionOrde
         } catch (Exception e) {
             log.error("生成大屏铸轧生产情况趋势图失败");
         }
+        //精整生产情况表格
+        try {
+            log.info("开始生成大屏精整生产情况表格");
+            setProcessTable();
+        } catch (Exception e) {
+            log.error("生成大屏精整生产情况表格失败");
+        }
+        //精整生产情况趋势图
+        try {
+            log.info("开始生成大屏精整生产情况趋势图");
+            setProcessTrend();
+        } catch (Exception e) {
+            log.error("生成大屏精整生产情况趋势图失败");
+        }
+        //轧机生产情况表格
+        try {
+            log.info("开始生成大屏轧机生产情况表格");
+            setZjProcessTable();
+        } catch (Exception e) {
+            log.error("生成大屏轧机生产情况表格失败");
+        }
+        //轧机生产情况趋势图
+        try {
+            log.info("开始生成大屏轧机生产情况趋势图");
+            setZjProcessTrend();
+        } catch (Exception e) {
+            log.error("生成大屏轧机生产情况趋势图失败");
+        }
+        //退火生产情况表格
+        try {
+            log.info("开始生成大屏退火生产情况表格");
+            setThProcessTable();
+        } catch (Exception e) {
+            log.error("生成大屏退火生产情况表格失败");
+        }
+        //退火生产情况趋势图
+        try {
+            log.info("开始生成大屏退火生产情况趋势图");
+            setThProcessTrend();
+        } catch (Exception e) {
+            log.error("生成大屏退火生产情况趋势图失败");
+        }
+
+    }
+
+    private void setThProcessTrend() {
+        List<ApsReportThProcessPhoto> resInsertList = new LinkedList<>();
+        //根据工厂分别生成指定数据
+        SaveConstans.COMPANY_MAP.forEach((key, value) -> {
+            //平均值
+            ApsReportThProcessPhoto avgApsReportThProcessPhoto = this.baseMapper.selectAvgThProcessPhoto(key);
+            //近12月数据
+            List<ApsReportThProcessPhoto> list = this.baseMapper.selectThProcessPhoto(key);
+            if (ObjectUtil.isNotEmpty(list)) {
+                list.forEach(item -> {
+                    item.setId(SecurityUtil.getUUID());
+                    item.setTenantid(key);
+                    item.setTenantname(value);
+                    item.setYearmonth(DateUtil.format(item.getCreatedate(), "yyyyMM"));
+                    item.setAvgplanproducevolume(avgApsReportThProcessPhoto.getAvgplanproducevolume());
+                    item.setAvgactualproducevolume(avgApsReportThProcessPhoto.getAvgactualproducevolume());
+                });
+                resInsertList.addAll(list);
+            }
+        });
+        if (ObjectUtil.isNotEmpty(resInsertList)){
+            apsReportThProcessPhotoService.remove(new LambdaQueryWrapper<ApsReportThProcessPhoto>().eq(ApsReportThProcessPhoto::getDeleted, "0"));
+            apsReportThProcessPhotoService.saveBatch(resInsertList);
+        }
+    }
+
+    private void setThProcessTable() {
+        List<ApsReportThProcessTable> resInsertList = new LinkedList<>();
+        //根据工厂分别生成指定数据
+        SaveConstans.COMPANY_MAP.forEach((key, value) -> {
+            List<ApsReportThProcessTable> list = this.baseMapper.selectThProcessTable(key);
+            if (ObjectUtil.isNotEmpty(list)) {
+                list.forEach(item -> {
+                    item.setId(SecurityUtil.getUUID());
+                    item.setTenantid(key);
+                    item.setTenantname(value);
+                });
+                resInsertList.addAll(list);
+            }
+        });
+        if (ObjectUtil.isNotEmpty(resInsertList)){
+            apsReportThProcessTableService.remove(new LambdaQueryWrapper<ApsReportThProcessTable>().eq(ApsReportThProcessTable::getDeleted, "0"));
+            apsReportThProcessTableService.saveBatch(resInsertList);
+        }
+    }
+
+    private void setZjProcessTrend() {
+        List<ApsReportZjProcessPhoto> resInsertList = new LinkedList<>();
+        //根据工厂分别生成指定数据
+        SaveConstans.COMPANY_MAP.forEach((key, value) -> {
+            //平均值
+            ApsReportZjProcessPhoto avgApsReportZjProcessPhoto = this.baseMapper.selectAvgZjProcessPhoto(key);
+            //近12月数据
+            List<ApsReportZjProcessPhoto> list = this.baseMapper.selectZjProcessPhoto(key);
+            if (ObjectUtil.isNotEmpty(list)) {
+                list.forEach(item -> {
+                    item.setId(SecurityUtil.getUUID());
+                    item.setTenantid(key);
+                    item.setTenantname(value);
+                    item.setAvgplanproducevolume(avgApsReportZjProcessPhoto.getAvgplanproducevolume());
+                    item.setAvgactualproducevolume(avgApsReportZjProcessPhoto.getAvgactualproducevolume());
+                });
+                resInsertList.addAll(list);
+            }
+        });
+        if (ObjectUtil.isNotEmpty(resInsertList)) {
+            apsReportZjProcessPhotoService.remove(new LambdaQueryWrapper<ApsReportZjProcessPhoto>().eq(ApsReportZjProcessPhoto::getDeleted, "0"));
+            apsReportZjProcessPhotoService.saveBatch(resInsertList);
+        }
+
+    }
+
+    private void setZjProcessTable() {
+        List<ApsReportZjProcessTable> resInsertList = new LinkedList<>();
+        //根据工厂分别生成指定数据
+        SaveConstans.COMPANY_MAP.forEach((key, value) -> {
+            List<ApsReportZjProcessTable> list = this.baseMapper.selectZjProcessTable(key);
+            if (ObjectUtil.isNotEmpty(list)) {
+                list.forEach(item -> {
+                    item.setId(SecurityUtil.getUUID());
+                    item.setTenantid(key);
+                    item.setTenantname(value);
+                });
+                resInsertList.addAll(list);
+            }
+        });
+        if (ObjectUtil.isNotEmpty(resInsertList)) {
+            apsReportZjProcessTableService.remove(new LambdaQueryWrapper<ApsReportZjProcessTable>().eq(ApsReportZjProcessTable::getDeleted, "0"));
+            apsReportZjProcessTableService.saveBatch(resInsertList);
+        }
+    }
+
+    private void setProcessTrend() {
+        List<ApsReportJzProcessPhoto> resInsertList = new LinkedList<>();
+        //根据工厂分别生成指定数据
+        SaveConstans.COMPANY_MAP.forEach((key, value) -> {
+            //平均值
+            ApsReportJzProcessPhoto avgApsReportJzProcessPhoto = this.baseMapper.selectProcessAvg(key);
+            //近12月数据
+            List<ApsReportJzProcessPhoto> list = this.baseMapper.selectProcessTrend(key);
+            if (ObjectUtil.isNotEmpty(list)) {
+                list.forEach(item -> {
+                    item.setId(SecurityUtil.getUUID());
+                    item.setTenantid(key);
+                    item.setTenantname(value);
+                    item.setAvgplanproducevolume(avgApsReportJzProcessPhoto.getAvgplanproducevolume());
+                    item.setAvgactualproducevolume(avgApsReportJzProcessPhoto.getAvgactualproducevolume());
+                });
+                resInsertList.addAll(list);
+            }
+        });
+        if (ObjectUtil.isNotEmpty(resInsertList)) {
+            apsReportJzProcessPhotoService.remove(new QueryWrapper<ApsReportJzProcessPhoto>().lambda().eq(ApsReportJzProcessPhoto::getDeleted, "0"));
+            apsReportJzProcessPhotoService.saveBatch(resInsertList);
+        }
+    }
+
+    private void setProcessTable() {
+        List<ApsReportJzProcessTable> resInsertList = new LinkedList<>();
+        //根据工厂分别生成指定数据
+        SaveConstans.COMPANY_MAP.forEach((key, value) -> {
+            List<ApsReportJzProcessTable> list = this.baseMapper.selectProcessTable(key);
+            if (ObjectUtil.isNotEmpty(list)) {
+                list.forEach(item -> {
+                    item.setId(SecurityUtil.getUUID());
+                    item.setTenantid(key);
+                    item.setTenantname(value);
+                });
+                resInsertList.addAll(list);
+            }
+        });
+        if (ObjectUtil.isNotEmpty(resInsertList)) {
+            apsReportJzProcessTableService.remove(new QueryWrapper<ApsReportJzProcessTable>().lambda().eq(ApsReportJzProcessTable::getDeleted, "0"));
+            apsReportJzProcessTableService.saveBatch(resInsertList);
+        }
 
     }
 

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsReportJzProcessPhotoServiceImpl.java

@@ -0,0 +1,20 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwei.bscommon.sys.dao.ApsReportJzProcessPhotoMapper;
+import com.rongwei.bscommon.sys.service.ApsReportJzProcessPhotoService;
+import com.rongwei.bsentity.domain.ApsReportJzProcessPhoto;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ */
+@Service
+public class ApsReportJzProcessPhotoServiceImpl extends ServiceImpl<ApsReportJzProcessPhotoMapper, ApsReportJzProcessPhoto>
+    implements ApsReportJzProcessPhotoService {
+
+}
+
+
+
+

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsReportJzProcessTableServiceImpl.java

@@ -0,0 +1,20 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwei.bscommon.sys.dao.ApsReportJzProcessTableMapper;
+import com.rongwei.bscommon.sys.service.ApsReportJzProcessTableService;
+import com.rongwei.bsentity.domain.ApsReportJzProcessTable;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ */
+@Service
+public class ApsReportJzProcessTableServiceImpl extends ServiceImpl<ApsReportJzProcessTableMapper, ApsReportJzProcessTable>
+    implements ApsReportJzProcessTableService {
+
+}
+
+
+
+

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsReportThProcessPhotoServiceImpl.java

@@ -0,0 +1,20 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwei.bscommon.sys.dao.ApsReportThProcessPhotoMapper;
+import com.rongwei.bscommon.sys.service.ApsReportThProcessPhotoService;
+import com.rongwei.bsentity.domain.ApsReportThProcessPhoto;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ */
+@Service
+public class ApsReportThProcessPhotoServiceImpl extends ServiceImpl<ApsReportThProcessPhotoMapper, ApsReportThProcessPhoto>
+    implements ApsReportThProcessPhotoService {
+
+}
+
+
+
+

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsReportThProcessTableServiceImpl.java

@@ -0,0 +1,20 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwei.bscommon.sys.dao.ApsReportThProcessTableMapper;
+import com.rongwei.bscommon.sys.service.ApsReportThProcessTableService;
+import com.rongwei.bsentity.domain.ApsReportThProcessTable;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ */
+@Service
+public class ApsReportThProcessTableServiceImpl extends ServiceImpl<ApsReportThProcessTableMapper, ApsReportThProcessTable>
+    implements ApsReportThProcessTableService {
+
+}
+
+
+
+

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsReportZjProcessPhotoServiceImpl.java

@@ -0,0 +1,20 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwei.bscommon.sys.dao.ApsReportZjProcessPhotoMapper;
+import com.rongwei.bscommon.sys.service.ApsReportZjProcessPhotoService;
+import com.rongwei.bsentity.domain.ApsReportZjProcessPhoto;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ */
+@Service
+public class ApsReportZjProcessPhotoServiceImpl extends ServiceImpl<ApsReportZjProcessPhotoMapper, ApsReportZjProcessPhoto>
+    implements ApsReportZjProcessPhotoService {
+
+}
+
+
+
+

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsReportZjProcessTableServiceImpl.java

@@ -0,0 +1,20 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwei.bscommon.sys.dao.ApsReportZjProcessTableMapper;
+import com.rongwei.bscommon.sys.service.ApsReportZjProcessTableService;
+import com.rongwei.bsentity.domain.ApsReportZjProcessTable;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ */
+@Service
+public class ApsReportZjProcessTableServiceImpl extends ServiceImpl<ApsReportZjProcessTableMapper, ApsReportZjProcessTable>
+    implements ApsReportZjProcessTableService {
+
+}
+
+
+
+

cx-aps/cx-aps-common/src/main/resources/mybatis/ApsProductionOrderDao.xml

@@ -800,7 +800,7 @@
                    and apo.PROCESSSTATUS in ('30','40','50') -- 已发布
                    and (apope.PLANPROCESSRALL-apope.CANCELROLL)>0 -- 计划加工卷数- 已取消卷数合计
                    and apope.PLANENDDATE between DATE_FORMAT(DATE_SUB(CURRENT_DATE, INTERVAL 11 MONTH), '%Y-%m-01') and CURRENT_DATE -- 近12个月计划
-                   and apo.TENANTID='0001S31000000000J0TR'
+                   and apo.TENANTID=#{tenantId}
                  group by
                      month_year
              ),
@@ -819,7 +819,7 @@
                    and app.PROCESSCATEGORY='10' -- 铸轧
                    and arr.REPORTWORKSTATUS='已报工'
                    and apope.ACTUALFINISHDATE between DATE_FORMAT(DATE_SUB(CURRENT_DATE, INTERVAL 11 MONTH), '%Y-%m-01') and CURRENT_DATE -- 近12个月计划
-                   and apo.TENANTID='0001S31000000000J0TR'
+                   and apo.TENANTID=#{tenantId}
                  group by
                      month_year
              )
@@ -852,7 +852,7 @@
                    and apo.PROCESSSTATUS in ('30','40','50') -- 已发布
                    and (apope.PLANPROCESSRALL-apope.CANCELROLL)>0 -- 计划加工卷数- 已取消卷数合计
                    and apope.PLANENDDATE between DATE_FORMAT(DATE_SUB(CURRENT_DATE, INTERVAL 11 MONTH), '%Y-%m-01') and CURRENT_DATE -- 近12个月计划
-                   and apo.TENANTID='0001S31000000000J0TR'
+                   and apo.TENANTID=#{tenantId}
                  group by
                      month_year
              ),
@@ -871,7 +871,370 @@
                    and app.PROCESSCATEGORY='10' -- 铸轧
                    and arr.REPORTWORKSTATUS='已报工'
                    and apope.ACTUALFINISHDATE between DATE_FORMAT(DATE_SUB(CURRENT_DATE, INTERVAL 11 MONTH), '%Y-%m-01') and CURRENT_DATE -- 近12个月计划
-                   and apo.TENANTID='0001S31000000000J0TR'
+                   and apo.TENANTID=#{tenantId}
+                 group by
+                     month_year
+             )
+        select
+            DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL months.n MONTH), '%Y-%m') month_year,
+            IFNULL(plan.PLANPRODUCEVOLUME,0) AS 'PLANPRODUCEVOLUME', -- 计划加工量
+            IFNULL(actual.ACTUALPRODUCEVOLUME,0) AS 'ACTUALPRODUCEVOLUME' -- 实际已加工量
+        from
+            months
+                LEFT JOIN plan ON plan.month_year = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL months.n MONTH), '%Y-%m')
+                LEFT JOIN actual ON actual.month_year = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL months.n MONTH), '%Y-%m')
+        ORDER BY
+            month_year
+    </select>
+    <select id="selectProcessTable" resultType="com.rongwei.bsentity.domain.ApsReportJzProcessTable">
+        with plan as (
+            -- 按照车间分组统计本月精整工序类别计划加工量
+            select
+                apo.TENANTID,
+                apope.PROCESSWORKSHOPID,
+                max(apope.PROCESSWORKSHOP) PROCESSWORKSHOP,
+                sum(if(YEAR(apope.PLANENDDATE) = YEAR(CURRENT_DATE) and MONTH(apope.PLANENDDATE) = MONTH(CURRENT_DATE), -- 本月
+                       (apope.PLANPROCESSRALL-apope.CANCELROLL)*apo.SINGLEROLLWEIGHT,null)) PLANPRODUCEVOLUME, -- 本月计划加工量
+                sum(if(DATE(apope.PLANENDDATE) = DATE_SUB(CURRENT_DATE, INTERVAL 1 DAY), -- 昨日
+                       (apope.PLANPROCESSRALL-apope.CANCELROLL)*apo.SINGLEROLLWEIGHT,null)) YPLANPRODUCEVOLUME -- 昨日计划加工量
+            from
+                aps_process_operation_process_equ apope
+                    join aps_process_operation apo on apo.ID = apope.PROCESSID
+                    join aps_production_processes app on app.PRODUCTPROCESSNAME=apo.PROCESS
+            where
+                apope.deleted='0' and apo.DELETED='0'
+              and app.PROCESSCATEGORY='40' -- 精整
+              and apo.PROCESSSTATUS in ('30','40','50') -- 已发布
+              and (apope.PLANPROCESSRALL-apope.CANCELROLL)>0 -- 计划加工卷数- 已取消卷数合计
+              and (YEAR(apope.PLANENDDATE) = YEAR(CURRENT_DATE) and MONTH(apope.PLANENDDATE) = MONTH(CURRENT_DATE) -- 本月
+                or DATE(apope.PLANENDDATE) = DATE_SUB(CURRENT_DATE, INTERVAL 1 DAY)) -- 昨日
+              and apo.TENANTID=#{tenantId}
+            group by
+                apope.PROCESSWORKSHOPID
+        ),
+             actual as (
+                 -- 按照车间分组统计本月精整工序类别实际加工量
+                 select
+                     apo.TENANTID,
+                     apope.PROCESSWORKSHOPID,
+                     max(apope.PROCESSWORKSHOP) PROCESSWORKSHOP,
+                     sum(if(YEAR(apope.ACTUALFINISHDATE) = YEAR(CURRENT_DATE) and MONTH(apope.ACTUALFINISHDATE) = MONTH(CURRENT_DATE), -- 本月
+                            (LENGTH(trim( BOTH ',' FROM arr.BATCHNUMBER))-LENGTH(REPLACE(trim( BOTH ',' FROM arr.BATCHNUMBER), ',', '')) + 1) * IFNULL(arr.ACTUALROLLWEIGHT,apo.SINGLEROLLWEIGHT),null)) ACTUALPRODUCEVOLUME, -- 本月实际已加工量=报工批次号数量*实际输入单卷重
+                     sum(if(DATE(apope.ACTUALFINISHDATE) = DATE_SUB(CURRENT_DATE, INTERVAL 1 DAY), -- 昨日
+                            (LENGTH(trim( BOTH ',' FROM arr.BATCHNUMBER))-LENGTH(REPLACE(trim( BOTH ',' FROM arr.BATCHNUMBER), ',', '')) + 1) * IFNULL(arr.ACTUALROLLWEIGHT,apo.SINGLEROLLWEIGHT),null)) YACTUALPRODUCEVOLUME -- 昨日实际已加工量=报工批次号数量*实际输入单卷重
+                 from
+                     aps_report_records arr
+                         join aps_process_operation_process_equ apope  on apope.id=arr.PROCESSEQUID
+                         join aps_process_operation apo on apo.ID = apope.PROCESSID
+                         join aps_production_processes app on app.PRODUCTPROCESSNAME=apo.PROCESS
+                 where
+                     apope.deleted='0' and apo.DELETED='0' and arr.deleted='0'
+                   and app.PROCESSCATEGORY='40' -- 精整
+                   and arr.REPORTWORKSTATUS='已报工'
+                   and (YEAR(apope.ACTUALFINISHDATE) = YEAR(CURRENT_DATE) and MONTH(apope.ACTUALFINISHDATE) = MONTH(CURRENT_DATE) -- 本月
+                     or DATE(apope.ACTUALFINISHDATE) = DATE_SUB(CURRENT_DATE, INTERVAL 1 DAY)) -- 昨日
+                   and apo.TENANTID=#{tenantId}
+                 group by
+                     apope.PROCESSWORKSHOPID
+             )
+        select
+            plan.PROCESSWORKSHOPID
+             ,plan.PROCESSWORKSHOP
+             ,IFNULL(plan.PLANPRODUCEVOLUME,0) AS 'PLANPRODUCEVOLUME' -- 本月计划加工（吨）
+             ,IFNULL(plan.YPLANPRODUCEVOLUME,0) AS 'YPLANPRODUCEVOLUME' -- 昨日计划加工（吨）
+             ,IFNULL(actual.ACTUALPRODUCEVOLUME,0) AS 'ACTUALPRODUCEVOLUME' -- 本月实际已加工（吨）
+             ,IFNULL(actual.YACTUALPRODUCEVOLUME,0) AS 'YACTUALPRODUCEVOLUME' -- 昨日实际已加工（吨）
+             ,if(plan.PLANPRODUCEVOLUME is null or plan.PLANPRODUCEVOLUME = 0,
+                 1, actual.ACTUALPRODUCEVOLUME/plan.PLANPRODUCEVOLUME) COMPLETIONRATIO -- 本月实际已完成比例
+        from
+            plan left join actual on plan.PROCESSWORKSHOPID=actual.PROCESSWORKSHOPID
+        union -- mysql 该版本不支持full join，通过left join 和right join配合
+        select
+            plan.PROCESSWORKSHOPID
+             ,plan.PROCESSWORKSHOP
+             ,IFNULL(plan.PLANPRODUCEVOLUME,0) AS 'PLANPRODUCEVOLUME' -- 本月计划加工（吨）
+             ,IFNULL(plan.YPLANPRODUCEVOLUME,0) AS 'YPLANPRODUCEVOLUME' -- 昨日计划加工（吨）
+             ,IFNULL(actual.ACTUALPRODUCEVOLUME,0) AS 'ACTUALPRODUCEVOLUME' -- 本月实际已加工（吨）
+             ,IFNULL(actual.YACTUALPRODUCEVOLUME,0) AS 'YACTUALPRODUCEVOLUME' -- 昨日实际已加工（吨）
+             ,if(plan.PLANPRODUCEVOLUME is null or plan.PLANPRODUCEVOLUME = 0,
+                 1, actual.ACTUALPRODUCEVOLUME/plan.PLANPRODUCEVOLUME) COMPLETIONRATIO -- 本月实际已完成比例
+        from
+            plan right join actual on plan.PROCESSWORKSHOPID=actual.PROCESSWORKSHOPID
+    </select>
+    <select id="selectProcessAvg" resultType="com.rongwei.bsentity.domain.ApsReportJzProcessPhoto">
+        with months as (
+            -- 12个月
+            SELECT 0 AS n UNION SELECT 1 UNION SELECT 2 UNION SELECT 3 UNION SELECT 4 UNION SELECT 5 UNION SELECT 6 UNION SELECT 7 UNION SELECT 8 UNION SELECT 9 UNION SELECT 10 UNION SELECT 11
+        ),
+             plan as (
+                 -- 近12个月精整计划加工量
+                 select
+                     DATE_FORMAT(apope.PLANENDDATE, '%Y-%m') month_year,
+                     sum((apope.PLANPROCESSRALL-apope.CANCELROLL)*apo.SINGLEROLLWEIGHT) PLANPRODUCEVOLUME -- 当月计划加工量
+                 from
+                     aps_process_operation_process_equ apope
+                         join aps_process_operation apo on apo.ID = apope.PROCESSID
+                         join aps_production_processes app on app.PRODUCTPROCESSNAME=apo.PROCESS
+                 where
+                     apope.deleted='0' and apo.DELETED='0'
+                   and app.PROCESSCATEGORY='40' -- 精整
+                   and apo.PROCESSSTATUS in ('30','40','50') -- 已发布
+                   and (apope.PLANPROCESSRALL-apope.CANCELROLL)>0 -- 计划加工卷数- 已取消卷数合计
+                   and apope.PLANENDDATE between DATE_FORMAT(DATE_SUB(CURRENT_DATE, INTERVAL 11 MONTH), '%Y-%m-01') and CURRENT_DATE -- 近12个月计划
+                   and apo.TENANTID=#{tenantId}
+                 group by
+                     month_year
+             ),
+             actual as (
+                 -- 近12个月精整实际加工量
+                 select
+                     DATE_FORMAT(apope.ACTUALFINISHDATE, '%Y-%m') month_year,
+                     sum((LENGTH(trim( BOTH ',' FROM arr.BATCHNUMBER))-LENGTH(REPLACE(trim( BOTH ',' FROM arr.BATCHNUMBER), ',', '')) + 1) * IFNULL(arr.ACTUALROLLWEIGHT,apo.SINGLEROLLWEIGHT)) ACTUALPRODUCEVOLUME -- 当月实际已加工量
+                 from
+                     aps_report_records arr
+                         join aps_process_operation_process_equ apope  on apope.id=arr.PROCESSEQUID
+                         join aps_process_operation apo on apo.ID = apope.PROCESSID
+                         join aps_production_processes app on app.PRODUCTPROCESSNAME=apo.PROCESS
+                 where
+                     apope.deleted='0' and apo.DELETED='0' and arr.deleted='0'
+                   and app.PROCESSCATEGORY='40' -- 精整
+                   and arr.REPORTWORKSTATUS='已报工'
+                   and apope.ACTUALFINISHDATE between DATE_FORMAT(DATE_SUB(CURRENT_DATE, INTERVAL 11 MONTH), '%Y-%m-01') and CURRENT_DATE -- 近12个月计划
+                   and apo.TENANTID=#{tenantId}
+                 group by
+                     month_year
+             )
+        -- 计划加工量月平均值，实际已加工量月平均值
+        select
+            IFNULL(AVG(plan.PLANPRODUCEVOLUME),0) AVGPLANPRODUCEVOLUME, -- 计划加工量月平均
+            IFNULL(AVG(actual.ACTUALPRODUCEVOLUME),0) AVGACTUALPRODUCEVOLUME -- 实际已加工量月平均
+        from
+            months
+                LEFT JOIN plan ON plan.month_year = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL months.n MONTH), '%Y-%m')
+                LEFT JOIN actual ON actual.month_year = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL months.n MONTH), '%Y-%m') limit 1
+    </select>
+    <select id="selectProcessTrend" resultType="com.rongwei.bsentity.domain.ApsReportJzProcessPhoto">
+        with months as (
+            -- 12个月
+            SELECT 0 AS n UNION SELECT 1 UNION SELECT 2 UNION SELECT 3 UNION SELECT 4 UNION SELECT 5 UNION SELECT 6 UNION SELECT 7 UNION SELECT 8 UNION SELECT 9 UNION SELECT 10 UNION SELECT 11
+        ),
+             plan as (
+                 -- 近12个月精整计划加工量
+                 select
+                     DATE_FORMAT(apope.PLANENDDATE, '%Y-%m') month_year,
+                     sum((apope.PLANPROCESSRALL-apope.CANCELROLL)*apo.SINGLEROLLWEIGHT) PLANPRODUCEVOLUME -- 当月计划加工量
+                 from
+                     aps_process_operation_process_equ apope
+                         join aps_process_operation apo on apo.ID = apope.PROCESSID
+                         join aps_production_processes app on app.PRODUCTPROCESSNAME=apo.PROCESS
+                 where
+                     apope.deleted='0' and apo.DELETED='0'
+                   and app.PROCESSCATEGORY='40' -- 精整
+                   and apo.PROCESSSTATUS in ('30','40','50') -- 已发布
+                   and (apope.PLANPROCESSRALL-apope.CANCELROLL)>0 -- 计划加工卷数- 已取消卷数合计
+                   and apope.PLANENDDATE between DATE_FORMAT(DATE_SUB(CURRENT_DATE, INTERVAL 11 MONTH), '%Y-%m-01') and CURRENT_DATE -- 近12个月计划
+                   and apo.TENANTID=#{tenantId}
+                 group by
+                     month_year
+             ),
+             actual as (
+                 -- 近12个月精整实际加工量
+                 select
+                     DATE_FORMAT(apope.ACTUALFINISHDATE, '%Y-%m') month_year,
+                     sum((LENGTH(trim( BOTH ',' FROM arr.BATCHNUMBER))-LENGTH(REPLACE(trim( BOTH ',' FROM arr.BATCHNUMBER), ',', '')) + 1) * IFNULL(arr.ACTUALROLLWEIGHT,apo.SINGLEROLLWEIGHT)) ACTUALPRODUCEVOLUME -- 当月实际已加工量
+                 from
+                     aps_report_records arr
+                         join aps_process_operation_process_equ apope  on apope.id=arr.PROCESSEQUID
+                         join aps_process_operation apo on apo.ID = apope.PROCESSID
+                         join aps_production_processes app on app.PRODUCTPROCESSNAME=apo.PROCESS
+                 where
+                     apope.deleted='0' and apo.DELETED='0' and arr.deleted='0'
+                   and app.PROCESSCATEGORY='40' -- 精整
+                   and arr.REPORTWORKSTATUS='已报工'
+                   and apope.ACTUALFINISHDATE between DATE_FORMAT(DATE_SUB(CURRENT_DATE, INTERVAL 11 MONTH), '%Y-%m-01') and CURRENT_DATE -- 近12个月计划
+                   and apo.TENANTID=#{tenantId}
+                 group by
+                     month_year
+             )
+        select
+            DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL months.n MONTH), '%Y-%m') month_year,
+            IFNULL(plan.PLANPRODUCEVOLUME,0) AS 'PLANPRODUCEVOLUME', -- 计划加工量
+            IFNULL(actual.ACTUALPRODUCEVOLUME,0) AS 'ACTUALPRODUCEVOLUME' -- 实际已加工量
+        from
+            months
+                LEFT JOIN plan ON plan.month_year = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL months.n MONTH), '%Y-%m')
+                LEFT JOIN actual ON actual.month_year = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL months.n MONTH), '%Y-%m')
+        ORDER BY
+            month_year
+    </select>
+    <select id="selectZjProcessTable" resultType="com.rongwei.bsentity.domain.ApsReportZjProcessTable">
+        with plan as (
+            -- 按照车间分组统计本月轧机工序类别计划加工量
+            select
+                apo.TENANTID,
+                apope.PROCESSWORKSHOPID,
+                max(apope.PROCESSWORKSHOP) PROCESSWORKSHOP,
+                sum(if(YEAR(apope.PLANENDDATE) = YEAR(CURRENT_DATE) and MONTH(apope.PLANENDDATE) = MONTH(CURRENT_DATE), -- 本月
+                       apope.PLANPROCESSRALL-apope.CANCELROLL,null)) PLANPRODUCEVOLUME, -- 本月计划加工量
+                sum(if(DATE(apope.PLANENDDATE) = DATE_SUB(CURRENT_DATE, INTERVAL 1 DAY), -- 昨日
+                       apope.PLANPROCESSRALL-apope.CANCELROLL,null)) YPLANPRODUCEVOLUME -- 昨日计划加工量
+            from
+                aps_process_operation_process_equ apope
+                    join aps_process_operation apo on apo.ID = apope.PROCESSID
+                    join aps_production_processes app on app.PRODUCTPROCESSNAME=apo.PROCESS
+            where
+                apope.deleted='0' and apo.DELETED='0'
+              and app.PROCESSCATEGORY='20' -- 轧机
+              and apo.PROCESSSTATUS in ('30','40','50') -- 已发布
+              and (apope.PLANPROCESSRALL-apope.CANCELROLL)>0 -- 计划加工卷数- 已取消卷数合计
+              and (YEAR(apope.PLANENDDATE) = YEAR(CURRENT_DATE) and MONTH(apope.PLANENDDATE) = MONTH(CURRENT_DATE) -- 本月
+                or DATE(apope.PLANENDDATE) = DATE_SUB(CURRENT_DATE, INTERVAL 1 DAY)) -- 昨日
+              and apo.TENANTID=#{tenantId}
+            group by
+                apope.PROCESSWORKSHOPID
+        ),
+             actual as (
+                 -- 按照车间分组统计本月轧机工序类别实际加工量
+                 select
+                     apo.TENANTID,
+                     apope.PROCESSWORKSHOPID,
+                     max(apope.PROCESSWORKSHOP) PROCESSWORKSHOP,
+                     sum(if(YEAR(apope.ACTUALFINISHDATE) = YEAR(CURRENT_DATE) and MONTH(apope.ACTUALFINISHDATE) = MONTH(CURRENT_DATE), -- 本月
+                            1,null)) ACTUALPRODUCEVOLUME, -- 本月实际已加工量
+                     sum(if(DATE(apope.ACTUALFINISHDATE) = DATE_SUB(CURRENT_DATE, INTERVAL 1 DAY), --  昨日
+                            1,null)) YACTUALPRODUCEVOLUME -- 昨日实际已加工量
+                 from
+                     aps_report_records arr
+                         join aps_process_operation_process_equ apope  on apope.id=arr.PROCESSEQUID
+                         join aps_process_operation apo on apo.ID = apope.PROCESSID
+                         join aps_production_processes app on app.PRODUCTPROCESSNAME=apo.PROCESS
+                 where
+                     apope.deleted='0' and apo.DELETED='0' and arr.deleted='0'
+                   and app.PROCESSCATEGORY='20' -- 轧机
+                   and arr.REPORTWORKSTATUS='已报工'
+                   and (YEAR(apope.ACTUALFINISHDATE) = YEAR(CURRENT_DATE) and MONTH(apope.ACTUALFINISHDATE) = MONTH(CURRENT_DATE) -- 本月
+                     or DATE(apope.ACTUALFINISHDATE) = DATE_SUB(CURRENT_DATE, INTERVAL 1 DAY)) -- 昨日
+                   and apo.TENANTID=#{tenantId}
+                 group by
+                     apope.PROCESSWORKSHOPID
+             )
+        select
+            plan.PROCESSWORKSHOPID
+             ,plan.PROCESSWORKSHOP
+             ,ifnull(plan.PLANPRODUCEVOLUME,0) PLANPRODUCEVOLUME -- 本月计划加工（道次）
+             ,ifnull(plan.YPLANPRODUCEVOLUME,0) YPLANPRODUCEVOLUME -- 昨日计划加工（道次）
+             ,ifnull(actual.ACTUALPRODUCEVOLUME,0) YPLANPRODUCEVOLUME  -- 本月实际已加工（道次）
+             ,ifnull(actual.YACTUALPRODUCEVOLUME,0) YPLANPRODUCEVOLUME  -- 昨日实际已加工（道次）
+             ,if(plan.PLANPRODUCEVOLUME is null or plan.PLANPRODUCEVOLUME = 0,
+                 1, actual.ACTUALPRODUCEVOLUME/plan.PLANPRODUCEVOLUME) COMPLETIONRATIO -- 本月实际已完成比例
+        from
+            plan left join actual on plan.PROCESSWORKSHOPID=actual.PROCESSWORKSHOPID
+        union -- mysql 该版本不支持full join，通过left join 和right join配合
+        select
+            plan.PROCESSWORKSHOPID
+             ,plan.PROCESSWORKSHOP
+             ,ifnull(plan.PLANPRODUCEVOLUME,0) PLANPRODUCEVOLUME -- 本月计划加工（道次）
+             ,ifnull(plan.YPLANPRODUCEVOLUME,0) YPLANPRODUCEVOLUME -- 昨日计划加工（道次）
+             ,ifnull(actual.ACTUALPRODUCEVOLUME,0) YPLANPRODUCEVOLUME  -- 本月实际已加工（道次）
+             ,ifnull(actual.YACTUALPRODUCEVOLUME,0) YPLANPRODUCEVOLUME  -- 昨日实际已加工（道次）
+             ,if(plan.PLANPRODUCEVOLUME is null or plan.PLANPRODUCEVOLUME = 0,
+                 1, actual.ACTUALPRODUCEVOLUME/plan.PLANPRODUCEVOLUME) COMPLETIONRATIO -- 本月实际已完成比例
+        from
+            plan right join actual on plan.PROCESSWORKSHOPID=actual.PROCESSWORKSHOPID
+    </select>
+    <select id="selectAvgZjProcessPhoto" resultType="com.rongwei.bsentity.domain.ApsReportZjProcessPhoto">
+        with months as (
+            -- 12个月
+            SELECT 0 AS n UNION SELECT 1 UNION SELECT 2 UNION SELECT 3 UNION SELECT 4 UNION SELECT 5 UNION SELECT 6 UNION SELECT 7 UNION SELECT 8 UNION SELECT 9 UNION SELECT 10 UNION SELECT 11
+        ),
+             plan as (
+                 -- 近12个月轧机计划加工量
+                 select
+                     DATE_FORMAT(apope.PLANENDDATE, '%Y-%m') month_year,
+                     sum(apope.PLANPROCESSRALL-apope.CANCELROLL) PLANPRODUCEVOLUME -- 当月计划加工量
+                 from
+                     aps_process_operation_process_equ apope
+                         join aps_process_operation apo on apo.ID = apope.PROCESSID
+                         join aps_production_processes app on app.PRODUCTPROCESSNAME=apo.PROCESS
+                 where
+                     apope.deleted='0' and apo.DELETED='0'
+                   and app.PROCESSCATEGORY='20' -- 轧机
+                   and apo.PROCESSSTATUS in ('30','40','50') -- 已发布
+                   and (apope.PLANPROCESSRALL-apope.CANCELROLL)>0 -- 计划加工卷数- 已取消卷数合计
+                   and apope.PLANENDDATE between DATE_FORMAT(DATE_SUB(CURRENT_DATE, INTERVAL 11 MONTH), '%Y-%m-01') and CURRENT_DATE -- 近12个月计划
+                   and apo.TENANTID=#{tenantId}
+                 group by
+                     month_year
+             ),
+             actual as (
+                 -- 近12个月轧机实际加工量
+                 select
+                     DATE_FORMAT(apope.ACTUALFINISHDATE, '%Y-%m') month_year,
+                     count(arr.id) ACTUALPRODUCEVOLUME -- 当月实际已加工量
+                 from
+                     aps_report_records arr
+                         join aps_process_operation_process_equ apope  on apope.id=arr.PROCESSEQUID
+                         join aps_process_operation apo on apo.ID = apope.PROCESSID
+                         join aps_production_processes app on app.PRODUCTPROCESSNAME=apo.PROCESS
+                 where
+                     apope.deleted='0' and apo.DELETED='0' and arr.deleted='0'
+                   and app.PROCESSCATEGORY='20' -- 轧机
+                   and arr.REPORTWORKSTATUS='已报工'
+                   and apope.ACTUALFINISHDATE between DATE_FORMAT(DATE_SUB(CURRENT_DATE, INTERVAL 11 MONTH), '%Y-%m-01') and CURRENT_DATE -- 近12个月计划
+                   and apo.TENANTID=#{tenantId}
+                 group by
+                     month_year
+             )
+
+        -- 计划加工量月平均值，实际已加工量月平均值
+        select
+            IFNULL(AVG(plan.PLANPRODUCEVOLUME),0) AVGPLANPRODUCEVOLUME, -- 计划加工量月平均
+            IFNULL(AVG(actual.ACTUALPRODUCEVOLUME),0) AVGACTUALPRODUCEVOLUME -- 实际已加工量月平均
+        from
+            months
+                LEFT JOIN plan ON plan.month_year = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL months.n MONTH), '%Y-%m')
+                LEFT JOIN actual ON actual.month_year = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL months.n MONTH), '%Y-%m') limit 1
+    </select>
+    <select id="selectZjProcessPhoto" resultType="com.rongwei.bsentity.domain.ApsReportZjProcessPhoto">
+        with months as (
+            -- 12个月
+            SELECT 0 AS n UNION SELECT 1 UNION SELECT 2 UNION SELECT 3 UNION SELECT 4 UNION SELECT 5 UNION SELECT 6 UNION SELECT 7 UNION SELECT 8 UNION SELECT 9 UNION SELECT 10 UNION SELECT 11
+        ),
+             plan as (
+                 -- 近12个月轧机计划加工量
+                 select
+                     DATE_FORMAT(apope.PLANENDDATE, '%Y-%m') month_year,
+                     sum(apope.PLANPROCESSRALL-apope.CANCELROLL) PLANPRODUCEVOLUME -- 当月计划加工量
+                 from
+                     aps_process_operation_process_equ apope
+                         join aps_process_operation apo on apo.ID = apope.PROCESSID
+                         join aps_production_processes app on app.PRODUCTPROCESSNAME=apo.PROCESS
+                 where
+                     apope.deleted='0' and apo.DELETED='0'
+                   and app.PROCESSCATEGORY='20' -- 轧机
+                   and apo.PROCESSSTATUS in ('30','40','50') -- 已发布
+                   and (apope.PLANPROCESSRALL-apope.CANCELROLL)>0 -- 计划加工卷数- 已取消卷数合计
+                   and apope.PLANENDDATE between DATE_FORMAT(DATE_SUB(CURRENT_DATE, INTERVAL 11 MONTH), '%Y-%m-01') and CURRENT_DATE -- 近12个月计划
+                   and apo.TENANTID=#{tenantId}
+                 group by
+                     month_year
+             ),
+             actual as (
+                 -- 近12个月轧机实际加工量
+                 select
+                     DATE_FORMAT(apope.ACTUALFINISHDATE, '%Y-%m') month_year,
+                     count(arr.id) ACTUALPRODUCEVOLUME -- 当月实际已加工量
+                 from
+                     aps_report_records arr
+                         join aps_process_operation_process_equ apope  on apope.id=arr.PROCESSEQUID
+                         join aps_process_operation apo on apo.ID = apope.PROCESSID
+                         join aps_production_processes app on app.PRODUCTPROCESSNAME=apo.PROCESS
+                 where
+                     apope.deleted='0' and apo.DELETED='0' and arr.deleted='0'
+                   and app.PROCESSCATEGORY='20' -- 轧机
+                   and arr.REPORTWORKSTATUS='已报工'
+                   and apope.ACTUALFINISHDATE between DATE_FORMAT(DATE_SUB(CURRENT_DATE, INTERVAL 11 MONTH), '%Y-%m-01') and CURRENT_DATE -- 近12个月计划
+                   and apo.TENANTID=#{tenantId}
                  group by
                      month_year
              )
@@ -886,4 +1249,185 @@
         ORDER BY
             month_year
     </select>
+    <select id="selectThProcessTable" resultType="com.rongwei.bsentity.domain.ApsReportThProcessTable">
+        with plan as (
+            -- 按照车间分组统计本月退火工序类别计划加工量
+            select
+                apo.TENANTID,
+                apope.PROCESSWORKSHOPID,
+                max(apope.PROCESSWORKSHOP) PROCESSWORKSHOP,
+                count(DISTINCT if(YEAR(apope.PLANENDDATE) = YEAR(CURRENT_DATE) and MONTH(apope.PLANENDDATE) = MONTH(CURRENT_DATE), -- 本月
+                                  apope.PROCESSDEVICEID+apope.PLANENDDATE,0)) PLANPRODUCEVOLUME, -- 本月计划加工量=炉次(设备ID+计划开工时间)的数量
+                count(DISTINCT if(DATE(apope.PLANENDDATE) = DATE_SUB(CURRENT_DATE, INTERVAL 1 DAY), -- 昨日
+                                  apope.PROCESSDEVICEID+apope.PLANENDDATE,0)) YPLANPRODUCEVOLUME -- 昨日计划加工量=炉次(设备ID+计划开工时间)的数量
+            from
+                aps_process_operation_process_equ apope
+                    join aps_process_operation apo on apo.ID = apope.PROCESSID
+                    join aps_production_processes app on app.PRODUCTPROCESSNAME=apo.PROCESS
+            where
+                apope.deleted='0' and apo.DELETED='0'
+              and app.PROCESSCATEGORY='30' -- 退火
+              and apo.PROCESSSTATUS in ('30','40','50') -- 已发布
+              and (apope.PLANPROCESSRALL-apope.CANCELROLL)>0 -- 计划加工卷数- 已取消卷数合计
+              and (YEAR(apope.PLANENDDATE) = YEAR(CURRENT_DATE) and MONTH(apope.PLANENDDATE) = MONTH(CURRENT_DATE) -- 本月
+                or DATE(apope.PLANENDDATE) = DATE_SUB(CURRENT_DATE, INTERVAL 1 DAY)) -- 昨日
+              and apo.TENANTID=#{tenantId}
+            group by
+                apope.PROCESSWORKSHOPID
+        ),
+             actual as (
+                 -- 按照车间分组统计本月退火工序类别实际加工量
+                 select
+                     apo.TENANTID,
+                     apope.PROCESSWORKSHOPID,
+                     max(apope.PROCESSWORKSHOP) PROCESSWORKSHOP,
+                     count(DISTINCT if(YEAR(apope.ACTUALFINISHDATE) = YEAR(CURRENT_DATE) and MONTH(apope.ACTUALFINISHDATE) = MONTH(CURRENT_DATE),
+                                       arr.HEATNUMBER, null)) ACTUALPRODUCEVOLUME, -- 本月实际已加工量
+                     count(DISTINCT if(DATE(apope.ACTUALFINISHDATE) = DATE_SUB(CURRENT_DATE, INTERVAL 1 DAY),
+                                       arr.HEATNUMBER, null)) YACTUALPRODUCEVOLUME -- 昨日实际已加工量
+                 from
+                     aps_report_records arr
+                         join aps_process_operation_process_equ apope  on apope.id=arr.PROCESSEQUID
+                         join aps_process_operation apo on apo.ID = apope.PROCESSID
+                         join aps_production_processes app on app.PRODUCTPROCESSNAME=apo.PROCESS
+                 where
+                     apope.deleted='0' and apo.DELETED='0' and arr.deleted='0'
+                   and app.PROCESSCATEGORY='30' -- 退火
+                   and arr.REPORTWORKSTATUS='已报工'
+                   and (YEAR(apope.ACTUALFINISHDATE) = YEAR(CURRENT_DATE) and MONTH(apope.ACTUALFINISHDATE) = MONTH(CURRENT_DATE) -- 本月
+                     or DATE(apope.ACTUALFINISHDATE) = DATE_SUB(CURRENT_DATE, INTERVAL 1 DAY)) -- 昨日
+                   and apo.TENANTID=#{tenantId}
+                 group by
+                     apope.PROCESSWORKSHOPID
+             )
+        select
+            plan.PROCESSWORKSHOPID
+             ,plan.PROCESSWORKSHOP
+             ,IFNULL(plan.PLANPRODUCEVOLUME,0) PLANPRODUCEVOLUME -- 本月计划加工（炉次）
+             ,IFNULL(plan.YPLANPRODUCEVOLUME,0) YPLANPRODUCEVOLUME -- 昨日计划加工（炉次）
+             ,IFNULL(actual.ACTUALPRODUCEVOLUME,0) ACTUALPRODUCEVOLUME -- 本月实际已加工（炉次）
+             ,IFNULL(actual.YACTUALPRODUCEVOLUME,0) YACTUALPRODUCEVOLUME -- 昨日实际已加工（炉次）
+             ,if(plan.PLANPRODUCEVOLUME is null or plan.PLANPRODUCEVOLUME = 0,
+                 1, actual.ACTUALPRODUCEVOLUME/plan.PLANPRODUCEVOLUME) CompletionRatio -- 本月实际已完成比例
+        from
+            plan left join actual on plan.PROCESSWORKSHOPID=actual.PROCESSWORKSHOPID
+        union -- mysql 该版本不支持full join，通过left join 和right join配合
+        select
+            plan.PROCESSWORKSHOPID
+             ,plan.PROCESSWORKSHOP
+             ,IFNULL(plan.PLANPRODUCEVOLUME,0) PLANPRODUCEVOLUME -- 本月计划加工（炉次）
+             ,IFNULL(plan.YPLANPRODUCEVOLUME,0) YPLANPRODUCEVOLUME -- 昨日计划加工（炉次）
+             ,IFNULL(actual.ACTUALPRODUCEVOLUME,0) ACTUALPRODUCEVOLUME -- 本月实际已加工（炉次）
+             ,IFNULL(actual.YACTUALPRODUCEVOLUME,0) YACTUALPRODUCEVOLUME -- 昨日实际已加工（炉次）
+             ,if(plan.PLANPRODUCEVOLUME is null or plan.PLANPRODUCEVOLUME = 0,
+                 1, actual.ACTUALPRODUCEVOLUME/plan.PLANPRODUCEVOLUME) CompletionRatio -- 本月实际已完成比例
+        from
+            plan right join actual on plan.PROCESSWORKSHOPID=actual.PROCESSWORKSHOPID
+    </select>
+    <select id="selectAvgThProcessPhoto" resultType="com.rongwei.bsentity.domain.ApsReportThProcessPhoto">
+        with months as (
+            -- 12个月
+            SELECT 0 AS n UNION SELECT 1 UNION SELECT 2 UNION SELECT 3 UNION SELECT 4 UNION SELECT 5 UNION SELECT 6 UNION SELECT 7 UNION SELECT 8 UNION SELECT 9 UNION SELECT 10 UNION SELECT 11
+        ),
+             plan as (
+                 -- 近12个月退火计划加工量
+                 select
+                     DATE_FORMAT(apope.PLANENDDATE, '%Y-%m') month_year,
+                     count(DISTINCT apope.PROCESSDEVICEID+apope.PLANENDDATE) PLANPRODUCEVOLUME -- 当月计划加工量=炉次(设备ID+计划开工时间)的数量
+                 from
+                     aps_process_operation_process_equ apope
+                         join aps_process_operation apo on apo.ID = apope.PROCESSID
+                         join aps_production_processes app on app.PRODUCTPROCESSNAME=apo.PROCESS
+                 where
+                     apope.deleted='0' and apo.DELETED='0'
+                   and app.PROCESSCATEGORY='30' -- 退火
+                   and apo.PROCESSSTATUS in ('30','40','50') -- 已发布
+                   and (apope.PLANPROCESSRALL-apope.CANCELROLL)>0 -- 计划加工卷数- 已取消卷数合计
+                   and apope.PLANENDDATE between DATE_FORMAT(DATE_SUB(CURRENT_DATE, INTERVAL 11 MONTH), '%Y-%m-01') and CURRENT_DATE -- 近12个月计划
+                   and apo.TENANTID=#{tenantId}
+                 group by
+                     month_year
+             ),
+             actual as (
+                 -- 近12个月退火实际加工量
+                 select
+                     DATE_FORMAT(apope.ACTUALFINISHDATE, '%Y-%m') month_year,
+                     count(DISTINCT arr.HEATNUMBER) ACTUALPRODUCEVOLUME -- 当月实际已加工量=炉次的数量
+                 from
+                     aps_report_records arr
+                         join aps_process_operation_process_equ apope  on apope.id=arr.PROCESSEQUID
+                         join aps_process_operation apo on apo.ID = apope.PROCESSID
+                         join aps_production_processes app on app.PRODUCTPROCESSNAME=apo.PROCESS
+                 where
+                     apope.deleted='0' and apo.DELETED='0' and arr.deleted='0'
+                   and app.PROCESSCATEGORY='30' -- 退火
+                   and arr.REPORTWORKSTATUS='已报工'
+                   and apope.ACTUALFINISHDATE between DATE_FORMAT(DATE_SUB(CURRENT_DATE, INTERVAL 11 MONTH), '%Y-%m-01') and CURRENT_DATE -- 近12个月计划
+                   and apo.TENANTID=#{tenantId}
+                 group by
+                     month_year
+             )
+        -- 计划加工量月平均值，实际已加工量月平均值
+        select
+            IFNULL(AVG(plan.PLANPRODUCEVOLUME),0) AVGPLANPRODUCEVOLUME, -- 计划加工量月平均
+            IFNULL(AVG(actual.ACTUALPRODUCEVOLUME),0) AVGACTUALPRODUCEVOLUME -- 实际已加工量月平均
+        from
+            months
+                LEFT JOIN plan ON plan.month_year = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL months.n MONTH), '%Y-%m')
+                LEFT JOIN actual ON actual.month_year = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL months.n MONTH), '%Y-%m') limit 1
+    </select>
+    <select id="selectThProcessPhoto" resultType="com.rongwei.bsentity.domain.ApsReportThProcessPhoto">
+        with months as (
+            -- 12个月
+            SELECT 0 AS n UNION SELECT 1 UNION SELECT 2 UNION SELECT 3 UNION SELECT 4 UNION SELECT 5 UNION SELECT 6 UNION SELECT 7 UNION SELECT 8 UNION SELECT 9 UNION SELECT 10 UNION SELECT 11
+        ),
+             plan as (
+                 -- 近12个月退火计划加工量
+                 select
+                     DATE_FORMAT(apope.PLANENDDATE, '%Y-%m') month_year,
+                     count(DISTINCT apope.PROCESSDEVICEID+apope.PLANENDDATE) PLANPRODUCEVOLUME -- 当月计划加工量=炉次(设备ID+计划开工时间)的数量
+                 from
+                     aps_process_operation_process_equ apope
+                         join aps_process_operation apo on apo.ID = apope.PROCESSID
+                         join aps_production_processes app on app.PRODUCTPROCESSNAME=apo.PROCESS
+                 where
+                     apope.deleted='0' and apo.DELETED='0'
+                   and app.PROCESSCATEGORY='30' -- 退火
+                   and apo.PROCESSSTATUS in ('30','40','50') -- 已发布
+                   and (apope.PLANPROCESSRALL-apope.CANCELROLL)>0 -- 计划加工卷数- 已取消卷数合计
+                   and apope.PLANENDDATE between DATE_FORMAT(DATE_SUB(CURRENT_DATE, INTERVAL 11 MONTH), '%Y-%m-01') and CURRENT_DATE -- 近12个月计划
+                   and apo.TENANTID=#{tenantId}
+                 group by
+                     month_year
+             ),
+             actual as (
+                 -- 近12个月退火实际加工量
+                 select
+                     DATE_FORMAT(apope.ACTUALFINISHDATE, '%Y-%m') month_year,
+                     count(DISTINCT arr.HEATNUMBER) ACTUALPRODUCEVOLUME -- 当月实际已加工量=炉次的数量
+                 from
+                     aps_report_records arr
+                         join aps_process_operation_process_equ apope  on apope.id=arr.PROCESSEQUID
+                         join aps_process_operation apo on apo.ID = apope.PROCESSID
+                         join aps_production_processes app on app.PRODUCTPROCESSNAME=apo.PROCESS
+                 where
+                     apope.deleted='0' and apo.DELETED='0' and arr.deleted='0'
+                   and app.PROCESSCATEGORY='30' -- 退火
+                   and arr.REPORTWORKSTATUS='已报工'
+                   and apope.ACTUALFINISHDATE between DATE_FORMAT(DATE_SUB(CURRENT_DATE, INTERVAL 11 MONTH), '%Y-%m-01') and CURRENT_DATE -- 近12个月计划
+                   and apo.TENANTID=#{tenantId}
+                 group by
+                     month_year
+             )
+        select
+            DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL months.n MONTH), '%Y-%m') month_year,
+            IFNULL(plan.PLANPRODUCEVOLUME,0) PLANPRODUCEVOLUME, -- 计划加工量
+            IFNULL(actual.ACTUALPRODUCEVOLUME,0) ACTUALPRODUCEVOLUME -- 实际已加工量
+        from
+            months
+                LEFT JOIN plan ON plan.month_year = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL months.n MONTH), '%Y-%m')
+                LEFT JOIN actual ON actual.month_year = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL months.n MONTH), '%Y-%m')
+        ORDER BY
+            month_year
+    </select>
 </mapper>

cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/domain/ApsReportJzProcessPhoto.java

@@ -0,0 +1,76 @@
+package com.rongwei.bsentity.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+
+import com.rongwei.rwcommon.base.BaseDo;
+import lombok.Data;
+
+/**
+ * aps-大屏数据-精整生产情况趋势图
+ * @TableName aps_report_jz_process_photo
+ */
+@TableName(value ="aps_report_jz_process_photo")
+@Data
+public class ApsReportJzProcessPhoto extends BaseDo implements Serializable {
+    /**
+     * 主键ID
+     */
+    @TableId(value = "ID")
+    private String id;
+
+    /**
+     * 
+     */
+    @TableField(value = "TENANTID")
+    private String tenantid;
+
+    /**
+     * 扩展json格式配置
+     */
+    @TableField(value = "ROPTION")
+    private String roption;
+
+    /**
+     * 工厂名称
+     */
+    @TableField(value = "TENANTNAME")
+    private String tenantname;
+
+    /**
+     * 年月
+     */
+    @TableField(value = "YEARMONTH")
+    private String yearmonth;
+
+    /**
+     * 计划加工量
+     */
+    @TableField(value = "PLANPRODUCEVOLUME")
+    private String planproducevolume;
+
+    /**
+     * 实际已加工量
+     */
+    @TableField(value = "ACTUALPRODUCEVOLUME")
+    private String actualproducevolume;
+
+    /**
+     * 计划加工量月平均
+     */
+    @TableField(value = "AVGPLANPRODUCEVOLUME")
+    private String avgplanproducevolume;
+
+    /**
+     * 实际已加工量月平均
+     */
+    @TableField(value = "AVGACTUALPRODUCEVOLUME")
+    private String avgactualproducevolume;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+}

cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/domain/ApsReportJzProcessTable.java

@@ -0,0 +1,88 @@
+package com.rongwei.bsentity.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+
+import com.rongwei.rwcommon.base.BaseDo;
+import lombok.Data;
+
+/**
+ * aps-大屏数据-精整生产情况表格
+ * @TableName aps_report_jz_process_table
+ */
+@TableName(value ="aps_report_jz_process_table")
+@Data
+public class ApsReportJzProcessTable extends BaseDo implements Serializable {
+    /**
+     * 主键ID
+     */
+    @TableId(value = "ID")
+    private String id;
+
+    /**
+     * 
+     */
+    @TableField(value = "TENANTID")
+    private String tenantid;
+
+    /**
+     * 扩展json格式配置
+     */
+    @TableField(value = "ROPTION")
+    private String roption;
+
+    /**
+     * 工厂名称
+     */
+    @TableField(value = "TENANTNAME")
+    private String tenantname;
+
+    /**
+     * 车间ID
+     */
+    @TableField(value = "PROCESSWORKSHOPID")
+    private String processworkshopid;
+
+    /**
+     * 车间
+     */
+    @TableField(value = "PROCESSWORKSHOP")
+    private String processworkshop;
+
+    /**
+     * 本月计划加工（吨）
+     */
+    @TableField(value = "PLANPRODUCEVOLUME")
+    private String planproducevolume;
+
+    /**
+     * 本月实际已加工（吨）
+     */
+    @TableField(value = "ACTUALPRODUCEVOLUME")
+    private String actualproducevolume;
+
+    /**
+     * 昨日计划加工（吨）
+     */
+    @TableField(value = "YPLANPRODUCEVOLUME")
+    private String yplanproducevolume;
+
+    /**
+     * 昨日实际已加工（吨）
+     */
+    @TableField(value = "YACTUALPRODUCEVOLUME")
+    private String yactualproducevolume;
+
+    /**
+     * 本月实际已完成比例
+     */
+    @TableField(value = "COMPLETIONRATIO")
+    private String completionratio;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+}

cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/domain/ApsReportThProcessPhoto.java

@@ -0,0 +1,76 @@
+package com.rongwei.bsentity.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+
+import com.rongwei.rwcommon.base.BaseDo;
+import lombok.Data;
+
+/**
+ * aps-大屏数据-退火生产情况趋势图
+ * @TableName aps_report_th_process_photo
+ */
+@TableName(value ="aps_report_th_process_photo")
+@Data
+public class ApsReportThProcessPhoto extends BaseDo implements Serializable {
+    /**
+     * 主键ID
+     */
+    @TableId(value = "ID")
+    private String id;
+
+    /**
+     * 
+     */
+    @TableField(value = "TENANTID")
+    private String tenantid;
+
+    /**
+     * 扩展json格式配置
+     */
+    @TableField(value = "ROPTION")
+    private String roption;
+
+    /**
+     * 工厂名称
+     */
+    @TableField(value = "TENANTNAME")
+    private String tenantname;
+
+    /**
+     * 年月
+     */
+    @TableField(value = "YEARMONTH")
+    private String yearmonth;
+
+    /**
+     * 计划加工量
+     */
+    @TableField(value = "PLANPRODUCEVOLUME")
+    private String planproducevolume;
+
+    /**
+     * 实际已加工量
+     */
+    @TableField(value = "ACTUALPRODUCEVOLUME")
+    private String actualproducevolume;
+
+    /**
+     * 计划加工量月平均
+     */
+    @TableField(value = "AVGPLANPRODUCEVOLUME")
+    private String avgplanproducevolume;
+
+    /**
+     * 实际已加工量月平均
+     */
+    @TableField(value = "AVGACTUALPRODUCEVOLUME")
+    private String avgactualproducevolume;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+}

cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/domain/ApsReportThProcessTable.java

@@ -0,0 +1,88 @@
+package com.rongwei.bsentity.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+
+import com.rongwei.rwcommon.base.BaseDo;
+import lombok.Data;
+
+/**
+ * aps-大屏数据-退火生产情况表格
+ * @TableName aps_report_th_process_table
+ */
+@TableName(value ="aps_report_th_process_table")
+@Data
+public class ApsReportThProcessTable extends BaseDo implements Serializable {
+    /**
+     * 主键ID
+     */
+    @TableId(value = "ID")
+    private String id;
+
+    /**
+     * 
+     */
+    @TableField(value = "TENANTID")
+    private String tenantid;
+
+    /**
+     * 扩展json格式配置
+     */
+    @TableField(value = "ROPTION")
+    private String roption;
+
+    /**
+     * 工厂名称
+     */
+    @TableField(value = "TENANTNAME")
+    private String tenantname;
+
+    /**
+     * 车间ID
+     */
+    @TableField(value = "PROCESSWORKSHOPID")
+    private String processworkshopid;
+
+    /**
+     * 车间
+     */
+    @TableField(value = "PROCESSWORKSHOP")
+    private String processworkshop;
+
+    /**
+     * 本月计划加工（炉次）
+     */
+    @TableField(value = "PLANPRODUCEVOLUME")
+    private String planproducevolume;
+
+    /**
+     * 本月实际已加工（炉次）
+     */
+    @TableField(value = "ACTUALPRODUCEVOLUME")
+    private String actualproducevolume;
+
+    /**
+     * 昨日计划加工（炉次）
+     */
+    @TableField(value = "YPLANPRODUCEVOLUME")
+    private String yplanproducevolume;
+
+    /**
+     * 昨日实际已加工（炉次）
+     */
+    @TableField(value = "YACTUALPRODUCEVOLUME")
+    private String yactualproducevolume;
+
+    /**
+     * 本月实际已完成比例
+     */
+    @TableField(value = "COMPLETIONRATIO")
+    private String completionratio;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+}

cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/domain/ApsReportZjProcessPhoto.java

@@ -0,0 +1,76 @@
+package com.rongwei.bsentity.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+
+import com.rongwei.rwcommon.base.BaseDo;
+import lombok.Data;
+
+/**
+ * aps-大屏数据-轧机生产情况趋势图
+ * @TableName aps_report_zj_process_photo
+ */
+@TableName(value ="aps_report_zj_process_photo")
+@Data
+public class ApsReportZjProcessPhoto extends BaseDo implements Serializable {
+    /**
+     * 主键ID
+     */
+    @TableId(value = "ID")
+    private String id;
+
+    /**
+     * 
+     */
+    @TableField(value = "TENANTID")
+    private String tenantid;
+
+    /**
+     * 扩展json格式配置
+     */
+    @TableField(value = "ROPTION")
+    private String roption;
+
+    /**
+     * 工厂名称
+     */
+    @TableField(value = "TENANTNAME")
+    private String tenantname;
+
+    /**
+     * 年月
+     */
+    @TableField(value = "YEARMONTH")
+    private String yearmonth;
+
+    /**
+     * 计划加工量
+     */
+    @TableField(value = "PLANPRODUCEVOLUME")
+    private String planproducevolume;
+
+    /**
+     * 实际已加工量
+     */
+    @TableField(value = "ACTUALPRODUCEVOLUME")
+    private String actualproducevolume;
+
+    /**
+     * 计划加工量月平均
+     */
+    @TableField(value = "AVGPLANPRODUCEVOLUME")
+    private String avgplanproducevolume;
+
+    /**
+     * 实际已加工量月平均
+     */
+    @TableField(value = "AVGACTUALPRODUCEVOLUME")
+    private String avgactualproducevolume;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+}

cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/domain/ApsReportZjProcessTable.java

@@ -0,0 +1,88 @@
+package com.rongwei.bsentity.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+
+import com.rongwei.rwcommon.base.BaseDo;
+import lombok.Data;
+
+/**
+ * aps-大屏数据-轧机生产情况表格
+ * @TableName aps_report_zj_process_table
+ */
+@TableName(value ="aps_report_zj_process_table")
+@Data
+public class ApsReportZjProcessTable extends BaseDo implements Serializable {
+    /**
+     * 主键ID
+     */
+    @TableId(value = "ID")
+    private String id;
+
+    /**
+     * 
+     */
+    @TableField(value = "TENANTID")
+    private String tenantid;
+
+    /**
+     * 扩展json格式配置
+     */
+    @TableField(value = "ROPTION")
+    private String roption;
+
+    /**
+     * 工厂名称
+     */
+    @TableField(value = "TENANTNAME")
+    private String tenantname;
+
+    /**
+     * 车间ID
+     */
+    @TableField(value = "PROCESSWORKSHOPID")
+    private String processworkshopid;
+
+    /**
+     * 车间
+     */
+    @TableField(value = "PROCESSWORKSHOP")
+    private String processworkshop;
+
+    /**
+     * 本月计划加工（吨）
+     */
+    @TableField(value = "PLANPRODUCEVOLUME")
+    private String planproducevolume;
+
+    /**
+     * 本月实际已加工（吨）
+     */
+    @TableField(value = "ACTUALPRODUCEVOLUME")
+    private String actualproducevolume;
+
+    /**
+     * 昨日计划加工（吨）
+     */
+    @TableField(value = "YPLANPRODUCEVOLUME")
+    private String yplanproducevolume;
+
+    /**
+     * 昨日实际已加工（吨）
+     */
+    @TableField(value = "YACTUALPRODUCEVOLUME")
+    private String yactualproducevolume;
+
+    /**
+     * 本月实际已完成比例
+     */
+    @TableField(value = "COMPLETIONRATIO")
+    private String completionratio;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+}