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

优化单据明细接口

Browse Source
This commit is contained in:
季圣华
2021-05-05 22:35:20 +08:00
parent 854bbeae1b
commit 9fb970fd7c
1 changed files with 38 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -468,12 +468,15 @@ public class DepotHeadService {
List<DepotHeadVo4List> resList = new ArrayList<DepotHeadVo4List>(); List<DepotHeadVo4List> resList = new ArrayList<DepotHeadVo4List>();
List<DepotHeadVo4List> list = null; List<DepotHeadVo4List> list = null;
try{ try{
Map<Long,String> personMap = personService.getPersonMap();
Map<Long,String> accountMap = accountService.getAccountMap();
list = depotHeadMapperEx.getDetailByNumber(number); list = depotHeadMapperEx.getDetailByNumber(number);
}catch(Exception e){
JshException.readFail(logger, e);
}
if (null != list) { if (null != list) {
for (DepotHeadVo4List dh : list) { for (DepotHeadVo4List dh : list) {
if(accountMap!=null && StringUtil.isNotEmpty(dh.getAccountIdList()) && StringUtil.isNotEmpty(dh.getAccountMoneyList())) {
String accountStr = accountService.getAccountStrByIdAndMoney(accountMap, dh.getAccountIdList(), dh.getAccountMoneyList());
dh.setAccountName(accountStr);
}
if(dh.getAccountIdList() != null) { if(dh.getAccountIdList() != null) {
String accountidlistStr = dh.getAccountIdList().replace("[", "").replace("]", "").replaceAll("\"", ""); String accountidlistStr = dh.getAccountIdList().replace("[", "").replace("]", "").replaceAll("\"", "");
dh.setAccountIdList(accountidlistStr); dh.setAccountIdList(accountidlistStr);
@@ -496,11 +499,17 @@ public class DepotHeadService {
if(dh.getTotalPrice() != null) { if(dh.getTotalPrice() != null) {
dh.setTotalPrice(dh.getTotalPrice().abs()); dh.setTotalPrice(dh.getTotalPrice().abs());
} }
if(StringUtil.isNotEmpty(dh.getSalesMan())) {
dh.setSalesManStr(personService.getPersonByMapAndIds(personMap,dh.getSalesMan()));
}
dh.setOperTimeStr(getCenternTime(dh.getOperTime())); dh.setOperTimeStr(getCenternTime(dh.getOperTime()));
dh.setMaterialsList(findMaterialsListByHeaderId(dh.getId())); dh.setMaterialsList(findMaterialsListByHeaderId(dh.getId()));
resList.add(dh); resList.add(dh);
} }
} }
}catch(Exception e){
JshException.readFail(logger, e);
}
return resList; return resList;
} }