aps-大屏

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

@@ -3,6 +3,7 @@ package com.rongwei.bscommon.sys.dao;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.rongwei.bsentity.domain.ApsProcessOperationDo;
 import com.rongwei.bsentity.domain.ApsProductionOrderDo;
+import com.rongwei.bsentity.domain.ApsReportYearAndMonth;
 import com.rongwei.bsentity.vo.BlankIdAndWorkShopVo;
 import com.rongwei.bsentity.vo.ProductDetailIdAndPlanOutPutRollCountAllVo;
 import com.rongwei.bsentity.vo.ProductTypeIdAndPidVo;
@@ -84,6 +85,8 @@ public interface ApsProductionOrderDao extends BaseMapper<ApsProductionOrderDo>
 
     @Select("select DISTINCT apop.CHANGEALLOY from aps_blank_order abo LEFT JOIN aps_process_output_product apop ON abo.ID = apop.BLANKID AND apop.DELETED = 0 WHERE abo.DELETED = 0 AND abo.PRODUCTIONORDERID = #{id} AND apop.CHANGEALLOY != '' AND apop.CHANGEALLOY is not null ")
     List<String> selectChangeAlloyByOrderId(@Param("id") String id);
+
+    List<ApsReportYearAndMonth> selectNowYearPlanGetOrderNum();
 }
 
 

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

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

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

@@ -46,4 +46,6 @@ public interface ApsProductionOrderService extends IService<ApsProductionOrderDo
     R generalMsUpdate(OrderSaveOrUpdateVo req);
 
     R removeBatchNumberByOrderId(String orderId);
+
+    void dataEyeReport();
 }

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

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

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

@@ -1250,7 +1250,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                 //如果有后道工序作业，并且计划流转卷数不等于所有后道工序作业计划加工卷数合计；错误提示：{工序}{工序显示名}的{输出物料} 计划流转卷数必须等于所有后道工序作业计划加工卷数合计；
                 if (ObjectUtil.isNotEmpty(apsProcessOperationDo.getNextprocessid())) {
                     if (planProcessRollAll != outputRollAll) {
-                        return R.error(apsProcessOperationDo.getProcess() + apsProcessOperationDo.getProcessname() + "的" + apsProcessOperationOutMaterDo.getOutputmaterial() + " 计划输出卷数-计划备料卷数-计划成品卷数必须等于所有后道工序作业计划加工卷数合计");
+                        return R.error(apsProcessOperationDo.getProcess() + apsProcessOperationDo.getProcessname() + "的" + apsProcessOperationOutMaterDo.getOutputmaterial() + " 计划流转卷数必须等于所有后道工序作业计划加工卷数合计");
                     }
                 } else {
                     //如果没有后道作业，并且计划流转卷数>0，则错误提示：{工序}{工序显示名}的{输出物料}的计划输出卷数必须等于计划备料卷数+计划成品卷数

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

@@ -1042,6 +1042,27 @@ public class ApsProductionOrderServiceImpl extends ServiceImpl<ApsProductionOrde
         return R.ok();
     }
 
+    @Override
+    public void dataEyeReport() {
+
+
+        //存储最终数据
+        List<ApsReportYearAndMonth> resInsertList = new LinkedList<>();
+        //初始化数据
+        SaveConstans.COMPANY_MAP.forEach((key,value) -> {
+            ApsReportYearAndMonth apsReportYearAndMonth = new ApsReportYearAndMonth();
+            apsReportYearAndMonth.setId(SecurityUtil.getUUID());
+            apsReportYearAndMonth.setTenantid(key);
+            apsReportYearAndMonth.setTenantname(value);
+            resInsertList.add(apsReportYearAndMonth);
+        });
+
+
+        //===================今年计划接单量==================
+        List<ApsReportYearAndMonth> apsReportYearAndMonthList = this.baseMapper.selectNowYearPlanGetOrderNum();
+
+    }
+
 }
 
 

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsReportYearAndMonthServiceImpl.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.ApsReportYearAndMonthDao;
+import com.rongwei.bscommon.sys.service.ApsReportYearAndMonthService;
+import com.rongwei.bsentity.domain.ApsReportYearAndMonth;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ */
+@Service
+public class ApsReportYearAndMonthServiceImpl extends ServiceImpl<ApsReportYearAndMonthDao, ApsReportYearAndMonth>
+    implements ApsReportYearAndMonthService {
+
+}
+
+
+
+

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

