purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

解决单据入库数据的bug

Browse Source
This commit is contained in:
季圣华
2018-12-22 12:25:29 +08:00
parent be6a174441
commit 9750415a38
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erp_web/pages/reports/in_out_stock_report.html
View File

@@ -342,8 +342,8 @@
mpList: mPropertyList mpList: mPropertyList
}), }),
success: function (res) { success: function (res) {
if(res && res.code === 200 && res.data) { if(res && res.code === 200) {
$("#tableData").datagrid('loadData', res.data.rows); $("#tableData").datagrid('loadData', res.data);
} }
}, },
//此处添加错误处理 //此处添加错误处理

2
src/main/java/com/jsh/erp/controller/DepotItemController.java
View File

@@ -359,7 +359,7 @@ public class DepotItemController {
Long mId = Long.parseLong(tempUpdatedJson.get("MaterialId").toString()); Long mId = Long.parseLong(tempUpdatedJson.get("MaterialId").toString());
//以下进行单位换算 //以下进行单位换算
String UnitName = findUnitName(mId); //查询计量单位名称 String UnitName = findUnitName(mId); //查询计量单位名称
if (!UnitName.equals("")) { if (!StringUtil.isEmpty(UnitName)) {
String UnitList = UnitName.substring(0, UnitName.indexOf("(")); String UnitList = UnitName.substring(0, UnitName.indexOf("("));
String RatioList = UnitName.substring(UnitName.indexOf("(")); String RatioList = UnitName.substring(UnitName.indexOf("("));
String basicUnit = UnitList.substring(0, UnitList.indexOf(",")); //基本单位 String basicUnit = UnitList.substring(0, UnitList.indexOf(",")); //基本单位

15
src/main/resources/mapper_xml/DepotItemMapperEx.xml
View File

@@ -148,7 +148,7 @@
</select> </select>
<select id="findByAllCount" resultType="java.lang.Integer"> <select id="findByAllCount" resultType="java.lang.Integer">
select count(1) select count(1) from (select di.Id
from jsh_depotitem di from jsh_depotitem di
inner join jsh_material m on di.MaterialId=m.id inner join jsh_material m on di.MaterialId=m.id
where 1=1 where 1=1
@@ -158,6 +158,7 @@
<if test="materialIds != null"> <if test="materialIds != null">
and MaterialId in (${materialIds}) and MaterialId in (${materialIds})
</if> </if>
group by MaterialId) cc
</select> </select>
<select id="findByTypeInIsPrev" resultType="java.lang.Double"> <select id="findByTypeInIsPrev" resultType="java.lang.Double">
@@ -180,7 +181,7 @@
or or
(SubType='礼品充值' and AnotherDepotId=${ProjectId})) (SubType='礼品充值' and AnotherDepotId=${ProjectId}))
and MaterialId = ${MId} and dh.OperTime &gt;= '${MonthTime}-01 00:00:00' 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>
<select id="findByTypeOutIsPrev" resultType="java.lang.Double"> <select id="findByTypeOutIsPrev" resultType="java.lang.Double">
@@ -195,7 +196,7 @@
and DepotId= ${ProjectId} and DepotId= ${ProjectId}
and MaterialId = ${MId} and MaterialId = ${MId}
and jsh_depothead.OperTime &gt;= '${MonthTime}-01 00:00:00' 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>
@@ -219,7 +220,7 @@
or or
(SubType='礼品充值' and AnotherDepotId=${ProjectId})) (SubType='礼品充值' and AnotherDepotId=${ProjectId}))
and MaterialId = ${MId} and dh.OperTime &gt;= '${MonthTime}-01 00:00:00' 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>
<select id="findPriceByTypeOutIsPrev" resultType="java.lang.Double"> <select id="findPriceByTypeOutIsPrev" resultType="java.lang.Double">
@@ -234,21 +235,21 @@
and DepotId= ${ProjectId} and DepotId= ${ProjectId}
and MaterialId = ${MId} and MaterialId = ${MId}
and jsh_depothead.OperTime &gt;= '${MonthTime}-01 00:00:00' 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>
<select id="buyOrSaleNumber" resultType="java.lang.Double"> <select id="buyOrSaleNumber" resultType="java.lang.Double">
select sum(BasicNumber) as BasicNumber from jsh_depotitem,jsh_depothead select sum(BasicNumber) as BasicNumber from jsh_depotitem,jsh_depothead
where jsh_depotitem.HeaderId = jsh_depothead.id and type='${type}' and subType='${subType}' 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 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>
<select id="buyOrSalePrice" resultType="java.lang.Double"> <select id="buyOrSalePrice" resultType="java.lang.Double">
select sum(AllPrice) as AllPrice from jsh_depotitem,jsh_depothead select sum(AllPrice) as AllPrice from jsh_depotitem,jsh_depothead
where jsh_depotitem.HeaderId = jsh_depothead.id and type='${type}' and subType='${subType}' 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 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>
<select id="findGiftByTypeIn" resultType="java.lang.Double"> <select id="findGiftByTypeIn" resultType="java.lang.Double">