From 31a728bcfe8f07d918fc651ccf9c480b48af4479 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Sat, 11 May 2024 10:00:04 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=80=80=E8=B4=A7=E5=8D=95?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apiadmin/pms/PmsPurchasebackBillRest.java | 17 ---- .../PmsPurchasebackBillMapper.java | 6 -- .../PmsPurchasebackBillMapper.xml | 39 ++------ .../PmsPurchasebackBillQuery.java | 37 ++++--- .../PmsPurchasebackBillService.java | 99 ++++++++++--------- .../PmsPurchasebackBillVo.java | 32 +++--- .../pmspurchasepay/PmsPurchasePayService.java | 24 +---- 7 files changed, 109 insertions(+), 145 deletions(-) diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsPurchasebackBillRest.java b/yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsPurchasebackBillRest.java index 03ec86798b..718c1b4056 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsPurchasebackBillRest.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsPurchasebackBillRest.java @@ -94,21 +94,4 @@ public class PmsPurchasebackBillRest { PmsPurchasebackBillDetailsVo vo = pmsPurchasebackBillService.fetchDetailsVoBySid(sid); return rb.success().setData(vo); } - - @PostMapping("/exportExcel") - @ApiOperation(value = "导出") - public void exportExcel(@RequestBody PmsPurchasebackBillQuery query) { - //得到所有要导出的数据 - List exportVoList = pmsPurchasebackBillService.listExcel(query); - //定义导出的excel名字 - String excelName = "出入库查询"; - String fileNameURL = ""; - try { - fileNameURL = URLEncoder.encode(excelName, "UTF-8"); - } catch (UnsupportedEncodingException e) { - e.printStackTrace(); - } - ExportExcelUtils.export(fileNameURL, exportVoList, PmsPurchasebackBillExcelVo.class, response); - - } } diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillMapper.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillMapper.java index 6ef8aeac03..307c4f7959 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillMapper.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillMapper.java @@ -53,11 +53,5 @@ import java.util.List; public interface PmsPurchasebackBillMapper extends BaseMapper { IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - - List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - - @Select("select * from pms_purchaseback_bill") - List selectListVo(); - List listExcel(@Param(Constants.WRAPPER) QueryWrapper qw); } \ No newline at end of file diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillMapper.xml b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillMapper.xml index 4c46fbd517..25c87d5437 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillMapper.xml +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillMapper.xml @@ -6,43 +6,24 @@ - - - - \ No newline at end of file diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillQuery.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillQuery.java index de58809e6e..68342b5fbd 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillQuery.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillQuery.java @@ -51,20 +51,33 @@ import java.math.BigDecimal; @ApiModel(value = "采购退货单据 查询条件", description = "采购退货单据 查询条件") public class PmsPurchasebackBillQuery implements Query { + @ApiModelProperty("创建组织名称") + private String createOrgName; + @ApiModelProperty("申请部门名称") + private String deptName; + @ApiModelProperty("申请人") + private String createByName; + @ApiModelProperty("单据编号") + private String billNo; @ApiModelProperty("创建开始日期") private String createStartTime; @ApiModelProperty("创建结束日期") private String createEndTime; - @ApiModelProperty("门店sid") - private String createOrgSid; - @ApiModelProperty("单据状态(0未作废,1已作废)") - private String documentState; - @ApiModelProperty("票据类型key") - private String billTypeKey; - @ApiModelProperty("供应商sid") - private String supplierSid; - @ApiModelProperty("欠款状态(0欠款,1未欠款)") - private String arrearsState; - @ApiModelProperty("其他查询条件") - private String otherQuery; + @ApiModelProperty("办结开始日期") + private String finishStartTime; + @ApiModelProperty("办结结束日期") + private String finishEndTime; + @ApiModelProperty("来源单编号") + private String sourceBillNo; + @ApiModelProperty("采购类型Value（厂家采购、外采、其他）") + private String purchaseTypeValue; + @ApiModelProperty("采购原因（储备/客户订单/在修车辆）") + private String purchaseReasonValue; + @ApiModelProperty("付款方式value（预付款/月结/单笔付款）") + private String payTypeValue; + @ApiModelProperty("供应商名称") + private String supplierName; + + @ApiModelProperty("组织全路径") + private String orgPath; } diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillService.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillService.java index c0274bc344..3510eef54a 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillService.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillService.java @@ -31,6 +31,15 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.pms.biz.pms.pmspurchasebackdetail.PmsPurchasebackDetailDetailsVo; import com.yxt.pms.biz.pms.pmspurchasebackdetail.PmsPurchasebackDetailDto; import com.yxt.pms.biz.pms.pmspurchasebackdetail.PmsPurchasebackDetailService; +import com.yxt.pms.biz.pms.pmspurchasebilldetail.PmsPurchaseBillDetailService; +import com.yxt.pms.biz.pms.pmspurchasebillinvoice.PmsPurchaseBillInvoiceService; +import com.yxt.pms.biz.pms.pmspurchasepay.PmsPurchasePayService; +import com.yxt.pms.feign.flowable.flow.FlowableFeign; +import com.yxt.pms.feign.flowable.flow2.FlowFeign; +import com.yxt.pms.feign.flowable.flowtask.FlowTaskFeign; +import com.yxt.pms.feign.message.MessageFeign; +import com.yxt.pms.feign.portal.sysorganization.SysOrganizationFeign; +import com.yxt.pms.feign.portal.sysstafforg.SysStaffOrgFeign; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; @@ -61,33 +70,63 @@ public class PmsPurchasebackBillService extends MybatisBaseService listPageVo(PagerQuery pq) { PmsPurchasebackBillQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); - if (StringUtils.isNotBlank(query.getCreateOrgSid())){ - qw.eq("ppb.createOrgSid",query.getCreateOrgSid()); + String orgPath = query.getOrgPath(); + String createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); + qw.eq("ppb.createOrgSid", createOrgSid); + 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.getDocumentState())){ - qw.eq("ppb.documentState",query.getDocumentState()); + if (StringUtils.isNotBlank(query.getBillNo())) { + qw.like("ppb.billNo", query.getBillNo()); } - if (StringUtils.isNotBlank(query.getBillTypeKey())){ - qw.eq("pb.billTypeKey",query.getBillTypeKey()); + if (StringUtils.isNotBlank(query.getSourceBillNo())) { + qw.like("pb.billNo", query.getSourceBillNo()); } - if (StringUtils.isNotBlank(query.getSupplierSid())){ - qw.eq("pb.supplierSid",query.getSupplierSid()); + if (StringUtils.isNotBlank(query.getPurchaseTypeValue())) { + qw.like("pb.purchaseTypeValue", query.getPurchaseTypeValue()); } - if (StringUtils.isNotBlank(query.getArrearsState())){ - qw.eq("ppb.arrearsState",query.getArrearsState()); + if (StringUtils.isNotBlank(query.getPurchaseReasonValue())) { + qw.like("pb.purchaseReasonValue", query.getPurchaseReasonValue()); } - if (StringUtils.isNotBlank(query.getOtherQuery())){ - qw.and(wrapper -> wrapper.like("ppb.billNo", query.getOtherQuery()).or().like("pb.supplierPhone", query.getOtherQuery()).or().like("ppb.remarks",query.getOtherQuery())); + if (StringUtils.isNotBlank(query.getPayTypeValue())) { + qw.like("pb.payTypeValue", query.getPayTypeValue()); + } + if (StringUtils.isNotBlank(query.getSupplierName())) { + qw.like("pb.supplierName", query.getSupplierName()); } String createStartTime = query.getCreateStartTime(); String createEndTime = query.getCreateEndTime(); - qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (pb.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). - apply(StringUtils.isNotEmpty(createEndTime), "date_format (pb.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" + 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 page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); @@ -146,36 +185,4 @@ public class PmsPurchasebackBillService extends MybatisBaseService listExcel(PmsPurchasebackBillQuery query) { - QueryWrapper qw = new QueryWrapper<>(); - if (query != null){ - if (StringUtils.isNotBlank(query.getCreateOrgSid())){ - qw.eq("ppb.createOrgSid",query.getCreateOrgSid()); - } - if (StringUtils.isNotBlank(query.getDocumentState())){ - qw.eq("ppb.documentState",query.getDocumentState()); - } - if (StringUtils.isNotBlank(query.getBillTypeKey())){ - qw.eq("pb.billTypeKey",query.getBillTypeKey()); - } - if (StringUtils.isNotBlank(query.getSupplierSid())){ - qw.eq("pb.supplierSid",query.getSupplierSid()); - } - if (StringUtils.isNotBlank(query.getArrearsState())){ - qw.eq("ppb.arrearsState",query.getArrearsState()); - } - if (StringUtils.isNotBlank(query.getOtherQuery())){ - qw.and(wrapper -> wrapper.like("ppb.billNo", query.getOtherQuery()).or().like("pb.supplierPhone", query.getOtherQuery()).or().like("ppb.remarks",query.getOtherQuery())); - } - String createStartTime = query.getCreateStartTime(); - String createEndTime = query.getCreateEndTime(); - qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (pb.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). - apply(StringUtils.isNotEmpty(createEndTime), "date_format (pb.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" - ); - } - List list = baseMapper.listExcel(qw); - list.removeAll(Collections.singleton(null)); - return list; - } } \ No newline at end of file diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillVo.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillVo.java index 8544ee1aa0..25640b7030 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillVo.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillVo.java @@ -55,24 +55,32 @@ public class PmsPurchasebackBillVo implements Vo { private String sid; // sid + @ApiModelProperty("流程状态") + private String nodeState; @ApiModelProperty("单据编号") private String billNo; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("创建组织名称") + private String createOrgName; + @ApiModelProperty("申请部门名称") + private String deptName; + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") @ApiModelProperty("创建时间") private Date createTime; + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @ApiModelProperty("办结时间") + private Date finishTime; @ApiModelProperty("来源单编号") private String sourceBillNo; + @ApiModelProperty("采购类型Value（厂家采购、外采、其他）") + private String purchaseTypeValue; + @ApiModelProperty("采购原因（储备/客户订单/在修车辆）") + private String purchaseReasonValue; + @ApiModelProperty("付款方式value（预付款/月结/单笔付款）") + private String payTypeValue; @ApiModelProperty("供应商名称") private String supplierName; - @ApiModelProperty("供应商联系电话") - private String supplierPhone; - @ApiModelProperty("采购员姓名") - private String purchaserName; - @ApiModelProperty("库管员姓名") - private String storekeeperName; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") - @ApiModelProperty("结算时间") - private Date settleTime; - @ApiModelProperty("票据类型value(不含税、增值税、普通税、已含增值税)") - private String billTypeValue; + @ApiModelProperty("退货金额") + private String backAmountCount; + @ApiModelProperty("应收金额") + private String receivableAmount; } diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayService.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayService.java index a3726ce9ce..d4621b3ed4 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayService.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayService.java @@ -77,12 +77,7 @@ public class PmsPurchasePayService extends MybatisBaseService filePaths = dto.getFilePaths(); - String url = ""; - for (PmsPurchasePayFile pmsPurchasePayFile : filePaths) { - String filePath = pmsPurchasePayFile.getUrl().replace(fileUploadComponent.getUrlPrefix(), ""); - url = url + filePath + ","; - } - entity.setFilePath(url); - baseMapper.updateById(entity); - } - public PmsPurchasePayDetailsVo fetchDetailsVoBySid(String sid){ PmsPurchasePay entity = fetchBySid(sid); PmsPurchasePayDetailsVo vo = new PmsPurchasePayDetailsVo();