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

2025-10-27 22:08:05 +08:00
parent f82393260e
commit 390c2d34e1
2 changed files with 14 additions and 12 deletions
--- a/jshERP-boot/src/main/java/com/jsh/erp/service/UnitService.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/service/UnitService.java
@@ -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);
            }