增加根据原单号查询关联的单据列表接口
This commit is contained in:
@@ -373,6 +373,30 @@ public class DepotHeadController {
|
|||||||
return res;
|
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
|
* @param body
|
||||||
|
|||||||
@@ -47,6 +47,10 @@ public class DepotHeadVo4List extends DepotHead{
|
|||||||
* 是否有付款单或收款单
|
* 是否有付款单或收款单
|
||||||
*/
|
*/
|
||||||
private Boolean hasFinancialFlag;
|
private Boolean hasFinancialFlag;
|
||||||
|
/**
|
||||||
|
* 是否有退款单
|
||||||
|
*/
|
||||||
|
private Boolean hasBackFlag;
|
||||||
|
|
||||||
public String getProjectName() {
|
public String getProjectName() {
|
||||||
return projectName;
|
return projectName;
|
||||||
@@ -199,4 +203,12 @@ public class DepotHeadVo4List extends DepotHead{
|
|||||||
public void setHasFinancialFlag(Boolean hasFinancialFlag) {
|
public void setHasFinancialFlag(Boolean hasFinancialFlag) {
|
||||||
this.hasFinancialFlag = hasFinancialFlag;
|
this.hasFinancialFlag = hasFinancialFlag;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public Boolean getHasBackFlag() {
|
||||||
|
return hasBackFlag;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setHasBackFlag(Boolean hasBackFlag) {
|
||||||
|
this.hasBackFlag = hasBackFlag;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -156,6 +156,9 @@ public class DepotHeadService {
|
|||||||
//是否有付款单或收款单
|
//是否有付款单或收款单
|
||||||
int financialBillNoSize = accountHeadService.getFinancialBillNoByBillId(dh.getId()).size();
|
int financialBillNoSize = accountHeadService.getFinancialBillNoByBillId(dh.getId()).size();
|
||||||
dh.setHasFinancialFlag(financialBillNoSize>0);
|
dh.setHasFinancialFlag(financialBillNoSize>0);
|
||||||
|
//是否有退款单
|
||||||
|
int billListSize = getBillListByLinkNumber(dh.getNumber()).size();
|
||||||
|
dh.setHasBackFlag(billListSize>0);
|
||||||
if(StringUtil.isNotEmpty(dh.getSalesMan())) {
|
if(StringUtil.isNotEmpty(dh.getSalesMan())) {
|
||||||
dh.setSalesManStr(personService.getPersonByMapAndIds(personMap,dh.getSalesMan()));
|
dh.setSalesManStr(personService.getPersonByMapAndIds(personMap,dh.getSalesMan()));
|
||||||
}
|
}
|
||||||
@@ -730,6 +733,12 @@ public class DepotHeadService {
|
|||||||
if(dh.getTotalPrice() != null) {
|
if(dh.getTotalPrice() != null) {
|
||||||
dh.setTotalPrice(dh.getTotalPrice().abs());
|
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())) {
|
if(StringUtil.isNotEmpty(dh.getSalesMan())) {
|
||||||
dh.setSalesManStr(personService.getPersonByMapAndIds(personMap,dh.getSalesMan()));
|
dh.setSalesManStr(personService.getPersonByMapAndIds(personMap,dh.getSalesMan()));
|
||||||
}
|
}
|
||||||
@@ -759,6 +768,18 @@ public class DepotHeadService {
|
|||||||
return depotHeadMapper.selectByExample(example);
|
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
|
* @param beanJson
|
||||||
|
|||||||
Reference in New Issue
Block a user