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

提交

Browse Source
This commit is contained in:
磷叶 2024-11-21 11:08:44 +08:00
parent 681462a70f
commit 0dc12973ad
12 changed files with 93 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ruoyi-web/src/main/java/com/ruoyi/web/yh/price/domain/Price.java
View File

@ -115,10 +115,15 @@ public class Price extends BaseEntity implements LogBizParam
@ApiModelProperty("禁用时间")
private LocalDateTime disabledTime;
@Excel(name = "生产数量(个)")
@ApiModelProperty("生产数量(个)")
@Min(value = 0, message = "生产数量不允许小于0个")
private BigDecimal quantity;
@Excel(name = "生产数量倍数分子(个)")
@ApiModelProperty("生产数量倍数分子(个)")
@Min(value = 0, message = "生产数量倍数分子不允许小于0")
private BigDecimal quantityNumerator;
@Excel(name = "生产数量倍数分母(个)")
@ApiModelProperty("生产数量倍数分母(个)")
@Min(value = 1, message = "生产数量倍数分母不允许小于1")
private BigDecimal quantityDenominator;
/** 创建者 */
@Excel(name = "创建人")

12
ruoyi-web/src/main/java/com/ruoyi/web/yh/price/mapper/PriceMapper.xml
View File

@ -33,7 +33,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
bp.update_by,
bp.disabled,
bp.disabled_time,
bp.quantity,
bp.quantity_numerator,
bp.quantity_denominator,
sd.dept_name as dept_name
from bst_price bp
left join sys_dept sd on sd.dept_id = bp.dept_id
@ -113,7 +114,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateBy != null">update_by,</if>
<if test="disabled != null">disabled,</if>
<if test="disabledTime != null">disabled_time,</if>
<if test="quantity != null">quantity,</if>
<if test="quantityNumerator != null">quantity_numerator,</if>
<if test="quantityDenominator != null">quantity_denominator,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="deptId != null">#{deptId},</if>
@ -139,7 +141,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateBy != null">#{updateBy},</if>
<if test="disabled != null">#{disabled},</if>
<if test="disabledTime != null">#{disabledTime},</if>
<if test="quantity != null">#{quantity},</if>
<if test="quantityNumerator != null">#{quantityNumerator},</if>
<if test="quantityDenominator != null">#{quantityDenominator},</if>
</trim>
</insert>
@ -185,7 +188,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="data.updateBy != null">bp.update_by = #{data.updateBy},</if>
<if test="data.disabled != null">bp.disabled = #{data.disabled},</if>
<if test="data.disabledTime != null">bp.disabled_time = #{data.disabledTime},</if>
<if test="data.quantity != null">bp.quantity = #{data.quantity},</if>
<if test="data.quantityNumerator != null">quantity_numerator = #{data.quantityNumerator},</if>
<if test="data.quantityDenominator != null">quantity_denominator = #{data.quantityDenominator},</if>
</sql>
<delete id="deletePriceByPriceId" parameterType="Long">

6
ruoyi-web/src/main/java/com/ruoyi/web/yh/price/service/impl/PriceConverterImpl.java
View File