@@ -349,4 +349,15 @@
             GROUP BY 
                 a.ID
     </select>
+    <select id="selectNowYearPlanGetOrderNum" resultType="com.rongwei.bsentity.domain.ApsReportYearAndMonth">
+        select
+            aop.TENANTID AS 'tenantid',IFNULL(sum(PLANACCEPTORDERSUM),0) AS 'planordernumyear'
+        from
+            aps_accept_order_plan aop
+                join aps_accept_order_plan_detail aopd on aop.id=aopd.MAINID
+        where
+            aop.deleted='0' and aopd.deleted='0'
+          and aop.PARTYEAR=YEAR(CURRENT_DATE)
+        group by aop.TENANTID
+    </select>
 </mapper>

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

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.rongwei.bscommon.sys.dao.ApsReportYearAndMonthDao">
+
+    <resultMap id="BaseResultMap" type="com.rongwei.bsentity.domain.ApsReportYearAndMonth">
+            <id property="id" column="ID" jdbcType="VARCHAR"/>
+            <result property="tenantid" column="TENANTID" jdbcType="VARCHAR"/>
+            <result property="roption" column="ROPTION" jdbcType="VARCHAR"/>
+            <result property="deleted" column="DELETED" jdbcType="VARCHAR"/>
+            <result property="remark" column="REMARK" jdbcType="VARCHAR"/>
+            <result property="createdate" column="CREATEDATE" jdbcType="TIMESTAMP"/>
+            <result property="createuserid" column="CREATEUSERID" jdbcType="VARCHAR"/>
+            <result property="modifydate" column="MODIFYDATE" jdbcType="TIMESTAMP"/>
+            <result property="modifyuserid" column="MODIFYUSERID" jdbcType="VARCHAR"/>
+            <result property="createusername" column="CREATEUSERNAME" jdbcType="VARCHAR"/>
+            <result property="modifyusername" column="MODIFYUSERNAME" jdbcType="VARCHAR"/>
+            <result property="tenantname" column="TENANTNAME" jdbcType="VARCHAR"/>
+            <result property="planordernumyear" column="PLANORDERNUMYEAR" jdbcType="VARCHAR"/>
+            <result property="actualordernumyear" column="ACTUALORDERNUMYEAR" jdbcType="VARCHAR"/>
+            <result property="actualfinishnumyear" column="ACTUALFINISHNUMYEAR" jdbcType="VARCHAR"/>
+            <result property="planordernumyearpercent" column="PLANORDERNUMYEARPERCENT" jdbcType="VARCHAR"/>
+            <result property="actualfinishnumyearpercent" column="ACTUALFINISHNUMYEARPERCENT" jdbcType="VARCHAR"/>
+            <result property="planordernummonth" column="PLANORDERNUMMONTH" jdbcType="VARCHAR"/>
+            <result property="actualordernummonth" column="ACTUALORDERNUMMONTH" jdbcType="VARCHAR"/>
+            <result property="actualfinishnummonth" column="ACTUALFINISHNUMMONTH" jdbcType="VARCHAR"/>
+            <result property="planordernummonthpercent" column="PLANORDERNUMMONTHPERCENT" jdbcType="VARCHAR"/>
+            <result property="actualfinishnummonthpercent" column="ACTUALFINISHNUMMONTHPERCENT" jdbcType="VARCHAR"/>
+            <result property="actualordernumyearshow" column="ACTUALORDERNUMYEARSHOW" jdbcType="VARCHAR"/>
+            <result property="actualfinishnumyearshow" column="ACTUALFINISHNUMYEARSHOW" jdbcType="VARCHAR"/>
+            <result property="actualordernummonthshow" column="ACTUALORDERNUMMONTHSHOW" jdbcType="VARCHAR"/>
+            <result property="actualfinishnummonthshow" column="ACTUALFINISHNUMMONTHSHOW" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        ID,TENANTID,ROPTION,
+        DELETED,REMARK,CREATEDATE,
+        CREATEUSERID,MODIFYDATE,MODIFYUSERID,
+        CREATEUSERNAME,MODIFYUSERNAME,TENANTNAME,
+        PLANORDERNUMYEAR,ACTUALORDERNUMYEAR,ACTUALFINISHNUMYEAR,
+        PLANORDERNUMYEARPERCENT,ACTUALFINISHNUMYEARPERCENT,PLANORDERNUMMONTH,
+        ACTUALORDERNUMMONTH,ACTUALFINISHNUMMONTH,PLANORDERNUMMONTHPERCENT,
+        ACTUALFINISHNUMMONTHPERCENT,ACTUALORDERNUMYEARSHOW,ACTUALFINISHNUMYEARSHOW,
+        ACTUALORDERNUMMONTHSHOW,ACTUALFINISHNUMMONTHSHOW
+    </sql>
+</mapper>

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

