From be1398a8d8b15d8602ca213e6ef36006770db4a3 Mon Sep 17 00:00:00 2001 From: jishenghua <752718920@qq.com> Date: Fri, 1 Mar 2024 10:34:37 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=9B=B6=E5=94=AE=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E7=9A=84=E6=9F=A5=E8=AF=A2bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jsh/erp/controller/DepotItemController.java | 4 ++-- .../src/main/resources/mapper_xml/DepotItemMapperEx.xml | 5 ++++- 2 files changed, 6 insertions(+), 3 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 b52558c4..a1205ec1 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 @@ -582,10 +582,10 @@ public class DepotItemController { List depotList = depotService.parseDepotList(depotId); Boolean forceFlag = systemConfigService.getForceApprovalFlag(); List 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(","); 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); //存放数据json数组 JSONArray dataArray = new JSONArray(); diff --git a/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml index 31dc1ae9..60c2c186 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml @@ -412,7 +412,10 @@ and (dh.sub_type = '采购' or dh.sub_type = '采购退货') - and (dh.sub_type = '销售' or dh.sub_type = '销售退货' or dh.sub_type = '零售' or dh.sub_type = '零售退货') + and (dh.sub_type = '销售' or dh.sub_type = '销售退货') + + + and (dh.sub_type = '零售' or dh.sub_type = '零售退货') and dh.oper_time >= #{beginTime}