bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化

This commit is contained in:
mashuai 2026-01-23 11:10:13 +08:00
parent 935bb84790
commit c4c6c86ad5
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bonus-modules/bonus-material/src/main/java/com/bonus/material/part/service/impl/PartArrivedServiceImpl.java
View File

@ -246,12 +246,14 @@ public class PartArrivedServiceImpl implements IPartArrivedService
if(!CollectionUtils.isEmpty(partTypeCheckDetails)) { if(!CollectionUtils.isEmpty(partTypeCheckDetails)) {
BigDecimal purchaseNum = new BigDecimal(0); BigDecimal purchaseNum = new BigDecimal(0);
BigDecimal inputNum = new BigDecimal(0); BigDecimal inputNum = new BigDecimal(0);
BigDecimal checkNum = new BigDecimal(0);
BigDecimal purchasePrice = new BigDecimal(0); BigDecimal purchasePrice = new BigDecimal(0);
BigDecimal purchaseTaxPrice = new BigDecimal(0); BigDecimal purchaseTaxPrice = new BigDecimal(0);
Set<String> partNameSet = new HashSet<>(); Set<String> partNameSet = new HashSet<>();
for (int j = 0; j < partTypeCheckDetails.size(); j++) { for (int j = 0; j < partTypeCheckDetails.size(); j++) {
purchaseNum = purchaseNum.add(partTypeCheckDetails.get(j).getPurchaseNum()); purchaseNum = purchaseNum.add(partTypeCheckDetails.get(j).getPurchaseNum());
inputNum = inputNum.add(partTypeCheckDetails.get(j).getInputNum()); inputNum = inputNum.add(partTypeCheckDetails.get(j).getInputNum());
checkNum = checkNum.add(partTypeCheckDetails.get(j).getCheckNum());
purchasePrice = purchasePrice.add(partTypeCheckDetails.get(j).getPurchasePrice().multiply(partTypeCheckDetails.get(j).getPurchaseNum())); purchasePrice = purchasePrice.add(partTypeCheckDetails.get(j).getPurchasePrice().multiply(partTypeCheckDetails.get(j).getPurchaseNum()));
purchaseTaxPrice = purchaseTaxPrice.add(partTypeCheckDetails.get(j).getPurchaseTaxPrice().multiply(partTypeCheckDetails.get(j).getPurchaseNum())); purchaseTaxPrice = purchaseTaxPrice.add(partTypeCheckDetails.get(j).getPurchaseTaxPrice().multiply(partTypeCheckDetails.get(j).getPurchaseNum()));
// 将名称添加到Set中（自动去重） // 将名称添加到Set中（自动去重）
@ -261,6 +263,7 @@ public class PartArrivedServiceImpl implements IPartArrivedService
String partName = String.join(",", partNameSet); String partName = String.join(",", partNameSet);
partTypeCheckInfos.get(i).setInputMaNumber(inputNum); partTypeCheckInfos.get(i).setInputMaNumber(inputNum);
partTypeCheckInfos.get(i).setPurchaseMaNumber(purchaseNum); partTypeCheckInfos.get(i).setPurchaseMaNumber(purchaseNum);
partTypeCheckInfos.get(i).setCheckMaNumber(checkNum);
partTypeCheckInfos.get(i).setPurchasePrice(purchasePrice); partTypeCheckInfos.get(i).setPurchasePrice(purchasePrice);
partTypeCheckInfos.get(i).setPurchaseTaxPrice(purchaseTaxPrice); partTypeCheckInfos.get(i).setPurchaseTaxPrice(purchaseTaxPrice);
partTypeCheckInfos.get(i).setPurchaseMaTypeName(partName); partTypeCheckInfos.get(i).setPurchaseMaTypeName(partName);

3
bonus-modules/bonus-material/src/main/resources/mapper/material/part/PartArrivedMapper.xml
View File

@ -158,7 +158,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
purchase_tax_price as purchaseTaxPrice, purchase_tax_price as purchaseTaxPrice,
purchase_num as purchaseNum, purchase_num as purchaseNum,
ppd.status as status, ppd.status as status,
IFNULL(ppd.input_num, 0) as inputNum IFNULL(ppd.input_num, 0) as inputNum,
IFNULL(ppd.check_num, 0) as checkNum
from purchase_part_details ppd from purchase_part_details ppd
left join ma_part_type mpt on ppd.part_id = mpt.pa_id and mpt.del_flag = 0 left join ma_part_type mpt on ppd.part_id = mpt.pa_id and mpt.del_flag = 0
left join ma_part_type mpt2 on mpt.parent_id = mpt2.pa_id and mpt2.del_flag = 0 left join ma_part_type mpt2 on mpt.parent_id = mpt2.pa_id and mpt2.del_flag = 0