diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyMapper.xml index df9a68aa33..a5e2eeb423 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyMapper.xml +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyMapper.xml @@ -13,7 +13,10 @@ UPDATE as_arrearsout_apply - SET nodeState=#{nodeState}, nodeId=#{taskDefKey}, finishTime = NOW() + SET nodeState=#{nodeState}, nodeId=#{taskDefKey} + + , finishTime = NOW() + , procDefId=#{procDefId} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandleapply/AsOldparthandleApplyMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandleapply/AsOldparthandleApplyMapper.xml index d69d2fa8ef..af2c13f1ca 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandleapply/AsOldparthandleApplyMapper.xml +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandleapply/AsOldparthandleApplyMapper.xml @@ -20,7 +20,10 @@ UPDATE as_oldparthandle_apply - SET nodeState=#{nodeState}, nodeId=#{taskDefKey}, finishTime = NOW() + SET nodeState=#{nodeState}, nodeId=#{taskDefKey} + + , finishTime = NOW() + , procDefId=#{procDefId} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyMapper.xml index ea5620af6f..9a51d57d37 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyMapper.xml +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyMapper.xml @@ -31,7 +31,10 @@ UPDATE as_oldpartreturn_apply - SET nodeState=#{nodeState}, nodeId=#{taskDefKey}, finishTime = NOW() + SET nodeState=#{nodeState}, nodeId=#{taskDefKey} + + , finishTime = NOW() + , procDefId=#{procDefId} diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillDetailsVo.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillDetailsVo.java index f19ffddef5..8ee4273a2e 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillDetailsVo.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillDetailsVo.java @@ -110,7 +110,7 @@ public class PmsPurchaseBillDetailsVo implements Vo { private String purchaserName; @ApiModelProperty("预计到货日期") @JsonFormat( - pattern = "yyyy-MM-dd", + pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8" ) private Date deliveryDate; @@ -140,7 +140,7 @@ public class PmsPurchaseBillDetailsVo implements Vo { private String nodeState; // 流程状态 @ApiModelProperty("任务id") private String taskId; // 任务id - @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") @ApiModelProperty("办结时间") private Date finishTime; // 办结时间 diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillMapper.xml b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillMapper.xml index 726cc4792c..a21b7bf3ad 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillMapper.xml +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillMapper.xml @@ -18,7 +18,9 @@ ppb.`supplierName`, IF(ppbi.`isInvoicing` = 1, '是','否') AS isInvoicing, SUM(ppbd.`amount`) AS amountCount, - ppb.`payableAmount` + ppb.`payableAmount`, + ppb.procDefId, + ppb.procInstId FROM pms_purchase_bill ppb LEFT JOIN pms_purchase_bill_invoice ppbi @@ -38,7 +40,10 @@ UPDATE pms_purchase_bill - SET nodeState=#{nodeState}, nodeId=#{taskDefKey}, finishTime = NOW() + SET nodeState=#{nodeState}, nodeId=#{taskDefKey} + + , finishTime = NOW() + , procDefId=#{procDefId} diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillService.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillService.java index 8b4f3719e3..5dd040573b 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillService.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillService.java @@ -26,6 +26,7 @@ package com.yxt.pms.biz.pms.pmspurchasebill; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillVo.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillVo.java index 565849118d..7ba4483063 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillVo.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillVo.java @@ -83,4 +83,8 @@ public class PmsPurchaseBillVo implements Vo { private BigDecimal amountCount; @ApiModelProperty("应付金额（=采购金额+运费-优惠金额）") private BigDecimal payableAmount; + @ApiModelProperty("流程定义的id") + private String procDefId; + @ApiModelProperty("流程实例的sid") + private String procInstId; } diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailService.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailService.java index 7c2cbbfadc..1b94961a16 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailService.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailService.java @@ -54,95 +54,80 @@ import java.util.List; @Service public class PmsPurchaseBillDetailService extends MybatisBaseService { - public PagerVo listPageVo(PagerQuery pq) { - PmsPurchaseBillDetailQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPageVo(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; - } - - public void saveOrUpdateDto(PmsPurchaseBillDetailDto dto){ - String dtoSid = dto.getSid(); - if (StringUtils.isBlank(dtoSid)) { - this.insertByDto(dto); - return; - } - this.updateByDto(dto); - } - - public void insertByDto(PmsPurchaseBillDetailDto dto){ - PmsPurchaseBillDetail entity = new PmsPurchaseBillDetail(); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.insert(entity); - } - - public void updateByDto(PmsPurchaseBillDetailDto dto){ - String dtoSid = dto.getSid(); - if (StringUtils.isBlank(dtoSid)) { - return; - } - PmsPurchaseBillDetail entity = fetchBySid(dtoSid); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.updateById(entity); - } - - public PmsPurchaseBillDetailDetailsVo fetchDetailsVoBySid(String sid){ - PmsPurchaseBillDetail entity = fetchBySid(sid); - PmsPurchaseBillDetailDetailsVo vo = new PmsPurchaseBillDetailDetailsVo(); - BeanUtil.copyProperties(entity, vo); - return vo; - } + public PagerVo listPageVo(PagerQuery pq) { + PmsPurchaseBillDetailQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } - public void delByMainSid(String dtoSid) { - baseMapper.delByMainSid(dtoSid); - } + public void saveOrUpdateDto(PmsPurchaseBillDetailDto dto) { + this.insertByDto(dto); + } - public List selByMainSid(String billSid) { - return baseMapper.selByMainSid(billSid); - } + public void insertByDto(PmsPurchaseBillDetailDto dto) { + PmsPurchaseBillDetail entity = new PmsPurchaseBillDetail(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } - public PagerVo purDetailReForm(PagerQuery pq) { - PmsPurchaseBillDetailReportQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); - if (StringUtils.isNotBlank(query.getWarehouseName())){ - qw.like("pdd.warehouseName",query.getWarehouseName()); - } - if (StringUtils.isNotBlank(query.getGoodsSkuCode())){ - qw.like("pdd.goodsSkuCode",query.getGoodsSkuCode()); - } - if (StringUtils.isNotBlank(query.getGoodsSkuOwnSpec())){ - qw.like("pdd.goodsSkuOwnSpec",query.getGoodsSkuOwnSpec()); - } - if (StringUtils.isNotBlank(query.getGoodsSpuName())){ - qw.like("pdd.goodsSpuName",query.getGoodsSpuName()); - } - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.purDetailReForm(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; - } + public PmsPurchaseBillDetailDetailsVo fetchDetailsVoBySid(String sid) { + PmsPurchaseBillDetail entity = fetchBySid(sid); + PmsPurchaseBillDetailDetailsVo vo = new PmsPurchaseBillDetailDetailsVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } - public PagerVo purSumReForm(PagerQuery pq) { - PmsPurchaseBillDetailReportQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); - if (StringUtils.isNotBlank(query.getWarehouseName())){ - qw.like("pdd.warehouseName",query.getWarehouseName()); - } - if (StringUtils.isNotBlank(query.getGoodsSkuCode())){ - qw.like("pdd.goodsSkuCode",query.getGoodsSkuCode()); - } - if (StringUtils.isNotBlank(query.getGoodsSkuOwnSpec())){ - qw.like("pdd.goodsSkuOwnSpec",query.getGoodsSkuOwnSpec()); - } - if (StringUtils.isNotBlank(query.getGoodsSpuName())){ - qw.like("pdd.goodsSpuName",query.getGoodsSpuName()); - } - qw.groupBy("pdd.goodsSkuCode"); - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.purSumReForm(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; - } + public void delByMainSid(String dtoSid) { + baseMapper.delByMainSid(dtoSid); + } + + public List selByMainSid(String billSid) { + return baseMapper.selByMainSid(billSid); + } + + public PagerVo purDetailReForm(PagerQuery pq) { + PmsPurchaseBillDetailReportQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(query.getWarehouseName())) { + qw.like("pdd.warehouseName", query.getWarehouseName()); + } + if (StringUtils.isNotBlank(query.getGoodsSkuCode())) { + qw.like("pdd.goodsSkuCode", query.getGoodsSkuCode()); + } + if (StringUtils.isNotBlank(query.getGoodsSkuOwnSpec())) { + qw.like("pdd.goodsSkuOwnSpec", query.getGoodsSkuOwnSpec()); + } + if (StringUtils.isNotBlank(query.getGoodsSpuName())) { + qw.like("pdd.goodsSpuName", query.getGoodsSpuName()); + } + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.purDetailReForm(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public PagerVo purSumReForm(PagerQuery pq) { + PmsPurchaseBillDetailReportQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(query.getWarehouseName())) { + qw.like("pdd.warehouseName", query.getWarehouseName()); + } + if (StringUtils.isNotBlank(query.getGoodsSkuCode())) { + qw.like("pdd.goodsSkuCode", query.getGoodsSkuCode()); + } + if (StringUtils.isNotBlank(query.getGoodsSkuOwnSpec())) { + qw.like("pdd.goodsSkuOwnSpec", query.getGoodsSkuOwnSpec()); + } + if (StringUtils.isNotBlank(query.getGoodsSpuName())) { + qw.like("pdd.goodsSpuName", query.getGoodsSpuName()); + } + qw.groupBy("pdd.goodsSkuCode"); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.purSumReForm(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } } \ No newline at end of file diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoiceService.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoiceService.java index fa77f5e0c2..e02b1ec6a5 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoiceService.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoiceService.java @@ -52,6 +52,7 @@ import org.springframework.stereotype.Service; */ @Service public class PmsPurchaseBillInvoiceService extends MybatisBaseService { + private QueryWrapper createQueryWrapper(PmsPurchaseBillInvoiceQuery query) { // todo: 这里根据具体业务调整查询条件 // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); @@ -69,12 +70,7 @@ public class PmsPurchaseBillInvoiceService extends MybatisBaseService