mula
/
unis_sip
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix：产品二级类型相关调整

dev_1.0.2
UNISINSIGHT\rdpnr_jiangpeng 2026-03-30 14:52:13 +08:00
parent 9a491ab1c7
commit baae63153a
3 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OmsPayableBill.java
View File

@ -59,6 +59,8 @@ public class OmsPayableBill extends BaseEntity
/** 产品类型 */ /** 产品类型 */
@Excel(name = "产品类型") @Excel(name = "产品类型")
private String productType; private String productType;
/** 二级产品类型 */
private String productLevel2Type;
/** 产品编码 */ /** 产品编码 */
private String productCode; private String productCode;

11
ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsFinanceChargeServiceImpl.java
View File

@ -194,18 +194,17 @@ public class OmsFinanceChargeServiceImpl implements IOmsFinanceChargeService {
queryBill.setOrderCode(omsFinanceCharge.getOrderCode()); queryBill.setOrderCode(omsFinanceCharge.getOrderCode());
List<OmsPayableBill> omsPayableBills = payableBillService.selectOmsPayableBillList(queryBill); List<OmsPayableBill> omsPayableBills = payableBillService.selectOmsPayableBillList(queryBill);
for (OmsPayableBill omsPayableBill : omsPayableBills) { for (OmsPayableBill omsPayableBill : omsPayableBills) {
if (omsPayableBill.getProductType().equals(ProductInfo.ProductTypeEnum.SOFTWARE_MAINTENANCE.getType())){ if (omsPayableBill.getProductType().equals(ProductInfo.ProductTypeEnum.SERVICE.getType())) {
if (ProductInfo.ProductTypeLevel2ServiceEnum.SOFTWARE_QA.getType().equals((omsPayableBill.getProductLevel2Type()))) {
costSoftwareMaintWithTax = costSoftwareMaintWithTax.add(omsPayableBill.getTotalPriceWithTax()); costSoftwareMaintWithTax = costSoftwareMaintWithTax.add(omsPayableBill.getTotalPriceWithTax());
costSoftwareMaintWithoutTax = costSoftwareMaintWithoutTax.add(omsPayableBill.getTotalPriceWithoutTax()); costSoftwareMaintWithoutTax = costSoftwareMaintWithoutTax.add(omsPayableBill.getTotalPriceWithoutTax());
}else if (omsPayableBill.getProductType().equals(ProductInfo.ProductTypeEnum.HARDWARE_MAINTENANCE.getType())){ } else if (ProductInfo.ProductTypeLevel2ServiceEnum.HARDWARE_QA.getType().equals((omsPayableBill.getProductLevel2Type()))) {
costHardwareMaintWithTax = costHardwareMaintWithTax.add(omsPayableBill.getTotalPriceWithTax()); costHardwareMaintWithTax = costHardwareMaintWithTax.add(omsPayableBill.getTotalPriceWithTax());
costHardwareMaintWithoutTax = costHardwareMaintWithoutTax.add(omsPayableBill.getTotalPriceWithoutTax()); costHardwareMaintWithoutTax = costHardwareMaintWithoutTax.add(omsPayableBill.getTotalPriceWithoutTax());
}else if (omsPayableBill.getProductType().equals(ProductInfo.ProductTypeEnum.PROVINCE_SERVICE.getType())){ } else if (ProductInfo.ProductTypeLevel2ServiceEnum.SHENG_DAI.getType().equals((omsPayableBill.getProductLevel2Type()))) {
costProvinceServiceWithTax = costProvinceServiceWithTax.add(omsPayableBill.getTotalPriceWithTax()); costProvinceServiceWithTax = costProvinceServiceWithTax.add(omsPayableBill.getTotalPriceWithTax());
costProvinceServiceWithoutTax = costProvinceServiceWithoutTax.add(omsPayableBill.getTotalPriceWithoutTax()); costProvinceServiceWithoutTax = costProvinceServiceWithoutTax.add(omsPayableBill.getTotalPriceWithoutTax());
}else if (omsPayableBill.getProductType().equals(ProductInfo.ProductTypeEnum.OTHER.getType())){ }
costOtherWithTax = costOtherWithTax.add(omsPayableBill.getTotalPriceWithTax());
costOtherWithoutTax = costOtherWithoutTax.add(omsPayableBill.getTotalPriceWithoutTax());
} }
} }
omsFinanceCharge.setCostSoftwareMaintWithoutTax(costSoftwareMaintWithoutTax); omsFinanceCharge.setCostSoftwareMaintWithoutTax(costSoftwareMaintWithoutTax);

7
ruoyi-sip/src/main/resources/mapper/finance/OmsPayableBillMapper.xml
View File

@ -11,6 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="orderCode" column="order_code" /> <result property="orderCode" column="order_code" />
<result property="inventoryCode" column="inventory_code" /> <result property="inventoryCode" column="inventory_code" />
<result property="productType" column="product_type" /> <result property="productType" column="product_type" />
<result property="productLevel2Type" column="product_level2_type" />
<result property="totalPriceWithTax" column="total_price_with_tax" /> <result property="totalPriceWithTax" column="total_price_with_tax" />
<result property="totalPriceWithoutTax" column="total_price_without_tax" /> <result property="totalPriceWithoutTax" column="total_price_without_tax" />
<result property="taxAmount" column="tax_amount" /> <result property="taxAmount" column="tax_amount" />
@ -63,7 +64,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
t1.vendor_code, t1.vendor_code,
t1.order_code, t1.order_code,
t1.inventory_code, t1.inventory_code,
t1.product_type,
t1.total_price_with_tax, t1.total_price_with_tax,
t1.total_price_without_tax, t1.total_price_without_tax,
t1.tax_amount, t1.tax_amount,
@ -86,7 +86,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
ppp.plan_payment_date, ppp.plan_payment_date,
ppp.plan_amount, ppp.plan_amount,
t5.plan_ticket_date, t5.plan_ticket_date,
t5.plan_amount as plan_ticket_amount t5.plan_amount as plan_ticket_amount,
t6.type as product_type,
t6.level2_type as product_leve2_type
FROM FROM
oms_payable_bill t1 oms_payable_bill t1
left join project_order_info t2 on t1.order_code=t2.order_code left join project_order_info t2 on t1.order_code=t2.order_code
@ -94,6 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join oms_vendor_info t4 on t1.vendor_code=t4.vendor_code left join oms_vendor_info t4 on t1.vendor_code=t4.vendor_code
left join oms_payable_payment_plan ppp on t1.last_payment_plan_id = ppp.id left join oms_payable_payment_plan ppp on t1.last_payment_plan_id = ppp.id
left join oms_payable_ticket_plan t5 on t1.last_ticket_plan_id = t5.id left join oms_payable_ticket_plan t5 on t1.last_ticket_plan_id = t5.id
left join product_info t6 on t1.product_code = t6.product_code
</sql> </sql>
<select id="selectOmsPayableBillList" parameterType="OmsPayableBill" resultMap="OmsPayableBillResult"> <select id="selectOmsPayableBillList" parameterType="OmsPayableBill" resultMap="OmsPayableBillResult">
<include refid="selectOmsPayableBillRelationVo"/> <include refid="selectOmsPayableBillRelationVo"/>