chuangte/yh-java
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新统计数据

Browse Source
This commit is contained in:
磷叶 2025-02-28 15:49:14 +08:00
parent 13e108460f
commit 35a9915bc1
43 changed files with 604 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common-ruoyi/ruoyi-common/src/main/java/com/ruoyi/common/k3cloud/constants/fileds/K3ProdField.java
View File

@ -14,6 +14,7 @@ public class K3ProdField {
public static final String F_DATE = "FDate"; // 单据日期
public static final String F_IS_REWORK = "FIsRework"; // 是否返工
public static final String F_MATERIAL_ID = "FMaterialId"; // 物料ID
public static final String FMTONO = "FMTONO"; // 计划跟踪号
public static final String F_ROW_ID = "FRowId"; // 明细.行标识
public static final String F_MEMO_ITEM = "FMemoItem"; // 明细.备注
public static final String F_CONVEY_DATE = "FConveyDate"; // 明细.下达日期

8
common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/common/mapper/CommonMapper.java Normal file
View File

@ -0,0 +1,8 @@
package com.ruoyi.common.mapper;
/**
* @author wjh
* 2024/12/20
*/
public interface CommonMapper {
}

26
common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/common/mapper/CommonMapper.xml Normal file
View File

@ -0,0 +1,26 @@
<?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.ruoyi.common.mapper.CommonMapper">
<resultMap id="LongDecimalVO" type="com.ruoyi.common.vo.LongDecimalVO">
<result property="value" column="value" typeHandler="com.ruoyi.common.mybatis.typehandler.NonNullDecimalTypeHandler"/>
</resultMap>
<resultMap id="StringIntegerVO" type="com.ruoyi.common.vo.StringIntegerVO">
<result property="key" column="key"/>
<result property="value" column="value" typeHandler="com.ruoyi.common.mybatis.typehandler.NonNullIntegerTyperHandler"/>
</resultMap>
<resultMap id="LongIntegerVO" type="com.ruoyi.common.vo.LongIntegerVO">
<result property="key" column="key"/>
<result property="value" column="value" typeHandler="com.ruoyi.common.mybatis.typehandler.NonNullIntegerTyperHandler"/>
</resultMap>
<resultMap id="LocalDateIntegerVO" type="com.ruoyi.common.vo.LocalDateIntegerVO">
<result property="key" column="key"/>
<result property="value" column="value" typeHandler="com.ruoyi.common.mybatis.typehandler.NonNullIntegerTyperHandler"/>
</resultMap>
</mapper>

15
common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/common/vo/FileNameVO.java Normal file
View File

@ -0,0 +1,15 @@
package com.ruoyi.common.vo;
import lombok.Data;
/**
* 文件名VO
* 用于前端可改名称的文件展示
*/
@Data
public class FileNameVO {
private String name; // 文件名
private String url; // 文件url
}

13
common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/common/vo/IntegerIntegerVO.java Normal file
View File

@ -0,0 +1,13 @@
package com.ruoyi.common.vo;
import lombok.Data;
/**
* @author wjh
* 2025/2/7
*/
@Data
public class IntegerIntegerVO {
private Integer key;
private Integer value;
}

17
common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/common/vo/LocalDateIntegerVO.java Normal file
View File

@ -0,0 +1,17 @@
package com.ruoyi.common.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalDate;
@Data
public class LocalDateIntegerVO {
@ApiModelProperty("日期")
private LocalDate key;
@ApiModelProperty("数量")
private Integer value;
}

18
common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/common/vo/LongDecimalVO.java Normal file
View File

@ -0,0 +1,18 @@
package com.ruoyi.common.vo;
import lombok.Data;
import java.math.BigDecimal;
/**
* @author wjh
* 2024/12/20
*/
@Data
public class LongDecimalVO {
private Long key;
private BigDecimal value;
}

11
common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/common/vo/LongIntegerVO.java Normal file
View File

@ -0,0 +1,11 @@
package com.ruoyi.common.vo;
import lombok.Data;
@Data
public class LongIntegerVO {
private Long key;
private Integer value;
}

12
common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/common/vo/StringIntegerVO.java Normal file
View File

@ -0,0 +1,12 @@
package com.ruoyi.common.vo;
import lombok.Data;
@Data
public class StringIntegerVO {
private String key;
private Integer value;
}

18
common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/dashboard/report/domain/sum/ReportProdSumVO.java Normal file
View File

@ -0,0 +1,18 @@
package com.ruoyi.dashboard.report.domain.sum;
import lombok.Data;
import java.math.BigDecimal;
@Data
public class ReportProdSumVO {
/**
* 良品数量
*/
private Integer num;
/**
* 金额
*/
private BigDecimal totalAmount;
}

13
common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/dashboard/report/domain/sum/ReportSumVO.java Normal file
View File

@ -0,0 +1,13 @@
package com.ruoyi.dashboard.report.domain.sum;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
@Data
public class ReportSumVO {
@ApiModelProperty("总金额")
private BigDecimal totalAmount;
}

14
common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/dashboard/report/domain/sum/ReportUserProdSumVO.java Normal file
View File

@ -0,0 +1,14 @@
package com.ruoyi.dashboard.report.domain.sum;
import lombok.Data;
import java.math.BigDecimal;
@Data
public class ReportUserProdSumVO {
/** 良品数量 */
private Integer num;
/** 金额 */
private BigDecimal totalAmount;
}

19
common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/dashboard/report/service/ReportDashboardService.java Normal file
View File

@ -0,0 +1,19 @@
package com.ruoyi.dashboard.report.service;
import com.ruoyi.dashboard.report.domain.sum.ReportSumVO;
import com.ruoyi.yh.report.domain.ReportQuery;
import com.ruoyi.yh.report.mapper.ReportMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@Service
public class ReportDashboardService {
@Autowired
private ReportMapper reportMapper;
public ReportSumVO selectSum(ReportQuery query) {
return reportMapper.selectSum(query);
}
}

18
common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/dashboard/report/service/ReportProdDashboardService.java Normal file
View File

@ -0,0 +1,18 @@
package com.ruoyi.dashboard.report.service;
import com.ruoyi.dashboard.report.domain.sum.ReportProdSumVO;
import com.ruoyi.yh.reportProd.domain.ReportProdQuery;
import com.ruoyi.yh.reportProd.mapper.ReportProdMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@Service
public class ReportProdDashboardService {
@Autowired
private ReportProdMapper reportProdMapper;
public ReportProdSumVO selectSum(ReportProdQuery query) {
return reportProdMapper.selectSum(query);
}
}

18
common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/dashboard/report/service/ReportUserProdDashboardService.java Normal file
View File

@ -0,0 +1,18 @@
package com.ruoyi.dashboard.report.service;
import com.ruoyi.dashboard.report.domain.sum.ReportUserProdSumVO;
import com.ruoyi.yh.reportUserProd.domain.ReportUserProdQuery;
import com.ruoyi.yh.reportUserProd.mapper.ReportUserProdMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@Service
public class ReportUserProdDashboardService {
@Autowired
private ReportUserProdMapper reportUserProdMapper;
public ReportUserProdSumVO selectSum(ReportUserProdQuery query) {
return reportUserProdMapper.selectSum(query);
}
}

17
common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/dashboard/reportOrderProd/domain/sum/ReportOrderProdSumVO.java Normal file
View File

@ -0,0 +1,17 @@
package com.ruoyi.dashboard.reportOrderProd.domain.sum;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
/**
* 订单产量统计
*/
@Data
public class ReportOrderProdSumVO {
@ApiModelProperty("良品数")
private BigDecimal num;
}

19
common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/dashboard/reportOrderProd/service/ReportOrderProdDashboardService.java Normal file
View File

@ -0,0 +1,19 @@
package com.ruoyi.dashboard.reportOrderProd.service;
import com.ruoyi.dashboard.reportOrderProd.domain.sum.ReportOrderProdSumVO;
import com.ruoyi.yh.reportOrderProd.domain.ReportOrderProdQuery;
import com.ruoyi.yh.reportOrderProd.mapper.ReportOrderProdMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@Service
public class ReportOrderProdDashboardService {
@Autowired
private ReportOrderProdMapper reportOrderProdMapper;
public ReportOrderProdSumVO selectSum(ReportOrderProdQuery query) {
return reportOrderProdMapper.selectSum(query);
}
}

2
common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/yh/dashboard/mapper/DashboardMapper.xml
View File

@ -13,7 +13,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select
sum(brup.num) as total_num,
sum(brp.price_price * brup.num) as total_price
<include refid="com.ruoyi.yh.reportUserProd.mapper.ReportUserProdMapper.searchTables"/>
from <include refid="com.ruoyi.yh.reportUserProd.mapper.ReportUserProdMapper.searchTables"/>
<where>
<include refid="com.ruoyi.yh.reportUserProd.mapper.ReportUserProdMapper.searchCondition"/>
</where>

3
common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/yh/prodOrder/domain/ProdOrder.java
View File

@ -143,4 +143,7 @@ public class ProdOrder extends BaseEntity
@Excel(name = "基本单位")
@ApiModelProperty("基本单位名称")
private String baseUnitName;
@ApiModelProperty("计划跟踪号")
private String erpMtoNo;
}

