From efb1e828e0195e3044e4a2cca64695cadb6c6c86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Wed, 22 Sep 2021 00:18:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=95=86=E5=93=81=E7=9A=84sk?=
 =?UTF-8?q?u=E5=BA=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jsh/erp/controller/DepotItemController.java    | 10 ++++------
 .../com/jsh/erp/controller/MaterialController.java     | 10 ++++------
 .../main/resources/mapper_xml/DepotItemMapperEx.xml    |  4 ++--
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java
index c0db2344..4b6587c6 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java
@@ -123,9 +123,8 @@ public class DepotItemController {
             List<MaterialVo4Unit> list = materialService.getMaterialByBarCode(barCode);
             if(list!=null && list.size()>0) {
                 MaterialVo4Unit materialVo4Unit = list.get(0);
-                BigDecimal skuStock = depotItemService.getSkuStockByParam(depotId,materialVo4Unit.getMeId(),null,null);
-                if(skuStock.compareTo(BigDecimal.ZERO)!=0){
-                    stock = skuStock;
+                if(StringUtil.isNotEmpty(materialVo4Unit.getSku())){
+                    stock = depotItemService.getSkuStockByParam(depotId,materialVo4Unit.getMeId(),null,null);
                 } else {
                     stock = depotItemService.getStockByParam(depotId,materialVo4Unit.getId(),null,null);
                     String commodityUnit = materialVo4Unit.getCommodityUnit();
@@ -179,9 +178,8 @@ public class DepotItemController {
                     item.put("materialOther", getOtherInfo(mpArr, diEx));
                     Integer ratio = diEx.getRatio();
                     BigDecimal stock;
-                    BigDecimal skuStock = depotItemService.getSkuStockByParam(diEx.getDepotId(),diEx.getMaterialExtendId(),null,null);
-                    if(skuStock.compareTo(BigDecimal.ZERO)!=0){
-                        stock = skuStock;
+                    if(StringUtil.isNotEmpty(diEx.getSku())){
+                        stock = depotItemService.getSkuStockByParam(diEx.getDepotId(),diEx.getMaterialExtendId(),null,null);
                     } else {
                         stock = depotItemService.getStockByParam(diEx.getDepotId(),diEx.getMaterialId(),null,null);
                         if(ratio!=null){
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 e37ee803..33b5e0d0 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
@@ -200,9 +200,8 @@ public class MaterialController {
                     item.put("unit", material.getCommodityUnit() + ratio);
                     item.put("sku", material.getSku());
                     BigDecimal stock;
-                    BigDecimal skuStock = depotItemService.getSkuStockByParam(depotId,material.getMeId(),null,null);
-                    if(skuStock.compareTo(BigDecimal.ZERO)!=0){
-                        stock = skuStock;
+                    if(StringUtil.isNotEmpty(material.getSku())){
+                        stock = depotItemService.getSkuStockByParam(depotId,material.getMeId(),null,null);
                     } else {
                         stock = depotItemService.getStockByParam(depotId,material.getId(),null,null);
                         if (material.getUnitId()!=null){
@@ -493,9 +492,8 @@ public class MaterialController {
                                 mvo.setDepotId(depotId);
                                 //库存
                                 BigDecimal stock;
-                                BigDecimal skuStock = depotItemService.getSkuStockByParam(depotId,mvo.getMeId(),null,null);
-                                if(skuStock.compareTo(BigDecimal.ZERO)!=0){
-                                    stock = skuStock;
+                                if(StringUtil.isNotEmpty(mvo.getSku())){
+                                    stock = depotItemService.getSkuStockByParam(depotId,mvo.getMeId(),null,null);
                                 } else {
                                     stock = depotItemService.getStockByParam(depotId,mvo.getId(),null,null);
                                     if (mvo.getUnitId()!=null){
diff --git a/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml
index 1e333552..e1e476f3 100644
--- a/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml
+++ b/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml
@@ -155,7 +155,7 @@
     <select id="findDetailByTypeAndMaterialIdCounts" resultType="java.lang.Long">
         select count(1)
         from jsh_depot_head dh
-        INNER JOIN jsh_depot_item di on dh.id=di.header_id and ifnull(di.delete_flag,'0') !='1'
+        left JOIN jsh_depot_item di on dh.id=di.header_id and ifnull(di.delete_flag,'0') !='1'
         where ((dh.type!='其它' and dh.sub_type!='调拨')
         or (dh.type='其它' and dh.sub_type='组装单')
         or (dh.type='其它' and dh.sub_type='拆卸单')
@@ -258,7 +258,7 @@
 
     <select id="getStockCheckSum"  resultType="java.math.BigDecimal">
         select ifnull(sum(di.basic_number),0) stockCheckSum from jsh_depot_head dh
-        INNER JOIN jsh_depot_item di on dh.id=di.header_id
+        left JOIN jsh_depot_item di on dh.id=di.header_id
         where 1=1
         <if test="mId != null">
             and di.material_id=#{mId}