@@ -0,0 +1,129 @@
+package com.rongwei.bsentity.domain;
+
+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_year_and_month
+ */
+@TableName(value ="aps_report_year_and_month")
+@Data
+public class ApsReportYearAndMonth 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 = "PLANORDERNUMYEAR")
+    private String planordernumyear = "0";
+
+    /**
+     * 今年实际已接单
+     */
+    @TableField(value = "ACTUALORDERNUMYEAR")
+    private String actualordernumyear = "0";
+
+    /**
+     * 今年实际已完成
+     */
+    @TableField(value = "ACTUALFINISHNUMYEAR")
+    private String actualfinishnumyear = "0";
+
+    /**
+     * 今年接单量完成比例
+     */
+    @TableField(value = "PLANORDERNUMYEARPERCENT")
+    private String planordernumyearpercent = "0%";
+
+    /**
+     * 今年完成比例
+     */
+    @TableField(value = "ACTUALFINISHNUMYEARPERCENT")
+    private String actualfinishnumyearpercent = "0%";
+
+    /**
+     * 本月计划接单量
+     */
+    @TableField(value = "PLANORDERNUMMONTH")
+    private String planordernummonth = "0";
+
+    /**
+     * 本月实际已接单
+     */
+    @TableField(value = "ACTUALORDERNUMMONTH")
+    private String actualordernummonth = "0";
+
+    /**
+     * 本月实际已完成
+     */
+    @TableField(value = "ACTUALFINISHNUMMONTH")
+    private String actualfinishnummonth = "0";
+
+    /**
+     * 本月接单量完成比例
+     */
+    @TableField(value = "PLANORDERNUMMONTHPERCENT")
+    private String planordernummonthpercent = "0%";
+
+    /**
+     * 本月实际完成比例
+     */
+    @TableField(value = "ACTUALFINISHNUMMONTHPERCENT")
+    private String actualfinishnummonthpercent = "0%";
+
+    /**
+     * 今年实际已接单-展示
+     */
+    @TableField(value = "ACTUALORDERNUMYEARSHOW")
+    private String actualordernumyearshow;
+
+    /**
+     * 今年实际已完成-展示
+     */
+    @TableField(value = "ACTUALFINISHNUMYEARSHOW")
+    private String actualfinishnumyearshow;
+
+    /**
+     * 本月实际已接单-展示
+     */
+    @TableField(value = "ACTUALORDERNUMMONTHSHOW")
+    private String actualordernummonthshow;
+
+    /**
+     * 本月实际已完成-展示
+     */
+    @TableField(value = "ACTUALFINISHNUMMONTHSHOW")
+    private String actualfinishnummonthshow;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+}

cx-aps/cx-aps-server/src/main/java/com/rongwei/bsserver/controller/ApsProductionOrderController.java

@@ -182,4 +182,15 @@ public class ApsProductionOrderController {
         }
         return apsProductionOrderService.removeBatchNumberByOrderId(orderId);
     }
+
+    /**
+     * 数据眼报表 定时任务 准备数据
+     */
+    @GetMapping("/dataEyeReport")
+    public R dataEyeReport() {
+        log.info("数据眼报表 定时任务 准备数据开始");
+        Thread thread = new Thread(() -> apsProductionOrderService.dataEyeReport());
+        thread.start(); // 启动线程
+        return R.ok();
+    }
 }