8
common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/yh/prodOrder/mapper/ProdOrderMapper.xml
View File

@ -45,6 +45,7 @@
bpo.material_graphics,
bpo.unit_name,
bpo.base_unit_name,
bpo.erp_mto_no,
sd.dept_name as work_shop_name
from bst_prod_order bpo
left join sys_dept sd on sd.dept_id = bpo.dept_id
@ -67,7 +68,8 @@
<if test="query.erpReqSrc != null and query.erpReqSrc != ''"> and bpo.erp_req_src = #{query.erpReqSrc}</if>
<if test="query.deptId != null "> and bpo.dept_id = #{query.deptId}</if>
<if test="query.erpMaterialId != null and query.erpMaterialId != ''"> and bpo.erp_material_id = #{query.erpMaterialId}</if>
<if test="query.erpBaseUnitId != null and query.erpBaseUnitId != ''"> and erp_base_unit_id = #{query.erpBaseUnitId}</if>
<if test="query.erpBaseUnitId != null and query.erpBaseUnitId != ''"> and bpo.erp_base_unit_id = #{query.erpBaseUnitId}</if>
<if test="query.erpMtoNo != null and query.erpMtoNo != ''"> and bpo.erp_mto_no = #{query.erpMtoNo}</if>
<if test="query.materialNumber != null and query.materialNumber != ''">
and bpo.material_number like concat('%',#{query.materialNumber},'%')
</if>
@ -90,6 +92,7 @@
and (
bpo.erp_bill_no like concat('%',#{query.keyword},'%')
or bpo.material_number like concat('%',#{query.keyword},'%')
or bpo.erp_mto_no like concat('%',#{query.keyword},'%')
)
</if>
<if test="query.erpStatusList != null and query.erpStatusList.size() > 0">
@ -187,6 +190,7 @@
<if test="materialGraphics != null">material_graphics,</if>
<if test="unitName != null">unit_name,</if>
<if test="baseUnitName != null">base_unit_name,</if>
<if test="erpMtoNo != null">erp_mto_no,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="erpId != null and erpId != ''">#{erpId},</if>
@ -223,6 +227,7 @@
<if test="materialGraphics != null">#{materialGraphics},</if>
<if test="unitName != null">#{unitName},</if>
<if test="baseUnitName != null">#{baseUnitName},</if>
<if test="erpMtoNo != null">#{erpMtoNo},</if>
</trim>
</insert>
@ -275,6 +280,7 @@
<if test="data.materialGraphics != null">material_graphics = #{data.materialGraphics},</if>
<if test="data.unitName != null">unit_name = #{data.unitName},</if>
<if test="data.baseUnitName != null">base_unit_name = #{data.baseUnitName},</if>
<if test="data.erpMtoNo != null">erp_mto_no = #{data.erpMtoNo},</if>
</sql>
<delete id="deleteProdOrderById" parameterType="Long">

3
common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/yh/prodOrder/service/impl/ProdOrderConverterImpl.java
View File

@ -132,6 +132,9 @@ public class ProdOrderConverterImpl implements ProdOrderConverter {
case K3ProdField.F_BASE_NO_STOCK_IN_QTY:
po.setErpBaseNoStockInQty(row.getBigDecimal(i));
break;
case K3ProdField.FMTONO:
po.setErpMtoNo(row.getString(i));
break;
default: break;
}
}

3
common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/yh/prodOrder/service/impl/ProdOrderServiceImpl.java
View File

@ -181,7 +181,8 @@ public class ProdOrderServiceImpl implements ProdOrderService
K3ProdField.F_BASE_UNIT_ID,
K3ProdField.F_MATERIAL_ID,
K3ProdField.F_NO_STOCK_IN_QTY,
K3ProdField.F_BASE_NO_STOCK_IN_QTY
K3ProdField.F_BASE_NO_STOCK_IN_QTY,
K3ProdField.FMTONO
);
int startRow = 0;
int limit = 10000;

3
common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/yh/report/domain/ReportVO.java
View File

@ -25,6 +25,9 @@ public class ReportVO extends Report {
@ApiModelProperty("部门ERP ID")
private String deptErpId;
@ApiModelProperty("产量数量")
private Integer productCount;
@ApiModelProperty("产量明细")
@Size(min = 1, message = "至少填写一个产量明细")
@Valid

8
common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/yh/report/mapper/ReportMapper.java
View File

@ -1,5 +1,6 @@
package com.ruoyi.yh.report.mapper;
import com.ruoyi.dashboard.report.domain.sum.ReportSumVO;
import com.ruoyi.yh.report.domain.Report;
import com.ruoyi.yh.report.domain.ReportQuery;
import com.ruoyi.yh.report.domain.ReportVO;
@ -84,4 +85,11 @@ public interface ReportMapper
* @return 报表总价
*/
int calcTotalAmount(@Param("query") ReportQuery query);
/**
* 查询报表统计
* @param query 报表查询条件
* @return 报表统计
*/
ReportSumVO selectSum(@Param("query") ReportQuery query);
}

21
common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/yh/report/mapper/ReportMapper.xml
View File

@ -27,7 +27,11 @@
br.deleted,
sd.dept_name as dept_name,
sd.erp_id as dept_erp_id
from bst_report br
from <include refid="searchTables"/>
</sql>
<sql id="searchTables">
bst_report br
left join sys_dept sd on sd.dept_id = br.dept_id
left join sys_user su on su.user_id = br.create_id
</sql>
@ -206,5 +210,20 @@
<include refid="searchCondition"/>
</where>
</update>
<!-- selectSum -->
<resultMap id="ReportSumVO" type="ReportSumVO" autoMapping="true">
<result property="totalAmount" column="total_amount" typeHandler="com.ruoyi.common.mybatis.typehandler.NonNullDecimalTypeHandler"/>
</resultMap>
<select id="selectSum" resultMap="ReportSumVO">
select
sum(br.total_amount) as total_amount
from <include refid="searchTables"/>
<where>
<include refid="searchCondition"/>
</where>
</select>
</mapper>

7
common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/yh/report/service/ReportAssembler.java
View File

@ -19,4 +19,11 @@ public interface ReportAssembler {
*/
void assembleProductList(List<ReportVO> list, boolean assembleUserProd, boolean assembleOrderProd);
/**
* 拼接产量数量
*
* @param list 待拼接列表
*/
void assembleProductCount(List<ReportVO> list);
}

22
common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/yh/report/service/impl/ReportAssemblerImpl.java
View File

@ -1,6 +1,7 @@
package com.ruoyi.yh.report.service.impl;
import com.ruoyi.common.utils.collection.CollectionUtils;
import com.ruoyi.common.vo.LongIntegerVO;
import com.ruoyi.yh.report.domain.ReportVO;
import com.ruoyi.yh.report.service.ReportAssembler;
import com.ruoyi.yh.report.service.ReportService;
@ -66,4 +67,25 @@ public class ReportAssemblerImpl implements ReportAssembler {
report.setProductList(productList);
}
}
@Override
public void assembleProductCount(List<ReportVO> list) {
if (CollectionUtils.isEmptyElement(list)) {
return;
}
// 查询产量数量并按报表分组
ReportProdQuery query = new ReportProdQuery();
query.setReportIds(CollectionUtils.map(list, ReportVO::getReportId));
List<LongIntegerVO> prodList = reportProdService.selectCountGroupByReportId(query);
for (ReportVO report : list) {
LongIntegerVO vo = prodList.stream().filter(p -> p.getKey().equals(report.getReportId())).findFirst().orElse(null);
if (vo != null && vo.getValue() != null) {
report.setProductCount(vo.getValue());
} else {
report.setProductCount(0);
}
}
}
}

