|
|
|
@ -213,67 +213,6 @@ public class PmsPurchaseBillService extends MybatisBaseService<PmsPurchaseBillMa |
|
|
|
return p; |
|
|
|
} |
|
|
|
|
|
|
|
public PagerVo<PmsPurchaseChoiceBillVo> choiceBillListPage(PagerQuery<PmsPurchaseChoiceBillQuery> pq) { |
|
|
|
PmsPurchaseChoiceBillQuery query = pq.getParams(); |
|
|
|
QueryWrapper<PmsPurchaseBill> qw = new QueryWrapper<>(); |
|
|
|
qw.eq("ppb.createOrgSid", query.getCreateOrgSid()); |
|
|
|
qw.eq("ppb.nodeState", "已办结"); |
|
|
|
if (StringUtils.isNotBlank(query.getCreateOrgName())) { |
|
|
|
qw.like("ppb.createOrgName", query.getCreateOrgName()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getDeptName())) { |
|
|
|
qw.like("ppb.deptName", query.getDeptName()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getCreateByName())) { |
|
|
|
qw.like("ppb.createByName", query.getCreateByName()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getBillNo())) { |
|
|
|
qw.like("ppb.billNo", query.getBillNo()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getPurchaseTypeValue())) { |
|
|
|
qw.like("ppb.purchaseTypeValue", query.getPurchaseTypeValue()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getPurchaseReasonValue())) { |
|
|
|
qw.like("ppb.purchaseReasonValue", query.getPurchaseReasonValue()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getPayTypeValue())) { |
|
|
|
qw.like("ppb.payTypeValue", query.getPayTypeValue()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getSupplierName())) { |
|
|
|
qw.like("ppb.supplierName", query.getSupplierName()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getIsInvoicing())) { |
|
|
|
qw.eq("ppbi.isInvoicing", query.getIsInvoicing()); |
|
|
|
} |
|
|
|
String createStartTime = query.getCreateStartTime(); |
|
|
|
String createEndTime = query.getCreateEndTime(); |
|
|
|
qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (ppb.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). |
|
|
|
apply(StringUtils.isNotEmpty(createEndTime), "date_format (ppb.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" |
|
|
|
); |
|
|
|
String finishStartTime = query.getFinishStartTime(); |
|
|
|
String finishEndTime = query.getFinishEndTime(); |
|
|
|
qw.apply(StringUtils.isNotEmpty(finishStartTime), "date_format (ppb.finishTime,'%Y-%m-%d') >= date_format('" + finishStartTime + "','%Y-%m-%d')"). |
|
|
|
apply(StringUtils.isNotEmpty(finishEndTime), "date_format (ppb.finishTime,'%Y-%m-%d') <= date_format('" + finishEndTime + "','%Y-%m-%d')" |
|
|
|
); |
|
|
|
qw.groupBy("ppb.sid"); |
|
|
|
IPage<PmsPurchaseBill> page = PagerUtil.queryToPage(pq); |
|
|
|
IPage<PmsPurchaseChoiceBillVo> pagging = baseMapper.choiceBillListPage(page, qw); |
|
|
|
for (PmsPurchaseChoiceBillVo record : pagging.getRecords()) { |
|
|
|
BigDecimal money = pmsPurchasebackBillService.checkPayableAmountBySourceBillSid(record.getSid()); |
|
|
|
if (money != null) { |
|
|
|
record.setPayableAmount(money); |
|
|
|
} |
|
|
|
List<PmsPurchaseBillDetailDetailsVo> pmsPurchaseBillDetailDetailsVos = pmsPurchaseBillDetailService.selByMainSid(record.getSid()); |
|
|
|
for (PmsPurchaseBillDetailDetailsVo pmsPurchaseBillDetailDetailsVo : pmsPurchaseBillDetailDetailsVos) { |
|
|
|
BigDecimal returnedCount = pmsPurchasebackDetailService.checkReturnedCount(pmsPurchaseBillDetailDetailsVo.getGoodsSkuSid(), record.getSid()); |
|
|
|
pmsPurchaseBillDetailDetailsVo.setReturnedCount(returnedCount); |
|
|
|
} |
|
|
|
record.setPmsPurchaseBillDetailList(pmsPurchaseBillDetailDetailsVos); |
|
|
|
} |
|
|
|
PagerVo<PmsPurchaseChoiceBillVo> p = PagerUtil.pageToVo(pagging, null); |
|
|
|
return p; |
|
|
|
} |
|
|
|
|
|
|
|
public String saveOrUpdateDto(PmsPurchaseBillDto dto) { |
|
|
|
String dtoSid = dto.getSid(); |
|
|
|
PmsPurchasePayDto purchasePay = dto.getPurchasePay(); |
|
|
|
|
God
10 months ago