From 9750415a382b56af2a08874916adb7e138c378c9 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, 22 Dec 2018 12:25:29 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=8D=95=E6=8D=AE=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E6=95=B0=E6=8D=AE=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 erp_web/pages/reports/in_out_stock_report.html    |  4 ++--
 .../jsh/erp/controller/DepotItemController.java   |  2 +-
 .../resources/mapper_xml/DepotItemMapperEx.xml    | 15 ++++++++-------
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/erp_web/pages/reports/in_out_stock_report.html b/erp_web/pages/reports/in_out_stock_report.html
index 7bb8f67d..a8c006b9 100644
--- a/erp_web/pages/reports/in_out_stock_report.html
+++ b/erp_web/pages/reports/in_out_stock_report.html
@@ -342,8 +342,8 @@
                                                     mpList: mPropertyList
                                                 }),
                                                 success: function (res) {
-                                                    if(res && res.code === 200 && res.data) {
-                                                        $("#tableData").datagrid('loadData', res.data.rows);
+                                                    if(res && res.code === 200) {
+                                                        $("#tableData").datagrid('loadData', res.data);
                                                     }
                                                 },
                                                 //此处添加错误处理
diff --git a/src/main/java/com/jsh/erp/controller/DepotItemController.java b/src/main/java/com/jsh/erp/controller/DepotItemController.java
index fbc0492a..97f1d6df 100644
--- a/src/main/java/com/jsh/erp/controller/DepotItemController.java
+++ b/src/main/java/com/jsh/erp/controller/DepotItemController.java
@@ -359,7 +359,7 @@ public class DepotItemController {
                             Long mId = Long.parseLong(tempUpdatedJson.get("MaterialId").toString());
                             //以下进行单位换算
                             String UnitName = findUnitName(mId); //查询计量单位名称
-                            if (!UnitName.equals("")) {
+                            if (!StringUtil.isEmpty(UnitName)) {
                                 String UnitList = UnitName.substring(0, UnitName.indexOf("("));
                                 String RatioList = UnitName.substring(UnitName.indexOf("("));
                                 String basicUnit = UnitList.substring(0, UnitList.indexOf(",")); //基本单位
diff --git a/src/main/resources/mapper_xml/DepotItemMapperEx.xml b/src/main/resources/mapper_xml/DepotItemMapperEx.xml
index f585bacd..09c51cc1 100644
--- a/src/main/resources/mapper_xml/DepotItemMapperEx.xml
+++ b/src/main/resources/mapper_xml/DepotItemMapperEx.xml
@@ -148,7 +148,7 @@
     </select>
 
     <select id="findByAllCount" resultType="java.lang.Integer">
-        select count(1)
+        select count(1) from (select di.Id
         from jsh_depotitem di
         inner join jsh_material m on di.MaterialId=m.id
         where 1=1
@@ -158,6 +158,7 @@
         <if test="materialIds != null">
             and MaterialId in (${materialIds})
         </if>
+        group by MaterialId) cc
     </select>
 
     <select id="findByTypeInIsPrev" resultType="java.lang.Double">
@@ -180,7 +181,7 @@
         or
         (SubType='礼品充值' and AnotherDepotId=${ProjectId}))
         and MaterialId = ${MId}  and dh.OperTime &gt;= '${MonthTime}-01 00:00:00'
-        and dh.OperTime &lt;= '${MonthTime}-31 59:59:59'
+        and dh.OperTime &lt;= '${MonthTime}-31 23:59:59'
     </select>
 
     <select id="findByTypeOutIsPrev" resultType="java.lang.Double">
@@ -195,7 +196,7 @@
         and DepotId= ${ProjectId}
         and MaterialId = ${MId}
         and jsh_depothead.OperTime &gt;= '${MonthTime}-01 00:00:00'
-        and jsh_depothead.OperTime &lt;= '${MonthTime}-31 59:59:59'
+        and jsh_depothead.OperTime &lt;= '${MonthTime}-31 23:59:59'
     </select>
 
 
@@ -219,7 +220,7 @@
         or
         (SubType='礼品充值' and AnotherDepotId=${ProjectId}))
         and MaterialId = ${MId}  and dh.OperTime &gt;= '${MonthTime}-01 00:00:00'
-        and dh.OperTime &lt;= '${MonthTime}-31 59:59:59'
+        and dh.OperTime &lt;= '${MonthTime}-31 23:59:59'
     </select>
 
     <select id="findPriceByTypeOutIsPrev" resultType="java.lang.Double">
@@ -234,21 +235,21 @@
         and DepotId= ${ProjectId}
         and MaterialId = ${MId}
         and jsh_depothead.OperTime &gt;= '${MonthTime}-01 00:00:00'
-        and jsh_depothead.OperTime &lt;= '${MonthTime}-31 59:59:59'
+        and jsh_depothead.OperTime &lt;= '${MonthTime}-31 23:59:59'
     </select>
 
     <select id="buyOrSaleNumber" resultType="java.lang.Double">
         select sum(BasicNumber) as BasicNumber from jsh_depotitem,jsh_depothead
         where jsh_depotitem.HeaderId = jsh_depothead.id and type='${type}' and subType='${subType}'
         and MaterialId =${MId} and jsh_depothead.OperTime &gt;= '${MonthTime}-01 00:00:00'
-        and jsh_depothead.OperTime &lt;= '${MonthTime}-31 59:59:59'
+        and jsh_depothead.OperTime &lt;= '${MonthTime}-31 23:59:59'
     </select>
 
     <select id="buyOrSalePrice" resultType="java.lang.Double">
         select sum(AllPrice) as AllPrice from jsh_depotitem,jsh_depothead
         where jsh_depotitem.HeaderId = jsh_depothead.id and type='${type}' and subType='${subType}'
         and MaterialId =${MId} and jsh_depothead.OperTime &gt;= '${MonthTime}-01 00:00:00'
-        and jsh_depothead.OperTime &lt;= '${MonthTime}-31 59:59:59'
+        and jsh_depothead.OperTime &lt;= '${MonthTime}-31 23:59:59'
     </select>
 
     <select id="findGiftByTypeIn" resultType="java.lang.Double">