19
common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/yh/reportOrderProd/domain/ReportOrderProdVO.java
View File

@ -66,6 +66,9 @@ public class ReportOrderProdVO extends ReportOrderProd {
@ApiModelProperty("订单已审核通过的基础产量")
private BigDecimal verifiedBaseNum;
@ApiModelProperty("订单计划跟踪号")
private String orderErpMtoNo;
@ApiModelProperty("工序倍数分子")
private BigDecimal priceQuantityNumerator;
@ -82,4 +85,20 @@ public class ReportOrderProdVO extends ReportOrderProd {
@Excel(name = "单价(元)")
@ApiModelProperty("工序单价")
private BigDecimal pricePrice;
@ApiModelProperty("车间")
private String reportDeptName;
@ApiModelProperty("车间ID")
private Long reportDeptId;
@ApiModelProperty("工序类别")
private String priceCategory;
@ApiModelProperty("工序大小")
private String priceSize;
@ApiModelProperty("工序图案")
private String pricePattern;
}

6
common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/yh/reportOrderProd/mapper/ReportOrderProdMapper.java
View File

@ -1,5 +1,6 @@
package com.ruoyi.yh.reportOrderProd.mapper;
import com.ruoyi.dashboard.reportOrderProd.domain.sum.ReportOrderProdSumVO;
import com.ruoyi.yh.reportOrderProd.domain.ReportOrderProd;
import com.ruoyi.yh.reportOrderProd.domain.ReportOrderProdQuery;
import com.ruoyi.yh.reportOrderProd.domain.ReportOrderProdVO;
@ -85,4 +86,9 @@ public interface ReportOrderProdMapper
List<ReportOrderProdSumOfBaseNumGroupByOrderIdVO> selectSumOfBaseNumGroupByOrderId(@Param("query") ReportOrderProdQuery query);
int logicDelByReportId(Long reportId);
/**
* 查询订单产量统计
*/
ReportOrderProdSumVO selectSum(@Param("query") ReportOrderProdQuery query);
}

