purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

给商品按条件查询接口增加非空判断

Browse Source
This commit is contained in:
jishenghua
2025-10-27 22:08:05 +08:00
parent f82393260e
commit 390c2d34e1
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java
View File

@@ -342,17 +342,19 @@ public class MaterialController extends BaseController {
unit = unitService.getUnit(material.getUnitId());
//拼接副单位的比例
String commodityUnit = material.getCommodityUnit();
if(commodityUnit.equals(unit.getBasicUnit())) {
ratioStr = "[基本]";
}
if(commodityUnit.equals(unit.getOtherUnit()) && unit.getRatio()!=null) {
ratioStr = "[" + unit.getRatio().stripTrailingZeros().toPlainString() + unit.getBasicUnit() + "]";
}
if(commodityUnit.equals(unit.getOtherUnitTwo()) && unit.getRatioTwo()!=null) {
ratioStr = "[" + unit.getRatioTwo().stripTrailingZeros().toPlainString() + unit.getBasicUnit() + "]";
}
if(commodityUnit.equals(unit.getOtherUnitThree()) && unit.getRatioThree()!=null) {
ratioStr = "[" + unit.getRatioThree().stripTrailingZeros().toPlainString() + unit.getBasicUnit() + "]";
if(StringUtil.isNotEmpty(commodityUnit) && unit!=null) {
if(commodityUnit.equals(unit.getBasicUnit())) {
ratioStr = "[基本]";
}
if(commodityUnit.equals(unit.getOtherUnit()) && unit.getRatio()!=null) {
ratioStr = "[" + unit.getRatio().stripTrailingZeros().toPlainString() + unit.getBasicUnit() + "]";
}
if(commodityUnit.equals(unit.getOtherUnitTwo()) && unit.getRatioTwo()!=null) {
ratioStr = "[" + unit.getRatioTwo().stripTrailingZeros().toPlainString() + unit.getBasicUnit() + "]";
}
if(commodityUnit.equals(unit.getOtherUnitThree()) && unit.getRatioThree()!=null) {
ratioStr = "[" + unit.getRatioThree().stripTrailingZeros().toPlainString() + unit.getBasicUnit() + "]";
}
}
}
item.put("mBarCode", material.getmBarCode());

2
jshERP-boot/src/main/java/com/jsh/erp/service/UnitService.java
View File

@@ -227,7 +227,7 @@ public class UnitService {
* @return
*/
public BigDecimal parseStockByUnit(BigDecimal stock, Unit unitInfo, String materialUnit) {
if(stock!=null) {
if(stock!=null && unitInfo!=null && StringUtil.isNotEmpty(materialUnit)) {
if (materialUnit.equals(unitInfo.getOtherUnit()) && unitInfo.getRatio() != null && unitInfo.getRatio().compareTo(BigDecimal.ZERO) != 0) {
stock = stock.divide(unitInfo.getRatio(), 2, BigDecimal.ROUND_HALF_UP);
}