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

feat(sip):bug修改，税率税额取的是产品信息中的数据

dev_1.0.2
wangy 2026-05-21 15:31:37 +08:00
parent 5749d20c80
commit e992a62a5b
3 changed files with 33 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/mapper/ProductInfoMapper.java
View File

@ -79,4 +79,6 @@ public interface ProductInfoMapper
void updateCount(List<ProductInfo> values);
List<ProductInfo> listInventory(ProductInfo info);
ProductInfo selectProductInfoByBomCode(String productCode);
}

30
ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsPurchaseOrderServiceImpl.java
View File

@ -20,9 +20,7 @@ import com.ruoyi.sip.flowable.domain.Todo;
import com.ruoyi.sip.flowable.service.DeleteFlowableProcessInstanceCmd;
import com.ruoyi.sip.flowable.service.TodoCommonTemplate;
import com.ruoyi.sip.flowable.service.TodoService;
import com.ruoyi.sip.mapper.OmsPurchaseOrderItemHistoryMapper;
import com.ruoyi.sip.mapper.OmsPurchaseOrderHistoryMapper;
import com.ruoyi.sip.mapper.VendorInfoMapper;
import com.ruoyi.sip.mapper.*;
import com.ruoyi.sip.service.*;
import com.ruoyi.system.mapper.SysUserMapper;
import lombok.extern.slf4j.Slf4j;
@ -38,7 +36,6 @@ import org.springframework.stereotype.Service;
import com.ruoyi.common.utils.StringUtils;
import org.springframework.transaction.annotation.Transactional;
import com.ruoyi.sip.mapper.OmsPurchaseOrderMapper;
import javax.annotation.Resource;
@ -67,6 +64,9 @@ public class OmsPurchaseOrderServiceImpl implements IOmsPurchaseOrderService, To
@Resource
private VendorInfoMapper vendorInfoMapper;
@Resource
private ProductInfoMapper productInfoMapper;
@Resource
private SysUserMapper userMapper;
@ -646,10 +646,26 @@ public class OmsPurchaseOrderServiceImpl implements IOmsPurchaseOrderService, To
orderItem.setProductType(addToNexReq.getProductType());
orderItem.setProductCode(addToNexReq.getProductCode());
orderItem.setQuantity(new BigDecimal(addToNexReq.getQuantity()));
orderItem.setPrice(addToNexReq.getPrice());
orderItem.setTaxRate(addToNexReq.getTaxRate());
orderItem.setTaxTotal(addToNexReq.getTaxTotal());
// 根据BOM编码查询产品信息，折扣，单价和税率都从产品信息读
log.info("通过BOM编码查询产品信息");
ProductInfo productInfo = productInfoMapper.selectProductInfoByBomCode(addToNexReq.getProductCode());
if (productInfo == null) {
throw new ServiceException("未找到BOM编码对应的产品信息: " + addToNexReq.getProductCode());
}
log.info("通过BOM编码查询产品信息");
// 将String类型转换为BigDecimal
BigDecimal price = new BigDecimal(productInfo.getCataloguePrice() != null ? productInfo.getCataloguePrice() : "0");
BigDecimal taxRate = new BigDecimal(productInfo.getGuidanceDiscount() != null ? productInfo.getGuidanceDiscount() : "0");
orderItem.setPrice(price);
orderItem.setTaxRate(taxRate);
// 税额 = 单价 * 数量 - (单价 * 数量) / (1 + 税率)，结果取两位小数
BigDecimal quantity = orderItem.getQuantity();
BigDecimal totalAmount = price.multiply(quantity);
BigDecimal taxTotal = totalAmount.subtract(totalAmount.divide(BigDecimal.ONE.add(taxRate), 2, BigDecimal.ROUND_HALF_UP));
orderItem.setTaxTotal(taxTotal.setScale(2, BigDecimal.ROUND_HALF_UP));
// 根据传入的参数计算金额
BigDecimal amountTotal = addToNexReq.getPrice() != null && addToNexReq.getQuantity() != null
? addToNexReq.getPrice().multiply(new BigDecimal(addToNexReq.getQuantity()))

8
ruoyi-sip/src/main/resources/mapper/system/ProductInfoMapper.xml
View File

@ -259,4 +259,12 @@
</foreach>
</delete>
<select id="selectProductInfoByBomCode" parameterType="String" resultMap="ProductInfoResult">
<include refid="selectProductInfoVo"/>
where t1.product_code = #{productCode}
and t1.status = 0
limit 1
</select>
</mapper>