From e40579e918e1d63e33c6464017ae141079c4194e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Thu, 11 Aug 2022 23:56:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=85=A5=E5=BA=93=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E6=98=8E=E7=BB=86=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/jsh/erp/controller/DepotHeadController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 fbcbea12..b895a002 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 @@ -104,7 +104,6 @@ public class DepotHeadController { @RequestParam("endTime") String endTime, @RequestParam(value = "roleType", required = false) String roleType, @RequestParam("type") String type, - @RequestParam(value = "subType",required = false) String subType, @RequestParam("remark") String remark, HttpServletRequest request)throws Exception { BaseResponseInfo res = new BaseResponseInfo(); @@ -123,6 +122,7 @@ public class DepotHeadController { } List resList = new ArrayList(); String [] creatorArray = depotHeadService.getCreatorArray(roleType); + String subType = "出库".equals(type)? "销售" : ""; String [] organArray = depotHeadService.getOrganArray(subType, ""); beginTime = Tools.parseDayToTime(beginTime, BusinessConstants.DAY_FIRST_TIME); endTime = Tools.parseDayToTime(endTime,BusinessConstants.DAY_LAST_TIME);