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-24 17:06:01 +08:00
parent 50855a68ce
commit 1860ac322e
4 changed files with 8 additions and 7 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/ProjectProductInfo.java
View File

@ -80,5 +80,7 @@ public class ProjectProductInfo extends BaseEntity
private String value; private String value;
private BigDecimal taxRate; private BigDecimal taxRate;
private String level2Type;
} }

4
ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/DeliveryListServiceImpl.java
View File

@ -216,13 +216,13 @@ public class DeliveryListServiceImpl implements IDeliveryListService {
if (CollUtil.isNotEmpty(productInfoList)) { if (CollUtil.isNotEmpty(productInfoList)) {
if (ProductInfo.ProductTypeEnum.SOFTWARE.getType().equals(deliveryInfoVo.getProductType())) { if (ProductInfo.ProductTypeEnum.SOFTWARE.getType().equals(deliveryInfoVo.getProductType())) {
for (ProductInfo productInfo : productInfoList) { for (ProductInfo productInfo : productInfoList) {
if (ProductInfo.ProductTypeLevel2ServiceEnum.SOFTWARE_QA.getType().equals(productInfo.getType()) && StringUtils.isNotEmpty(productInfo.getValue())) { if (ProductInfo.ProductTypeLevel2ServiceEnum.SOFTWARE_QA.getType().equals(productInfo.getLevel2Type()) && StringUtils.isNotEmpty(productInfo.getValue())) {
startTime = updateStartTimeAndAddList(deliveryInfoVo, productInfo, startTime, serviceInfoList); startTime = updateStartTimeAndAddList(deliveryInfoVo, productInfo, startTime, serviceInfoList);
} }
} }
} else { } else {
for (ProductInfo productInfo : productInfoList) { for (ProductInfo productInfo : productInfoList) {
if (ProductInfo.ProductTypeLevel2ServiceEnum.HARDWARE_QA.getType().equals(productInfo.getType()) && StringUtils.isNotEmpty(productInfo.getValue())) { if (ProductInfo.ProductTypeLevel2ServiceEnum.HARDWARE_QA.getType().equals(productInfo.getLevel2Type()) && StringUtils.isNotEmpty(productInfo.getValue())) {
startTime = updateStartTimeAndAddList(deliveryInfoVo, productInfo, startTime, serviceInfoList); startTime = updateStartTimeAndAddList(deliveryInfoVo, productInfo, startTime, serviceInfoList);
} }
} }

6
ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/InventoryDeliveryServiceImpl.java
View File

@ -453,16 +453,14 @@ public class InventoryDeliveryServiceImpl implements IInventoryDeliveryService {
if (CollUtil.isNotEmpty(productInfoList)) { if (CollUtil.isNotEmpty(productInfoList)) {
if (ProductInfo.ProductTypeEnum.SOFTWARE.getType().equals(deliveryInfoVo.getProductType())) { if (ProductInfo.ProductTypeEnum.SOFTWARE.getType().equals(deliveryInfoVo.getProductType())) {
for (ProjectProductInfo productInfo : productInfoList) { for (ProjectProductInfo productInfo : productInfoList) {
if (ProductInfo.ProductTypeEnum.SOFTWARE_MAINTENANCE.getType().equals(productInfo.getType()) && StringUtils.isNotEmpty(productInfo.getValue())) { if (ProductInfo.ProductTypeLevel2ServiceEnum.SOFTWARE_QA.getType().equals(productInfo.getLevel2Type()) && StringUtils.isNotEmpty(productInfo.getValue())) {
startTime = updateStartTimeAndAddList(deliveryInfoVo, productInfo, startTime, serviceInfoList); startTime = updateStartTimeAndAddList(deliveryInfoVo, productInfo, startTime, serviceInfoList);
} }
} }
} else { } else {
for (ProjectProductInfo productInfo : productInfoList) { for (ProjectProductInfo productInfo : productInfoList) {
if (ProductInfo.ProductTypeEnum.HARDWARE_MAINTENANCE.getType().equals(productInfo.getType()) && StringUtils.isNotEmpty(productInfo.getValue())) { if (ProductInfo.ProductTypeLevel2ServiceEnum.HARDWARE_QA.getType().equals(productInfo.getLevel2Type()) && StringUtils.isNotEmpty(productInfo.getValue())) {
startTime = updateStartTimeAndAddList(deliveryInfoVo, productInfo, startTime, serviceInfoList); startTime = updateStartTimeAndAddList(deliveryInfoVo, productInfo, startTime, serviceInfoList);
} }
} }

3
ruoyi-sip/src/main/resources/mapper/sip/ProjectProductInfoMapper.xml
View File

@ -27,7 +27,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</sql> </sql>
<sql id="selectProjectProductRelationInfoVo"> <sql id="selectProjectProductRelationInfoVo">
select t1.id, t1.project_id, t1.product_bom_code, t1.model, t1.product_code, t1.product_desc, t1.quantity, t1.catalogue_price, select t1.id, t1.project_id, t1.product_bom_code, t1.model, t1.product_code, t1.product_desc, t1.quantity, t1.catalogue_price,
t1.catalogue_all_price, t1.price, t1.all_price, t1.guidance_discount, t1.discount, t1.remark,t1.tax_rate,t2.type,t2.product_name,t2.vendor_code,t2.value,t3.vendor_name t1.catalogue_all_price, t1.price, t1.all_price, t1.guidance_discount, t1.discount, t1.remark,t1.tax_rate,
t2.type,t2.product_name,t2.vendor_code,t2.value,t3.vendor_name, t2.level2_type
from project_product_info t1 from project_product_info t1
left join product_info t2 on t1.product_bom_code = t2.product_code left join product_info t2 on t1.product_bom_code = t2.product_code
left join oms_vendor_info t3 on t2.vendor_code = t3.vendor_code left join oms_vendor_info t3 on t2.vendor_code = t3.vendor_code