优化多选商品的库存显示

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

@@ -492,7 +492,12 @@ public class MaterialController {
                                 Long depotId = depotObj.getLong("id");
                                 mvo.setDepotId(depotId);
                                 //库存
-                                BigDecimal stock = depotItemService.getStockByParam(depotId,mvo.getId(),null,null);
+                                BigDecimal stock;
+                                BigDecimal skuStock = depotItemService.getSkuStockByParam(depotId,mvo.getMeId(),null,null);
+                                if(skuStock.compareTo(BigDecimal.ZERO)!=0){
+                                    stock = skuStock;
+                                } else {
+                                    stock = depotItemService.getStockByParam(depotId,mvo.getId(),null,null);
                                     if (mvo.getUnitId()!=null){
                                         Unit unit = unitService.getUnit(mvo.getUnitId());
                                         if(mvo.getCommodityUnit().equals(unit.getOtherUnit())) {
@@ -501,6 +506,7 @@ public class MaterialController {
                                             }
                                         }
                                     }
+                                }
                                 mvo.setStock(stock);
                             }
                         }