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

解决零售统计的查询bug

Browse Source
This commit is contained in:
jishenghua
2024-03-01 10:34:37 +08:00
parent 153f193a39
commit be1398a8d8
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java
View File

@@ -582,10 +582,10 @@ public class DepotItemController {
List<Long> depotList = depotService.parseDepotList(depotId); List<Long> depotList = depotService.parseDepotList(depotId);
Boolean forceFlag = systemConfigService.getForceApprovalFlag(); Boolean forceFlag = systemConfigService.getForceApprovalFlag();
List<DepotItemVo4WithInfoEx> dataList = depotItemService.getListWithBugOrSale(StringUtil.toNull(materialParam), List<DepotItemVo4WithInfoEx> dataList = depotItemService.getListWithBugOrSale(StringUtil.toNull(materialParam),
"sale", beginTime, endTime, creatorArray, organId, organArray, depotList, forceFlag, (currentPage-1)*pageSize, pageSize); "retail", beginTime, endTime, creatorArray, organId, organArray, depotList, forceFlag, (currentPage-1)*pageSize, pageSize);
String[] mpArr = mpList.split(","); String[] mpArr = mpList.split(",");
int total = depotItemService.getListWithBugOrSaleCount(StringUtil.toNull(materialParam), int total = depotItemService.getListWithBugOrSaleCount(StringUtil.toNull(materialParam),
"sale", beginTime, endTime, creatorArray, organId, organArray, depotList, forceFlag); "retail", beginTime, endTime, creatorArray, organId, organArray, depotList, forceFlag);
map.put("total", total); map.put("total", total);
//存放数据json数组 //存放数据json数组
JSONArray dataArray = new JSONArray(); JSONArray dataArray = new JSONArray();

5
jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml
View File

@@ -412,7 +412,10 @@
and (dh.sub_type = '采购' or dh.sub_type = '采购退货') and (dh.sub_type = '采购' or dh.sub_type = '采购退货')
</if> </if>
<if test="billType =='sale'"> <if test="billType =='sale'">
and (dh.sub_type = '销售' or dh.sub_type = '销售退货' or dh.sub_type = '零售' or dh.sub_type = '零售退货') and (dh.sub_type = '销售' or dh.sub_type = '销售退货')
</if>
<if test="billType =='retail'">
and (dh.sub_type = '零售' or dh.sub_type = '零售退货')
</if> </if>
<if test="beginTime != null"> <if test="beginTime != null">
and dh.oper_time >= #{beginTime} and dh.oper_time >= #{beginTime}