|
|
@ -262,9 +262,14 @@ public class VoucherServiceImpl extends ServiceImpl<VoucherMapper, VoucherEntity
|
|
|
|
voucherQueryWrapper.like("a.voucher_code",value);
|
|
|
|
voucherQueryWrapper.like("a.voucher_code",value);
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if(ObjectUtil.isNotEmpty(voucherPagination.getContractNo())){
|
|
|
|
if(ObjectUtil.isNotEmpty(voucherPagination.getPurchaseContractNo())){
|
|
|
|
voucherNum++;
|
|
|
|
voucherNum++;
|
|
|
|
voucherQueryWrapper.like("a.contract_no",voucherPagination.getContractNo());
|
|
|
|
voucherQueryWrapper.like("a.purchase_contract_no",voucherPagination.getPurchaseContractNo());
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
if(ObjectUtil.isNotEmpty(voucherPagination.getSaleContractNo())){
|
|
|
|
|
|
|
|
voucherNum++;
|
|
|
|
|
|
|
|
voucherQueryWrapper.like("a.sale_contract_no",voucherPagination.getSaleContractNo());
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if(ObjectUtil.isNotEmpty(voucherPagination.getProductName())){
|
|
|
|
if(ObjectUtil.isNotEmpty(voucherPagination.getProductName())){
|
|
|
@ -725,7 +730,7 @@ public class VoucherServiceImpl extends ServiceImpl<VoucherMapper, VoucherEntity
|
|
|
|
queryWrapper.eq("a.delivery_type","2");
|
|
|
|
queryWrapper.eq("a.delivery_type","2");
|
|
|
|
queryWrapper.eq("a.voucher_status","4");
|
|
|
|
queryWrapper.eq("a.voucher_status","4");
|
|
|
|
if (StringUtils.isNotEmpty(voucherPagination.getKeyword())) {
|
|
|
|
if (StringUtils.isNotEmpty(voucherPagination.getKeyword())) {
|
|
|
|
queryWrapper.and(wrapper -> wrapper.like("a.contract_no", voucherPagination.getKeyword())
|
|
|
|
queryWrapper.and(wrapper -> wrapper.like("a.purchase_contract_no", voucherPagination.getKeyword())
|
|
|
|
.or().like("f.name", voucherPagination.getKeyword())
|
|
|
|
.or().like("f.name", voucherPagination.getKeyword())
|
|
|
|
.or().like("a.voucher_code",voucherPagination.getKeyword()));
|
|
|
|
.or().like("a.voucher_code",voucherPagination.getKeyword()));
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -952,10 +957,10 @@ public class VoucherServiceImpl extends ServiceImpl<VoucherMapper, VoucherEntity
|
|
|
|
voucherEntity.setDeliveryType(StringUtil.equals(model.getDeliveryType(), "仓配") ? "1" : "2");//配送方式
|
|
|
|
voucherEntity.setDeliveryType(StringUtil.equals(model.getDeliveryType(), "仓配") ? "1" : "2");//配送方式
|
|
|
|
voucherEntity.setVoucherStatus(StringUtil.equals(model.getDeliveryType(), "仓配") ? "3" : "4");//凭证状态
|
|
|
|
voucherEntity.setVoucherStatus(StringUtil.equals(model.getDeliveryType(), "仓配") ? "3" : "4");//凭证状态
|
|
|
|
voucherEntity.setAssociateThirdSuppliers("");//关联三级供应商
|
|
|
|
voucherEntity.setAssociateThirdSuppliers("");//关联三级供应商
|
|
|
|
voucherEntity.setContractNo(model.getContractNo());//合同编号
|
|
|
|
voucherEntity.setPurchaseContractNo(model.getContractNo());//合同编号
|
|
|
|
//根据合同编号取查合同
|
|
|
|
//根据合同编号取查合同
|
|
|
|
QueryWrapper<ContractLEntity> contractLQueryWrapper=new QueryWrapper<>();
|
|
|
|
QueryWrapper<ContractLEntity> contractLQueryWrapper=new QueryWrapper<>();
|
|
|
|
contractLQueryWrapper.lambda().eq(ContractLEntity::getContractNumber, voucherEntity.getContractNo());
|
|
|
|
contractLQueryWrapper.lambda().eq(ContractLEntity::getContractNumber, voucherEntity.getPurchaseContractNo());
|
|
|
|
List<ContractLEntity> contractLEntityList = contractLService.list(contractLQueryWrapper);
|
|
|
|
List<ContractLEntity> contractLEntityList = contractLService.list(contractLQueryWrapper);
|
|
|
|
if(contractLEntityList != null && contractLEntityList.size() > 0){
|
|
|
|
if(contractLEntityList != null && contractLEntityList.size() > 0){
|
|
|
|
voucherEntity.setModeTransport(contractLEntityList.get(0).getModeTransport());//运输方式
|
|
|
|
voucherEntity.setModeTransport(contractLEntityList.get(0).getModeTransport());//运输方式
|
|
|
|