From 69e4034457b2fd11e62711fe26bdb3d03f4d9c4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Tue, 21 Sep 2021 23:41:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=A4=9A=E9=80=89=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E7=9A=84=E5=BA=93=E5=AD=98=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jsh/erp/controller/MaterialController.java | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

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 51ca492d..e37ee803 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
@@ -492,12 +492,18 @@ public class MaterialController {
                                 Long depotId = depotObj.getLong("id");
                                 mvo.setDepotId(depotId);
                                 //库存
-                                BigDecimal stock = depotItemService.getStockByParam(depotId,mvo.getId(),null,null);
-                                if (mvo.getUnitId()!=null){
-                                    Unit unit = unitService.getUnit(mvo.getUnitId());
-                                    if(mvo.getCommodityUnit().equals(unit.getOtherUnit())) {
-                                        if(unit.getRatio()!=0) {
-                                            stock = stock.divide(BigDecimal.valueOf(unit.getRatio()),2,BigDecimal.ROUND_HALF_UP);
+                                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())) {
+                                            if(unit.getRatio()!=0) {
+                                                stock = stock.divide(BigDecimal.valueOf(unit.getRatio()),2,BigDecimal.ROUND_HALF_UP);
+                                            }
                                         }
                                     }
                                 }