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

给收付款单增加销售采购单号的接口查询

Browse Source
This commit is contained in:
季圣华
2022-11-21 00:26:07 +08:00
parent 2bdfc18c9d
commit c0a3a6a0ec
5 changed files with 55 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
jshERP-boot/src/main/java/com/jsh/erp/service/accountHead/AccountHeadComponent.java
View File

@@ -42,8 +42,9 @@ public class AccountHeadComponent implements ICommonQuery {
Long accountId = StringUtil.parseStrLong(StringUtil.getInfo(search, "accountId"));
String status = StringUtil.getInfo(search, "status");
String remark = StringUtil.getInfo(search, "remark");
String number = StringUtil.getInfo(search, "number");
return accountHeadService.select(type, roleType, billNo, beginTime, endTime, organId, creator, handsPersonId,
accountId, status, remark, QueryUtils.offset(map), QueryUtils.rows(map));
accountId, status, remark, number, QueryUtils.offset(map), QueryUtils.rows(map));
}
@Override
@@ -60,8 +61,9 @@ public class AccountHeadComponent implements ICommonQuery {
Long accountId = StringUtil.parseStrLong(StringUtil.getInfo(search, "accountId"));
String status = StringUtil.getInfo(search, "status");
String remark = StringUtil.getInfo(search, "remark");
String number = StringUtil.getInfo(search, "number");
return accountHeadService.countAccountHead(type, roleType, billNo, beginTime, endTime, organId, creator, handsPersonId,
accountId, status, remark);
accountId, status, remark, number);
}
@Override

13
jshERP-boot/src/main/java/com/jsh/erp/service/accountHead/AccountHeadService.java
View File

@@ -10,6 +10,7 @@ import com.jsh.erp.datasource.mappers.AccountItemMapperEx;
import com.jsh.erp.exception.BusinessRunTimeException;
import com.jsh.erp.exception.JshException;
import com.jsh.erp.service.accountItem.AccountItemService;
import com.jsh.erp.service.depotHead.DepotHeadService;
import com.jsh.erp.service.log.LogService;
import com.jsh.erp.service.orgaUserRel.OrgaUserRelService;
import com.jsh.erp.service.supplier.SupplierService;
@@ -44,6 +45,8 @@ public class AccountHeadService {
@Resource
private AccountItemService accountItemService;
@Resource
private DepotHeadService depotHeadService;
@Resource
private UserService userService;
@Resource
private SupplierService supplierService;
@@ -88,14 +91,15 @@ public class AccountHeadService {
public List<AccountHeadVo4ListEx> select(String type, String roleType, String billNo, String beginTime, String endTime,
Long organId, Long creator, Long handsPersonId, Long accountId, String status,
String remark, int offset, int rows) throws Exception{
String remark, String number, int offset, int rows) throws Exception{
List<AccountHeadVo4ListEx> resList = new ArrayList<>();
try{
String [] creatorArray = getCreatorArray(roleType);
beginTime = Tools.parseDayToTime(beginTime,BusinessConstants.DAY_FIRST_TIME);
endTime = Tools.parseDayToTime(endTime,BusinessConstants.DAY_LAST_TIME);
List<Long> ahIdList = accountItemService.getAhIdListByBillNumber(number);
List<AccountHeadVo4ListEx> list = accountHeadMapperEx.selectByConditionAccountHead(type, creatorArray, billNo,
beginTime, endTime, organId, creator, handsPersonId, accountId, status, remark, offset, rows);
beginTime, endTime, organId, creator, handsPersonId, accountId, status, remark, ahIdList, offset, rows);
if (null != list) {
for (AccountHeadVo4ListEx ah : list) {
if(ah.getChangeAmount() != null) {
@@ -118,14 +122,15 @@ public class AccountHeadService {
public Long countAccountHead(String type, String roleType, String billNo, String beginTime, String endTime,
Long organId, Long creator, Long handsPersonId, Long accountId, String status,
String remark) throws Exception{
String remark, String number) throws Exception{
Long result=null;
try{
String [] creatorArray = getCreatorArray(roleType);
beginTime = Tools.parseDayToTime(beginTime,BusinessConstants.DAY_FIRST_TIME);
endTime = Tools.parseDayToTime(endTime,BusinessConstants.DAY_LAST_TIME);
List<Long> ahIdList = accountItemService.getAhIdListByBillNumber(number);
result = accountHeadMapperEx.countsByAccountHead(type, creatorArray, billNo,
beginTime, endTime, organId, creator, handsPersonId, accountId, status, remark);
beginTime, endTime, organId, creator, handsPersonId, accountId, status, remark, ahIdList);
}catch(Exception e){
JshException.readFail(logger, e);
}