36
common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/yh/reportOrderProd/mapper/ReportOrderProdMapper.xml
View File

@ -19,6 +19,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
brp.price_unit as price_unit,
brp.price_name as price_name,
brp.price_price as price_price,
brp.price_category as price_category,
brp.price_size as price_size,
brp.price_pattern as price_pattern,
bpo.erp_bill_no as order_erp_bill_no,
bpo.erp_qty as order_erp_qty,
bpo.erp_no_stock_in_qty as order_erp_no_stock_in_qty,
@ -28,16 +31,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
bpo.dept_id as order_dept_id,
bpo.erp_status as order_erp_status,
bpo.material_number as order_material_number,
bpo.erp_mto_no as order_erp_mto_no,
bu.erp_name as unit_name,
bu_b.erp_name as base_unit_name,
br.report_date as report_date,
br.status as report_status
from bst_report_order_prod brop
br.status as report_status,
br.dept_id as report_dept_id,
sd.dept_name as report_dept_name
from <include refid="searchTables"/>
</sql>
<sql id="searchTables">
bst_report_order_prod brop
left join bst_report_prod brp on brp.id = brop.report_prod_id
left join bst_report br on br.report_id = brp.report_id
left join bst_prod_order bpo on bpo.id = brop.order_id
left join bst_unit bu on bu.erp_id = bpo.erp_unit_id
left join bst_unit bu_b on bu_b.erp_id = bpo.erp_base_unit_id
left join sys_dept sd on sd.dept_id = br.dept_id
</sql>
<sql id="searchCondition">
@ -49,6 +60,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="query.deleted != null "> and brop.deleted = #{query.deleted}</if>
<if test="query.reportStatus != null "> and br.status = #{query.reportStatus}</if>
<if test="query.orderErpBillNo != null and query.orderErpBillNo != '' "> and bpo.erp_bill_no like concat('%', #{query.orderErpBillNo}, '%')</if>
<if test="query.orderErpMtoNo != null and query.orderErpMtoNo != '' "> and bpo.erp_mto_no like concat('%', #{query.orderErpMtoNo}, '%')</if>
<if test="query.reportDeptId != null "> and br.dept_id = #{query.reportDeptId}</if>
<if test="query.priceCategory != null and query.priceCategory != '' "> and brp.price_category = #{query.priceCategory}</if>
<if test="query.priceSize != null and query.priceSize != '' "> and brp.price_size = #{query.priceSize}</if>
<if test="query.pricePattern != null and query.pricePattern != '' "> and brp.price_pattern = #{query.pricePattern}</if>
<if test="query.reportProdIds != null and query.reportProdIds.size() > 0">
and brop.report_prod_id in
<foreach collection="query.reportProdIds" item="item" open="(" separator="," close=")">
@ -212,4 +228,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{id}
</foreach>
</delete>
<!-- selectSum -->
<resultMap id="ReportOrderProdSumVO" type="ReportOrderProdSumVO" autoMapping="true">
<result property="num" column="num" typeHandler="com.ruoyi.common.mybatis.typehandler.NonNullDecimalTypeHandler"/>
</resultMap>
<select id="selectSum" resultMap="ReportOrderProdSumVO">
select
sum(brop.num) as num
from <include refid="searchTables"/>
<where>
<include refid="searchCondition"/>
</where>
</select>
</mapper>

12
common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/yh/reportProd/mapper/ReportProdMapper.java
View File

@ -1,5 +1,7 @@
package com.ruoyi.yh.reportProd.mapper;
import com.ruoyi.common.vo.LongIntegerVO;
import com.ruoyi.dashboard.report.domain.sum.ReportProdSumVO;
import com.ruoyi.yh.reportProd.domain.ReportProd;
import com.ruoyi.yh.reportProd.domain.ReportProdQuery;
import com.ruoyi.yh.reportProd.domain.ReportProdVO;
@ -98,4 +100,14 @@ public interface ReportProdMapper
* 重置单价ID
*/
int resetPriceId(@Param("ids") List<Long> ids);
/**
* 根据报表ID查询产量数量
*/
List<LongIntegerVO> selectCountGroupByReportId(@Param("query") ReportProdQuery query);
/**
* 查询报表产量统计
*/
ReportProdSumVO selectSum(@Param("query") ReportProdQuery query);
}

41
common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/yh/reportProd/mapper/ReportProdMapper.xml
View File

@ -42,10 +42,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
sd.dept_name as dept_name,
sd.dept_id as dept_id,
br.report_date as report_date
from bst_report_prod brp
left join bst_report br on br.report_id = brp.report_id
left join bst_price bp on bp.price_id = brp.price_id
left join sys_dept sd on sd.dept_id = br.dept_id
from <include refid="searchTables"/>
</sql>
<sql id="searchTables">
bst_report_prod brp
left join bst_report br on br.report_id = brp.report_id
left join bst_price bp on bp.price_id = brp.price_id
left join sys_dept sd on sd.dept_id = br.dept_id
</sql>
<sql id="searchCondition">
@ -622,4 +626,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{item}
</foreach>
</update>
<!-- selectCountGroupByReportId -->
<select id="selectCountGroupByReportId" resultMap="com.ruoyi.common.mapper.CommonMapper.LongIntegerVO">
select
brp.report_id as `key`,
count(brp.id) as `value`
from bst_report_prod brp
<where>
<include refid="searchCondition"/>
</where>
group by `key`
</select>
<!-- selectSum -->
<resultMap id="ReportProdSumVO" type="com.ruoyi.dashboard.report.domain.sum.ReportProdSumVO">
<result property="num" column="num" typeHandler="com.ruoyi.common.mybatis.typehandler.NonNullIntegerTyperHandler"/>
<result property="totalAmount" column="total_amount" typeHandler="com.ruoyi.common.mybatis.typehandler.NonNullDecimalTypeHandler"/>
</resultMap>
<select id="selectSum" resultMap="ReportProdSumVO">
select
sum(brp.num) as num,
sum(brp.total_amount) as total_amount
from <include refid="searchTables"/>
<where>
<include refid="searchCondition"/>
</where>
</select>
</mapper>

8
common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/yh/reportProd/service/ReportProdService.java
View File

@ -1,5 +1,6 @@
package com.ruoyi.yh.reportProd.service;
import com.ruoyi.common.vo.LongIntegerVO;
import com.ruoyi.yh.reportProd.domain.ReportProd;
import com.ruoyi.yh.reportProd.domain.ReportProdQuery;
import com.ruoyi.yh.reportProd.domain.ReportProdVO;
@ -110,4 +111,11 @@ public interface ReportProdService
* 重置单价ID
*/
int resetPriceId(List<Long> ids);
/**
* 根据报表ID查询产量数量
* @param query
* @return
*/
List<LongIntegerVO> selectCountGroupByReportId(ReportProdQuery query);
}

