From d5bb4616a3ad87e2c3359406bdd57690628a5435 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Sat, 9 Oct 2021 00:04:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=95=86=E5=93=81=E6=9D=A1?=
 =?UTF-8?q?=E7=A0=81=E6=9F=A5=E8=AF=A2=E8=8E=B7=E5=8F=96=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jsh/erp/controller/MaterialController.java  | 9 ++++++---
 1 file changed, 6 insertions(+), 3 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 47ef27c2..367b6e44 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
@@ -491,13 +491,16 @@ public class MaterialController {
                             Boolean isDefault = depotObj.getBoolean("isDefault");
                             if(isDefault) {
                                 Long depotId = depotObj.getLong("id");
-                                mvo.setDepotId(depotId);
+                                if(!"CGDD".equals(prefixNo) && !"XSDD".equals(prefixNo) ) {
+                                    //除订单之外的单据才有仓库
+                                    mvo.setDepotId(depotId);
+                                }
                                 //库存
                                 BigDecimal stock;
                                 if(StringUtil.isNotEmpty(mvo.getSku())){
-                                    stock = depotItemService.getSkuStockByParam(depotId,mvo.getMeId(),null,null);
+                                    stock = depotItemService.getSkuStockByParam(mvo.getDepotId(),mvo.getMeId(),null,null);
                                 } else {
-                                    stock = depotItemService.getStockByParam(depotId,mvo.getId(),null,null);
+                                    stock = depotItemService.getStockByParam(mvo.getDepotId(),mvo.getId(),null,null);
                                     if (mvo.getUnitId()!=null){
                                         Unit unit = unitService.getUnit(mvo.getUnitId());
                                         if(mvo.getCommodityUnit().equals(unit.getOtherUnit())) {