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-17 22:47:11 +08:00
parent c62c613902
commit 88985562aa
3 changed files with 57 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
jshERP-boot/src/main/java/com/jsh/erp/controller/DepotHeadController.java
View File

@@ -373,6 +373,30 @@ public class DepotHeadController {
return res;
}
/**
* 根据原单号查询关联的单据列表
* @param number
* @param request
* @return
*/
@GetMapping(value = "/getBillListByLinkNumber")
@ApiOperation(value = "根据原单号查询关联的单据列表")
public BaseResponseInfo getBillListByLinkNumber(@RequestParam("number") String number,
HttpServletRequest request)throws Exception {
BaseResponseInfo res = new BaseResponseInfo();
DepotHead dh = new DepotHead();
try {
List<DepotHead> list = depotHeadService.getBillListByLinkNumber(number);
res.code = 200;
res.data = list;
} catch(Exception e){
e.printStackTrace();
res.code = 500;
res.data = "获取数据失败";
}
return res;
}
/**
* 新增单据主表及单据子表信息
* @param body

12
jshERP-boot/src/main/java/com/jsh/erp/datasource/vo/DepotHeadVo4List.java
View File

@@ -47,6 +47,10 @@ public class DepotHeadVo4List extends DepotHead{
* 是否有付款单或收款单
*/
private Boolean hasFinancialFlag;
/**
* 是否有退款单
*/
private Boolean hasBackFlag;
public String getProjectName() {
return projectName;
@@ -199,4 +203,12 @@ public class DepotHeadVo4List extends DepotHead{
public void setHasFinancialFlag(Boolean hasFinancialFlag) {
this.hasFinancialFlag = hasFinancialFlag;
}
public Boolean getHasBackFlag() {
return hasBackFlag;
}
public void setHasBackFlag(Boolean hasBackFlag) {
this.hasBackFlag = hasBackFlag;
}
}

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

@@ -156,6 +156,9 @@ public class DepotHeadService {
//是否有付款单或收款单
int financialBillNoSize = accountHeadService.getFinancialBillNoByBillId(dh.getId()).size();
dh.setHasFinancialFlag(financialBillNoSize>0);
//是否有退款单
int billListSize = getBillListByLinkNumber(dh.getNumber()).size();
dh.setHasBackFlag(billListSize>0);
if(StringUtil.isNotEmpty(dh.getSalesMan())) {
dh.setSalesManStr(personService.getPersonByMapAndIds(personMap,dh.getSalesMan()));
}
@@ -730,6 +733,12 @@ public class DepotHeadService {
if(dh.getTotalPrice() != null) {
dh.setTotalPrice(dh.getTotalPrice().abs());
}
//是否有付款单或收款单
int financialBillNoSize = accountHeadService.getFinancialBillNoByBillId(dh.getId()).size();
dh.setHasFinancialFlag(financialBillNoSize>0);
//是否有退款单
int billListSize = getBillListByLinkNumber(dh.getNumber()).size();
dh.setHasBackFlag(billListSize>0);
if(StringUtil.isNotEmpty(dh.getSalesMan())) {
dh.setSalesManStr(personService.getPersonByMapAndIds(personMap,dh.getSalesMan()));
}
@@ -759,6 +768,18 @@ public class DepotHeadService {
return depotHeadMapper.selectByExample(example);
}
/**
* 根据原单号查询关联的单据列表
* @param linkNumber
* @return
* @throws Exception
*/
public List<DepotHead> getBillListByLinkNumber(String linkNumber)throws Exception {
DepotHeadExample example = new DepotHeadExample();
example.createCriteria().andLinkNumberEqualTo(linkNumber).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
return depotHeadMapper.selectByExample(example);
}
/**
* 新增单据主表及单据子表信息
* @param beanJson