6
common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/yh/reportProd/service/impl/ReportProdServiceImpl.java
View File

@ -2,6 +2,7 @@ package com.ruoyi.yh.reportProd.service.impl;
import com.ruoyi.common.utils.ServiceUtil;
import com.ruoyi.common.utils.collection.CollectionUtils;
import com.ruoyi.common.vo.LongIntegerVO;
import com.ruoyi.yh.price.domain.PriceQuery;
import com.ruoyi.yh.price.domain.PriceVO;
import com.ruoyi.yh.price.service.PriceService;
@ -254,4 +255,9 @@ public class ReportProdServiceImpl implements ReportProdService
query.setIds(ids);
return reportProdMapper.selectReportProdList(query);
}
@Override
public List<LongIntegerVO> selectCountGroupByReportId(ReportProdQuery query) {
return reportProdMapper.selectCountGroupByReportId(query);
}
}

12
common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/yh/reportUserProd/domain/ReportUserProdVO.java
View File

@ -60,4 +60,16 @@ public class ReportUserProdVO extends ReportUserProd {
@Excel(name = "工序代码")
@ApiModelProperty("工序代码")
private String priceCode;
@Excel(name = "工序类别")
@ApiModelProperty("工序类别")
private String priceCategory;
@Excel(name = "工序大小")
@ApiModelProperty("工序大小")
private String priceSize;
@Excel(name = "工序图案")
@ApiModelProperty("工序图案")
private String pricePattern;
}

