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

给销售采购统计增加机构id参数

Browse Source
This commit is contained in:
jishenghua
2024-01-04 00:22:48 +08:00
parent 198ca74efa
commit 3fd8767c92
3 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java
View File

@@ -703,11 +703,14 @@ public class DepotHeadService {
public List<DepotHeadVo4InOutMCount> findInOutMaterialCount(String beginTime, String endTime, String type,
Boolean forceFlag, Boolean inOutManageFlag, String materialParam,
List<Long> depotList, Integer oId, String column, String order,
List<Long> depotList, Long organizationId, Integer oId, String column, String order,
Integer offset, Integer rows)throws Exception {
List<DepotHeadVo4InOutMCount> list = null;
try{
String [] creatorArray = getCreatorArray();
if(creatorArray == null && organizationId != null) {
creatorArray = getCreatorArrayByOrg(organizationId);
}
String subType = "出库".equals(type)? "销售" : "";
String [] organArray = getOrganArray(subType, "");
list =depotHeadMapperEx.findInOutMaterialCount(beginTime, endTime, type, forceFlag, inOutManageFlag, materialParam, depotList, oId,
@@ -720,10 +723,13 @@ public class DepotHeadService {
public int findInOutMaterialCountTotal(String beginTime, String endTime, String type,
Boolean forceFlag, Boolean inOutManageFlag, String materialParam,
List<Long> depotList, Integer oId)throws Exception {
List<Long> depotList, Long organizationId, Integer oId)throws Exception {
int result = 0;
try{
String [] creatorArray = getCreatorArray();
if(creatorArray == null && organizationId != null) {
creatorArray = getCreatorArrayByOrg(organizationId);
}
String subType = "出库".equals(type)? "销售" : "";
String [] organArray = getOrganArray(subType, "");
result =depotHeadMapperEx.findInOutMaterialCountTotal(beginTime, endTime, type, forceFlag, inOutManageFlag, materialParam, depotList, oId,