From f89a9c006a4a8de1601d098d9b311f902360cabb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Mon, 8 Aug 2022 23:55:56 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E9=87=87=E8=B4=AD=E9=94=80=E5=94=AE?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=92=8C=E5=87=BA=E5=85=A5=E5=BA=93=E6=B1=87?= =?UTF-8?q?=E6=80=BB=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E8=A7=92=E8=89=B2=E7=B1=BB=E5=9E=8B=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erp/controller/DepotHeadController.java | 12 ++--- .../erp/controller/DepotItemController.java | 48 ++++++++++--------- .../datasource/mappers/DepotHeadMapperEx.java | 4 +- .../datasource/mappers/DepotItemMapperEx.java | 6 ++- .../service/depotHead/DepotHeadService.java | 11 +++-- .../service/depotItem/DepotItemService.java | 17 ++++--- .../mapper_xml/DepotHeadMapperEx.xml | 14 ++++++ .../mapper_xml/DepotItemMapperEx.xml | 28 +++++++++++ 8 files changed, 97 insertions(+), 43 deletions(-) diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotHeadController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotHeadController.java index 174409bb..218cb6eb 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotHeadController.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotHeadController.java @@ -51,12 +51,6 @@ public class DepotHeadController { @Resource private DepotHeadService depotHeadService; - @Resource - private AccountHeadService accountHeadService; - - @Resource - private SupplierService supplierService; - @Resource private DepotService depotService; @@ -175,6 +169,7 @@ public class DepotHeadController { @RequestParam("beginTime") String beginTime, @RequestParam("endTime") String endTime, @RequestParam("type") String type, + @RequestParam(value = "roleType", required = false) String roleType, HttpServletRequest request)throws Exception { BaseResponseInfo res = new BaseResponseInfo(); Map map = new HashMap(); @@ -193,8 +188,9 @@ public class DepotHeadController { beginTime = Tools.parseDayToTime(beginTime,BusinessConstants.DAY_FIRST_TIME); endTime = Tools.parseDayToTime(endTime,BusinessConstants.DAY_LAST_TIME); List list = depotHeadService.findInOutMaterialCount(beginTime, endTime, type, StringUtil.toNull(materialParam), - depotList, oId, (currentPage-1)*pageSize, pageSize); - int total = depotHeadService.findInOutMaterialCountTotal(beginTime, endTime, type, StringUtil.toNull(materialParam), depotList, oId); + depotList, oId, roleType, (currentPage-1)*pageSize, pageSize); + int total = depotHeadService.findInOutMaterialCountTotal(beginTime, endTime, type, StringUtil.toNull(materialParam), + depotList, oId, roleType); map.put("total", total); map.put("rows", list); res.code = 200; 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 360c3f01..5727f6bd 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 @@ -9,6 +9,7 @@ import com.jsh.erp.datasource.vo.DepotItemStockWarningCount; import com.jsh.erp.datasource.vo.DepotItemVoBatchNumberList; import com.jsh.erp.exception.BusinessRunTimeException; import com.jsh.erp.service.depot.DepotService; +import com.jsh.erp.service.depotHead.DepotHeadService; import com.jsh.erp.service.materialExtend.MaterialExtendService; import com.jsh.erp.service.depotItem.DepotItemService; import com.jsh.erp.service.material.MaterialService; @@ -42,24 +43,21 @@ import static com.jsh.erp.utils.Tools.getCenternTime; public class DepotItemController { private Logger logger = LoggerFactory.getLogger(DepotItemController.class); + @Resource + private DepotHeadService depotHeadService; + @Resource private DepotItemService depotItemService; @Resource private MaterialService materialService; - @Resource - private MaterialExtendService materialExtendService; - @Resource private UnitService unitService; @Resource private DepotService depotService; - @Resource - private RedisService redisService; - /** * 根据仓库和商品查询单据列表 * @param mId @@ -423,26 +421,29 @@ public class DepotItemController { @RequestParam("endTime") String endTime, @RequestParam("materialParam") String materialParam, @RequestParam("mpList") String mpList, + @RequestParam(value = "roleType", required = false) String roleType, HttpServletRequest request)throws Exception { BaseResponseInfo res = new BaseResponseInfo(); Map map = new HashMap(); beginTime = Tools.parseDayToTime(beginTime, BusinessConstants.DAY_FIRST_TIME); endTime = Tools.parseDayToTime(endTime,BusinessConstants.DAY_LAST_TIME); try { + String [] creatorArray = depotHeadService.getCreatorArray(roleType); List dataList = depotItemService.getListWithBugOrSale(StringUtil.toNull(materialParam), - "buy", beginTime, endTime, (currentPage-1)*pageSize, pageSize); + "buy", beginTime, endTime, creatorArray, (currentPage-1)*pageSize, pageSize); String[] mpArr = mpList.split(","); - int total = depotItemService.getListWithBugOrSaleCount(StringUtil.toNull(materialParam), "buy", beginTime, endTime); + int total = depotItemService.getListWithBugOrSaleCount(StringUtil.toNull(materialParam), + "buy", beginTime, endTime, creatorArray); map.put("total", total); //存放数据json数组 JSONArray dataArray = new JSONArray(); if (null != dataList) { for (DepotItemVo4WithInfoEx diEx : dataList) { JSONObject item = new JSONObject(); - BigDecimal InSum = depotItemService.buyOrSale("入库", "采购", diEx.getMId(), beginTime, endTime, "number"); - BigDecimal OutSum = depotItemService.buyOrSale("出库", "采购退货", diEx.getMId(), beginTime, endTime, "number"); - BigDecimal InSumPrice = depotItemService.buyOrSale("入库", "采购", diEx.getMId(), beginTime, endTime, "price"); - BigDecimal OutSumPrice = depotItemService.buyOrSale("出库", "采购退货", diEx.getMId(), beginTime, endTime, "price"); + BigDecimal InSum = depotItemService.buyOrSale("入库", "采购", diEx.getMId(), beginTime, endTime, creatorArray, "number"); + BigDecimal OutSum = depotItemService.buyOrSale("出库", "采购退货", diEx.getMId(), beginTime, endTime, creatorArray, "number"); + BigDecimal InSumPrice = depotItemService.buyOrSale("入库", "采购", diEx.getMId(), beginTime, endTime, creatorArray, "price"); + BigDecimal OutSumPrice = depotItemService.buyOrSale("出库", "采购退货", diEx.getMId(), beginTime, endTime, creatorArray, "price"); BigDecimal InOutSumPrice = InSumPrice.subtract(OutSumPrice); item.put("barCode", diEx.getBarCode()); item.put("materialName", diEx.getMName()); @@ -492,30 +493,33 @@ public class DepotItemController { @RequestParam("endTime") String endTime, @RequestParam("materialParam") String materialParam, @RequestParam("mpList") String mpList, + @RequestParam(value = "roleType", required = false) String roleType, HttpServletRequest request)throws Exception { BaseResponseInfo res = new BaseResponseInfo(); Map map = new HashMap(); beginTime = Tools.parseDayToTime(beginTime, BusinessConstants.DAY_FIRST_TIME); endTime = Tools.parseDayToTime(endTime,BusinessConstants.DAY_LAST_TIME); try { + String [] creatorArray = depotHeadService.getCreatorArray(roleType); List dataList = depotItemService.getListWithBugOrSale(StringUtil.toNull(materialParam), - "sale", beginTime, endTime,(currentPage-1)*pageSize, pageSize); + "sale", beginTime, endTime, creatorArray, (currentPage-1)*pageSize, pageSize); String[] mpArr = mpList.split(","); - int total = depotItemService.getListWithBugOrSaleCount(StringUtil.toNull(materialParam), "sale", beginTime, endTime); + int total = depotItemService.getListWithBugOrSaleCount(StringUtil.toNull(materialParam), + "sale", beginTime, endTime, creatorArray); map.put("total", total); //存放数据json数组 JSONArray dataArray = new JSONArray(); if (null != dataList) { for (DepotItemVo4WithInfoEx diEx : dataList) { JSONObject item = new JSONObject(); - BigDecimal OutSumRetail = depotItemService.buyOrSale("出库", "零售", diEx.getMId(), beginTime, endTime,"number"); - BigDecimal OutSum = depotItemService.buyOrSale("出库", "销售", diEx.getMId(), beginTime, endTime,"number"); - BigDecimal InSumRetail = depotItemService.buyOrSale("入库", "零售退货", diEx.getMId(), beginTime, endTime,"number"); - BigDecimal InSum = depotItemService.buyOrSale("入库", "销售退货", diEx.getMId(), beginTime, endTime,"number"); - BigDecimal OutSumRetailPrice = depotItemService.buyOrSale("出库", "零售", diEx.getMId(), beginTime, endTime,"price"); - BigDecimal OutSumPrice = depotItemService.buyOrSale("出库", "销售", diEx.getMId(), beginTime, endTime,"price"); - BigDecimal InSumRetailPrice = depotItemService.buyOrSale("入库", "零售退货", diEx.getMId(), beginTime, endTime,"price"); - BigDecimal InSumPrice = depotItemService.buyOrSale("入库", "销售退货", diEx.getMId(), beginTime, endTime,"price"); + BigDecimal OutSumRetail = depotItemService.buyOrSale("出库", "零售", diEx.getMId(), beginTime, endTime, creatorArray,"number"); + BigDecimal OutSum = depotItemService.buyOrSale("出库", "销售", diEx.getMId(), beginTime, endTime, creatorArray,"number"); + BigDecimal InSumRetail = depotItemService.buyOrSale("入库", "零售退货", diEx.getMId(), beginTime, endTime, creatorArray,"number"); + BigDecimal InSum = depotItemService.buyOrSale("入库", "销售退货", diEx.getMId(), beginTime, endTime, creatorArray,"number"); + BigDecimal OutSumRetailPrice = depotItemService.buyOrSale("出库", "零售", diEx.getMId(), beginTime, endTime, creatorArray,"price"); + BigDecimal OutSumPrice = depotItemService.buyOrSale("出库", "销售", diEx.getMId(), beginTime, endTime, creatorArray,"price"); + BigDecimal InSumRetailPrice = depotItemService.buyOrSale("入库", "零售退货", diEx.getMId(), beginTime, endTime, creatorArray,"price"); + BigDecimal InSumPrice = depotItemService.buyOrSale("入库", "销售退货", diEx.getMId(), beginTime, endTime, creatorArray,"price"); BigDecimal OutInSumPrice = (OutSumRetailPrice.add(OutSumPrice)).subtract(InSumRetailPrice.add(InSumPrice)); item.put("barCode", diEx.getBarCode()); item.put("materialName", diEx.getMName()); diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java index c410bda7..3e959dce 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java @@ -90,6 +90,7 @@ public interface DepotHeadMapperEx { @Param("materialParam") String materialParam, @Param("depotList") List depotList, @Param("oId") Integer oId, + @Param("creatorArray") String[] creatorArray, @Param("offset") Integer offset, @Param("rows") Integer rows); @@ -99,7 +100,8 @@ public interface DepotHeadMapperEx { @Param("type") String type, @Param("materialParam") String materialParam, @Param("depotList") List depotList, - @Param("oId") Integer oId); + @Param("oId") Integer oId, + @Param("creatorArray") String[] creatorArray); List findAllocationDetail( @Param("beginTime") String beginTime, diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapperEx.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapperEx.java index bbb13845..86c6fb22 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapperEx.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapperEx.java @@ -59,6 +59,7 @@ public interface DepotItemMapperEx { @Param("billType") String billType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, + @Param("creatorArray") String[] creatorArray, @Param("offset") Integer offset, @Param("rows") Integer rows); @@ -66,7 +67,8 @@ public interface DepotItemMapperEx { @Param("materialParam") String materialParam, @Param("billType") String billType, @Param("beginTime") String beginTime, - @Param("endTime") String endTime); + @Param("endTime") String endTime, + @Param("creatorArray") String[] creatorArray); BigDecimal buyOrSaleNumber( @Param("type") String type, @@ -74,6 +76,7 @@ public interface DepotItemMapperEx { @Param("MId") Long MId, @Param("beginTime") String beginTime, @Param("endTime") String endTime, + @Param("creatorArray") String[] creatorArray, @Param("sumType") String sumType); BigDecimal buyOrSalePrice( @@ -82,6 +85,7 @@ public interface DepotItemMapperEx { @Param("MId") Long MId, @Param("beginTime") String beginTime, @Param("endTime") String endTime, + @Param("creatorArray") String[] creatorArray, @Param("sumType") String sumType); BigDecimal inOrOutPrice( diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java index 896d997f..2c730e56 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java @@ -472,20 +472,23 @@ public class DepotHeadService { } public List findInOutMaterialCount(String beginTime, String endTime, String type, String materialParam, - List depotList, Integer oId, Integer offset, Integer rows)throws Exception { + List depotList, Integer oId, String roleType, Integer offset, Integer rows)throws Exception { List list = null; try{ - list =depotHeadMapperEx.findInOutMaterialCount(beginTime, endTime, type, materialParam, depotList, oId, offset, rows); + String [] creatorArray = getCreatorArray(roleType); + list =depotHeadMapperEx.findInOutMaterialCount(beginTime, endTime, type, materialParam, depotList, oId, creatorArray, offset, rows); }catch(Exception e){ JshException.readFail(logger, e); } return list; } - public int findInOutMaterialCountTotal(String beginTime, String endTime, String type, String materialParam, List depotList, Integer oId)throws Exception { + public int findInOutMaterialCountTotal(String beginTime, String endTime, String type, String materialParam, + List depotList, Integer oId, String roleType)throws Exception { int result = 0; try{ - result =depotHeadMapperEx.findInOutMaterialCountTotal(beginTime, endTime, type, materialParam, depotList, oId); + String [] creatorArray = getCreatorArray(roleType); + result =depotHeadMapperEx.findInOutMaterialCountTotal(beginTime, endTime, type, materialParam, depotList, oId, creatorArray); }catch(Exception e){ JshException.readFail(logger, e); } diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java index 43049ebe..174b51bb 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java @@ -305,33 +305,36 @@ public class DepotItemService { return result; } - public List getListWithBugOrSale(String materialParam, String billType, String beginTime, String endTime, Integer offset, Integer rows)throws Exception { + public List getListWithBugOrSale(String materialParam, String billType, + String beginTime, String endTime, String[] creatorArray, Integer offset, Integer rows)throws Exception { List list =null; try{ - list = depotItemMapperEx.getListWithBugOrSale(materialParam, billType, beginTime, endTime, offset, rows); + list = depotItemMapperEx.getListWithBugOrSale(materialParam, billType, beginTime, endTime, creatorArray, offset, rows); }catch(Exception e){ JshException.readFail(logger, e); } return list; } - public int getListWithBugOrSaleCount(String materialParam, String billType, String beginTime, String endTime)throws Exception { + public int getListWithBugOrSaleCount(String materialParam, String billType, + String beginTime, String endTime, String[] creatorArray)throws Exception { int result=0; try{ - result = depotItemMapperEx.getListWithBugOrSaleCount(materialParam, billType, beginTime, endTime); + result = depotItemMapperEx.getListWithBugOrSaleCount(materialParam, billType, beginTime, endTime, creatorArray); }catch(Exception e){ JshException.readFail(logger, e); } return result; } - public BigDecimal buyOrSale(String type, String subType, Long MId, String beginTime, String endTime, String sumType) throws Exception{ + public BigDecimal buyOrSale(String type, String subType, Long MId, String beginTime, String endTime, + String[] creatorArray, String sumType) throws Exception{ BigDecimal result= BigDecimal.ZERO; try{ if (SUM_TYPE.equals(sumType)) { - result= depotItemMapperEx.buyOrSaleNumber(type, subType, MId, beginTime, endTime, sumType); + result= depotItemMapperEx.buyOrSaleNumber(type, subType, MId, beginTime, endTime, creatorArray, sumType); } else { - result= depotItemMapperEx.buyOrSalePrice(type, subType, MId, beginTime, endTime, sumType); + result= depotItemMapperEx.buyOrSalePrice(type, subType, MId, beginTime, endTime, creatorArray, sumType); } }catch(Exception e){ JshException.readFail(logger, e); diff --git a/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml index 05d63fa5..27e4d256 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml @@ -331,6 +331,13 @@ and dh.organ_id = #{oId} + + and dh.creator in ( + + #{creator} + + ) + and (( @@ -374,6 +381,13 @@ and dh.organ_id = #{oId} + + and dh.creator in ( + + #{creator} + + ) + and (( diff --git a/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml index 6fb9208f..e7b48f7f 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml @@ -315,6 +315,13 @@ and dh.oper_time <= #{endTime} + + and dh.creator in ( + + #{creator} + + ) + and ifnull(m.delete_flag,'0') !='1' group by m.id order by m.id desc @@ -346,6 +353,13 @@ and dh.oper_time <= #{endTime} + + and dh.creator in ( + + #{creator} + + ) + and ifnull(di.delete_flag,'0') !='1' group by m.id) cc @@ -357,6 +371,13 @@ and di.material_id =#{MId} and dh.oper_time >= #{beginTime} and dh.oper_time <= #{endTime} + + and dh.creator in ( + + #{creator} + + ) + and ifnull(dh.delete_flag,'0') !='1' and ifnull(di.delete_flag,'0') !='1' @@ -368,6 +389,13 @@ and di.material_id =#{MId} and dh.oper_time >= #{beginTime} and dh.oper_time <= #{endTime} + + and dh.creator in ( + + #{creator} + + ) + and ifnull(dh.delete_flag,'0') !='1' and ifnull(di.delete_flag,'0') !='1'