6
common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/yh/reportUserProd/mapper/ReportUserProdMapper.java
View File

@ -1,5 +1,6 @@
package com.ruoyi.yh.reportUserProd.mapper;
import com.ruoyi.dashboard.report.domain.sum.ReportUserProdSumVO;
import com.ruoyi.yh.reportUserProd.domain.ReportUserProd;
import com.ruoyi.yh.reportUserProd.domain.ReportUserProdQuery;
import com.ruoyi.yh.reportUserProd.domain.ReportUserProdVO;
@ -91,4 +92,9 @@ public interface ReportUserProdMapper
List<ReportUserProdGroupByDateVO> selectListGroupByDate(@Param("query") ReportUserProdQuery query);
int logicDelByReportId(Long reportId);
/**
* 查询报表产量统计
*/
ReportUserProdSumVO selectSum(@Param("query") ReportUserProdQuery query);
}

27
common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/yh/reportUserProd/mapper/ReportUserProdMapper.xml
View File

@ -23,15 +23,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
brp.report_id as report_id,
brp.price_price * brup.num as total_price,
brp.price_code as price_code,
brp.price_category as price_category,
brp.price_size as price_size,
brp.price_pattern as price_pattern,
br.report_date as report_date,
br.status as report_status,
br.dept_id as dept_id,
sd.dept_name as dept_name
<include refid="searchTables"/>
from <include refid="searchTables"/>
</sql>
<sql id="searchTables">
from bst_report_user_prod brup
bst_report_user_prod brup
left join sys_user su on su.user_id = brup.user_id
left join bst_report_prod brp on brp.id = brup.prod_id
left join bst_report br on br.report_id = brp.report_id
@ -55,6 +58,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="query.priceCode != null and query.priceCode != ''">and brp.price_code like concat('%', #{query.priceCode}, '%')</if>
<if test="query.userNo != null and query.userNo != ''">and su.user_no like concat('%', #{query.userNo}, '%')</if>
<if test="query.reportStatus != null and query.reportStatus != ''">and br.status = #{query.reportStatus}</if>
<if test="query.priceCategory != null and query.priceCategory != ''">and brp.price_category like concat('%', #{query.priceCategory}, '%')</if>
<if test="query.priceSize != null and query.priceSize != ''">and brp.price_size like concat('%', #{query.priceSize}, '%')</if>
<if test="query.pricePattern != null and query.pricePattern != ''">and brp.price_pattern like concat('%', #{query.pricePattern}, '%')</if>
<if test="query.deptId != null">and br.dept_id = #{query.deptId}</if>
<if test="query.prodIds != null and query.prodIds.size() > 0 ">
and brup.prod_id in
@ -255,4 +261,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{id}
</foreach>
</delete>
<!-- selectSum -->
<resultMap id="ReportUserProdSumVO" type="com.ruoyi.dashboard.report.domain.sum.ReportUserProdSumVO">
<result property="num" column="num" typeHandler="com.ruoyi.common.mybatis.typehandler.NonNullIntegerTyperHandler"/>
<result property="totalAmount" column="total_amount" typeHandler="com.ruoyi.common.mybatis.typehandler.NonNullDecimalTypeHandler"/>
</resultMap>
<select id="selectSum" resultMap="ReportUserProdSumVO">
select
sum(brup.num) as num,
sum(brp.price_price * brup.num) as total_amount
from <include refid="searchTables"/>
<where>
<include refid="searchCondition"/>
</where>
</select>
</mapper>

25
ruoyi-web/src/main/java/com/ruoyi/web/dashboard/DashboardReportController.java Normal file
View File

@ -0,0 +1,25 @@
package com.ruoyi.web.dashboard;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.dashboard.report.service.ReportDashboardService;
import com.ruoyi.yh.report.domain.ReportQuery;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping("/dashboard/report")
public class DashboardReportController extends BaseController {
@Autowired
private ReportDashboardService reportDashboardService;
@ApiOperation("报表统计")
@GetMapping("/sum")
public AjaxResult sum(ReportQuery query) {
return AjaxResult.success(reportDashboardService.selectSum(query));
}
}

25
ruoyi-web/src/main/java/com/ruoyi/web/dashboard/DashboardReportOrderProdController.java Normal file
View File

@ -0,0 +1,25 @@
package com.ruoyi.web.dashboard;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.dashboard.reportOrderProd.service.ReportOrderProdDashboardService;
import com.ruoyi.yh.reportOrderProd.domain.ReportOrderProdQuery;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping("/dashboard/reportOrderProd")
public class DashboardReportOrderProdController extends BaseController{
@Autowired
private ReportOrderProdDashboardService reportOrderProdDashboardService;
@ApiOperation("订单产量统计")
@GetMapping("/sum")
public AjaxResult sum(ReportOrderProdQuery query) {
return AjaxResult.success(reportOrderProdDashboardService.selectSum(query));
}
}

25
ruoyi-web/src/main/java/com/ruoyi/web/dashboard/DashboardReportProdController.java Normal file
View File

@ -0,0 +1,25 @@
package com.ruoyi.web.dashboard;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.dashboard.report.service.ReportProdDashboardService;
import com.ruoyi.yh.reportProd.domain.ReportProdQuery;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping("/dashboard/reportProd")
public class DashboardReportProdController extends BaseController {
@Autowired
private ReportProdDashboardService reportProdDashboardService;
@ApiOperation("产品报表统计")
@GetMapping("/sum")
public AjaxResult sum(ReportProdQuery query) {
return AjaxResult.success(reportProdDashboardService.selectSum(query));
}
}

25
ruoyi-web/src/main/java/com/ruoyi/web/dashboard/DashboardReportUserProdController.java Normal file
View File

@ -0,0 +1,25 @@
package com.ruoyi.web.dashboard;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.dashboard.report.service.ReportUserProdDashboardService;
import com.ruoyi.yh.reportUserProd.domain.ReportUserProdQuery;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping("/dashboard/reportUserProd")
public class DashboardReportUserProdController extends BaseController {
@Autowired
private ReportUserProdDashboardService reportUserProdDashboardService;
@ApiOperation("用户产品报表统计")
@GetMapping("/sum")
public AjaxResult sum(ReportUserProdQuery query) {
return AjaxResult.success(reportUserProdDashboardService.selectSum(query));
}
}

4
ruoyi-web/src/main/java/com/ruoyi/web/yh/ReportController.java
View File

@ -58,6 +58,7 @@ public class ReportController extends BaseController
startPage();
startOrderBy();
List<ReportVO> list = reportService.selectReportList(query);
reportAssembler.assembleProductCount(list);
return getDataTable(list);
}
@ -102,8 +103,7 @@ public class ReportController extends BaseController
@Log(title = LOG_TITLE, businessType = BusinessType.INSERT, bizType = LogBizType.REPORT, bizIdName = "arg0")
@PostMapping
public AjaxResult add(@RequestBody @Validated(ValidGroup.Create.class) ReportVO data,
@RequestParam(required = false, defaultValue = "true") Boolean submit)
{
@RequestParam(required = false, defaultValue = "true") Boolean submit){
ReportBO bo = reportConverter.toBoByCreate(data, submit);
return toAjax(reportService.addReport(bo));
}

4
ruoyi-web/src/main/resources/mybatis/mybatis-config.xml
View File

@ -17,4 +17,8 @@ PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
<setting name="mapUnderscoreToCamelCase" value="true"/>
</settings>
<mappers>
<!--引入公共Mapper-->
<mapper resource="com/ruoyi/common/mapper/CommonMapper.xml"/>
</mappers>
</configuration>