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

给订单去除仓库

Browse Source
This commit is contained in:
季圣华
2021-09-23 22:44:13 +08:00
parent a7ac4581fd
commit cbfdb3b875
3 changed files with 41 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -105,8 +105,7 @@ public class DepotHeadService {
List<DepotHeadVo4List> resList = new ArrayList<>();
List<DepotHeadVo4List> list=new ArrayList<>();
try{
String depotIds = depotService.findDepotStrByCurrentUser();
String [] depotArray=StringUtil.isNotEmpty(depotIds)?depotIds.split(","):null;
String [] depotArray = getDepotArray(subType);
String [] creatorArray = getCreatorArray(roleType);
Map<Long,String> personMap = personService.getPersonMap();
Map<Long,String> accountMap = accountService.getAccountMap();
@@ -154,8 +153,7 @@ public class DepotHeadService {
String materialParam, Long organId, Long creator, Long depotId) throws Exception{
Long result=null;
try{
String depotIds = depotService.findDepotStrByCurrentUser();
String [] depotArray=StringUtil.isNotEmpty(depotIds)?depotIds.split(","):null;
String [] depotArray = getDepotArray(subType);
String [] creatorArray = getCreatorArray(roleType);
beginTime = Tools.parseDayToTime(beginTime,BusinessConstants.DAY_FIRST_TIME);
endTime = Tools.parseDayToTime(endTime,BusinessConstants.DAY_LAST_TIME);
@@ -167,6 +165,21 @@ public class DepotHeadService {
return result;
}
/**
* 根据单据类型获取仓库数组
* @param subType
* @return
* @throws Exception
*/
public String[] getDepotArray(String subType) throws Exception {
String [] depotArray = null;
if(!BusinessConstants.SUB_TYPE_PURCHASE_ORDER.equals(subType) && !BusinessConstants.SUB_TYPE_SALES_ORDER.equals(subType)) {
String depotIds = depotService.findDepotStrByCurrentUser();
depotArray = StringUtil.isNotEmpty(depotIds) ? depotIds.split(",") : null;
}
return depotArray;
}
/**
* 根据角色类型获取操作员数组
* @param roleType