@ -39,7 +39,8 @@ public class PriceConverterImpl implements PriceConverter {
po.setUnit(data.getUnit());
po.setClassify(data.getClassify());
po.setCreateId(loginUser.getUserId());
po.setQuantity(data.getQuantity());
po.setQuantityDenominator(data.getQuantityDenominator());
po.setQuantityNumerator(data.getQuantityNumerator());
po.setCreateBy(loginUser.getNickName());
po.setRemark(data.getRemark());
return po;
@ -65,7 +66,8 @@ public class PriceConverterImpl implements PriceConverter {
po.setPrice(data.getPrice());
po.setUnit(data.getUnit());
po.setClassify(data.getClassify());
po.setQuantity(data.getQuantity());
po.setQuantityDenominator(data.getQuantityDenominator());
po.setQuantityNumerator(data.getQuantityNumerator());
po.setUpdateId(loginUser.getUserId());
po.setUpdateBy(loginUser.getNickName());
po.setRemark(data.getRemark());

12
ruoyi-web/src/main/java/com/ruoyi/web/yh/prodOrder/domain/ProdOrderQuery.java
View File

@ -27,4 +27,16 @@ public class ProdOrderQuery extends ProdOrderVO {
@ApiModelProperty("ERP业务状态列表")
private List<String> erpStatusList;
@ApiModelProperty("物料规格品类")
private String materialCategory;
@ApiModelProperty("物料大小")
private String materialSize;
@ApiModelProperty("物料表面处理")
private String materialSurface;
@ApiModelProperty("物料盖子")
private String materialCover;
}

3
ruoyi-web/src/main/java/com/ruoyi/web/yh/prodOrder/mapper/ProdOrderMapper.xml
View File

@ -66,6 +66,9 @@
<if test="query.deptId != null "> and sd.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.materialCategory != null and query.materialCategory != ''">
and bm.
</if>
<if test="query.erpStatusList != null and query.erpStatusList.size() > 0">
and bpo.erp_status in
<foreach collection="query.erpStatusList" item="item" open="(" close=")" separator=",">

3
ruoyi-web/src/main/java/com/ruoyi/web/yh/report/service/impl/ReportServiceImpl.java
View File

@ -352,7 +352,8 @@ public class ReportServiceImpl implements ReportService
}
ServiceUtil.assertion(orderProd.getOrderId() == null
|| orderProd.getNum() == null
|| orderProd.getPriceQuantity() == null,
|| orderProd.getPriceQuantityNumerator() == null
|| orderProd.getPriceQuantityDenominator() == null,
"修改订单审核数量出错：参数错误"
);
BigDecimal baseNum = ReportUtils.calcOrderProdBaseNum(orderProd);

5
ruoyi-web/src/main/java/com/ruoyi/web/yh/report/utils/ReportUtils.java
View File

@ -3,6 +3,7 @@ package com.ruoyi.web.yh.report.utils;
import com.ruoyi.web.yh.reportOrderProd.domain.ReportOrderProdVO;
import java.math.BigDecimal;
import java.math.RoundingMode;
/**
* @author wjh
@ -15,10 +16,10 @@ public class ReportUtils {
* 计算报表订单产量的基础数量
*/
public static BigDecimal calcOrderProdBaseNum(ReportOrderProdVO vo) {
if (vo == null || vo.getPriceQuantity() == null || vo.getNum() == null) {
if (vo == null || vo.getPriceQuantityNumerator() == null || vo.getPriceQuantityDenominator() == null || vo.getNum() == null) {
return BigDecimal.ZERO;
}
return vo.getPriceQuantity().multiply(vo.getNum());
return vo.getPriceQuantityNumerator().multiply(vo.getNum()).divide(vo.getPriceQuantityDenominator(), 2, RoundingMode.HALF_UP);
}
}

7
ruoyi-web/src/main/java/com/ruoyi/web/yh/reportOrderProd/domain/ReportOrderProdVO.java
View File

@ -49,8 +49,11 @@ public class ReportOrderProdVO extends ReportOrderProd {
@ApiModelProperty("订单已审核通过的基础产量")
private BigDecimal verifiedBaseNum;
@ApiModelProperty("工序倍数")
private BigDecimal priceQuantity;
@ApiModelProperty("工序倍数分子")
private BigDecimal priceQuantityNumerator;
@ApiModelProperty("工序倍数分母")
private BigDecimal priceQuantityDenominator;
@ApiModelProperty("工序单位")
private String priceUnit;

10
ruoyi-web/src/main/java/com/ruoyi/web/yh/reportOrderProd/mapper/ReportOrderProdMapper.xml
View File

@ -14,7 +14,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
brop.num,
brop.deleted,
brp.report_id as report_id,
brp.price_quantity as price_quantity,
brp.price_quantity_numerator as price_quantity_numerator,
brp.price_quantity_denominator as price_quantity_denominator,
brp.price_unit as price_unit,
brp.price_name as price_name,
brp.price_price as price_price,
@ -44,6 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="query.deleted == null "> and brop.deleted = false</if>
<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.reportProdIds != null and query.reportProdIds.size() > 0">
and brop.report_prod_id in
<foreach collection="query.reportProdIds" item="item" open="(" separator="," close=")">
@ -76,7 +78,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<select id="selectSumOfBaseNumGroupByOrderId" resultMap="ReportOrderProdSumOfBaseNumGroupByOrderIdVO">
select
sum(brop.num * if(brp.price_quantity is null, 1, brp.price_quantity)) as `sum`,
sum(brop.num * if(
brp.price_quantity_numerator is null or brp.price_quantity_denominator is null,
1,
brp.price_quantity_numerator / brp.price_quantity_denominator
)) as `sum`,
order_id
from bst_report_order_prod brop
left join bst_report_prod brp on brp.id = brop.report_prod_id

10
ruoyi-web/src/main/java/com/ruoyi/web/yh/reportProd/domain/ReportProd.java
View File

@ -86,9 +86,13 @@ public class ReportProd extends BaseEntity
@ApiModelProperty("工序分类")
private String priceClassify;
@Excel(name = "工序生产数量倍数(个)")
@ApiModelProperty("工序生产数量倍数(个)")
private BigDecimal priceQuantity;
@Excel(name = "工序生产数量倍数分子(个)")
@ApiModelProperty("工序生产数量倍数分子(个)")
private BigDecimal priceQuantityNumerator;
@Excel(name = "工序生产数量倍数分母(个)")
@ApiModelProperty("工序生产数量倍数分母(个)")
private BigDecimal priceQuantityDenominator;
@Excel(name = "工序类型")
@ApiModelProperty("工序类型")

39
ruoyi-web/src/main/java/com/ruoyi/web/yh/reportProd/mapper/ReportProdMapper.xml
View File

@ -22,7 +22,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
brp.price_price,
brp.price_unit,
brp.price_classify,
brp.price_quantity,
brp.price_quantity_numerator,
brp.price_quantity_denominator,
brp.deleted,
brp.price_type,
brp.remark
@ -81,7 +82,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="pricePrice != null">price_price,</if>
<if test="priceUnit != null">price_unit,</if>
<if test="priceClassify != null">price_classify,</if>
<if test="priceQuantity != null">price_quantity,</if>
<if test="priceQuantityNumerator != null">price_quantity_numerator,</if>
<if test="priceQuantityDenominator != null">price_quantity_denominator,</if>
<if test="priceType != null and priceType != ''">price_type,</if>
<if test="remark != null and remark != ''">remark,</if>
</trim>
@ -99,7 +101,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="pricePrice != null">#{pricePrice},</if>
<if test="priceUnit != null">#{priceUnit},</if>
<if test="priceClassify != null">#{priceClassify},</if>
<if test="priceQuantity != null">#{priceQuantity},</if>
<if test="priceQuantityNumerator != null">#{priceQuantityNumerator},</if>
<if test="priceQuantityDenominator != null">#{priceQuantityDenominator},</if>
<if test="priceType != null and priceType != ''">#{priceType},</if>
<if test="remark != null and remark != ''">#{remark},</if>
</trim>
@ -120,7 +123,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
price_price,
price_unit,
price_classify,
price_quantity,
price_quantity_numerator,
price_quantity_denominator,
price_type,
remark
)
@ -153,8 +157,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="i.priceUnit == null">default,</if>
<if test="i.priceClassify != null">#{i.priceClassify},</if>
<if test="i.priceClassify == null">default,</if>
<if test="i.priceQuantity != null">#{i.priceQuantity},</if>
<if test="i.priceQuantity == null">default,</if>
<if test="i.priceQuantityNumerator != null">#{i.priceQuantityNumerator},</if>
<if test="i.priceQuantityNumerator == null">default,</if>
<if test="i.priceQuantityDenominator != null">#{i.priceQuantityDenominator},</if>
<if test="i.priceQuantityDenominator == null">default,</if>
<if test="i.priceType != null">#{i.priceType},</if>
<if test="i.priceType == null">default,</if>
<if test="i.remark != null">#{i.remark},</if>
@ -185,7 +191,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="data.pricePrice != null">price_price = #{data.pricePrice},</if>
<if test="data.priceUnit != null">price_unit = #{data.priceUnit},</if>
<if test="data.priceClassify != null">price_classify = #{data.priceClassify},</if>
<if test="data.priceQuantity != null">price_quantity = #{data.priceQuantity},</if>
<if test="data.priceQuantityNumerator != null">price_quantity_numerator = #{data.priceQuantityNumerator},</if>
<if test="data.priceQuantityDenominator != null">price_quantity_denominator = #{data.priceQuantityDenominator},</if>
<if test="data.priceType != null and data.priceType != ''">price_type = #{data.priceType},</if>
<if test="data.remark != null and data.remark != ''">remark = #{data.remark},</if>
</sql>
@ -313,13 +320,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</otherwise>
</choose>
</foreach>
<foreach open="price_quantity = CASE id" collection="list" item="item" close="END,">
<foreach open="price_quantity_numerator = CASE id" collection="list" item="item" close="END,">
<choose>
<when test="item.priceQuantity != null">
WHEN #{item.id} THEN #{item.priceQuantity}
<when test="item.priceQuantityNumerator != null">
WHEN #{item.id} THEN #{item.priceQuantityNumerator}
</when>
<otherwise>
WHEN #{item.id} THEN `price_quantity`
WHEN #{item.id} THEN `price_quantity_numerator`
</otherwise>
</choose>
</foreach>
<foreach open="price_quantity_denominator = CASE id" collection="list" item="item" close="END,">
<choose>
<when test="item.priceQuantityDenominator != null">
WHEN #{item.id} THEN #{item.priceQuantityDenominator}
</when>
<otherwise>
WHEN #{item.id} THEN `price_quantity_denominator`
</otherwise>
</choose>
</foreach>

6
ruoyi-web/src/main/java/com/ruoyi/web/yh/reportProd/service/impl/ReportProdConverterImpl.java
View File

@ -47,7 +47,8 @@ public class ReportProdConverterImpl implements ReportProdConverter {
bo.setPricePrice(vo.getPricePrice());
bo.setPriceUnit(vo.getPriceUnit());
bo.setPriceClassify(vo.getPriceClassify());
bo.setPriceQuantity(vo.getPriceQuantity());
bo.setPriceQuantityDenominator(vo.getPriceQuantityDenominator());
bo.setPriceQuantityNumerator(vo.getPriceQuantityNumerator());
bo.setPriceType(vo.getPriceType());
bo.setRemark(vo.getRemark());
@ -94,7 +95,8 @@ public class ReportProdConverterImpl implements ReportProdConverter {
bo.setPricePrice(vo.getPricePrice());
bo.setPriceUnit(vo.getPriceUnit());
bo.setPriceClassify(vo.getPriceClassify());
bo.setPriceQuantity(vo.getPriceQuantity());
bo.setPriceQuantityDenominator(vo.getPriceQuantityDenominator());
bo.setPriceQuantityNumerator(vo.getPriceQuantityNumerator());
bo.setPriceType(vo.getPriceType());
bo.setRemark(vo.getRemark());