diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java
index 5520237f..cc00ccbf 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java
@@ -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());
diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/UnitService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/UnitService.java
index 60022123..91f67292 100644
--- 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);
             }