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 4ab95aa53e..911719f650 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 @@ -81,9 +81,7 @@ public class PmsPurchasebackBillRest { @ApiOperation("新增或修改") @PostMapping("/save") public ResultBean save(@RequestBody PmsPurchasebackBillDto dto){ - ResultBean rb = ResultBean.fireFail(); - String sid = pmsPurchasebackBillService.saveOrUpdateDto(dto); - return rb.success().setData(sid); + return pmsPurchasebackBillService.saveOrUpdateDto(dto); } @ApiOperation("根据sid批量删除") diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBill.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBill.java index ec390ca84c..4d066a2475 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBill.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBill.java @@ -77,8 +77,10 @@ public class PmsPurchasebackBill extends BaseEntity { @ApiModelProperty("单据状态") private String documentState; - @ApiModelProperty("应付金额") + @ApiModelProperty("已付金额") private BigDecimal paidAmount; + @ApiModelProperty("应付金额") + private BigDecimal payableAmount; @ApiModelProperty("应收金额") private BigDecimal receivableAmount; diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillDetailsVo.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillDetailsVo.java index 01c77d3b1c..b55534eda3 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillDetailsVo.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillDetailsVo.java @@ -81,8 +81,10 @@ public class PmsPurchasebackBillDetailsVo implements Vo { @ApiModelProperty("转入预付款") private BigDecimal toPrepayment; // 转入预付款 - @ApiModelProperty("应付金额") + @ApiModelProperty("已付金额") private BigDecimal paidAmount; + @ApiModelProperty("应付金额") + private BigDecimal payableAmount; @ApiModelProperty("应收金额") private BigDecimal receivableAmount; diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillDto.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillDto.java index 486bb05477..7c9250a1ec 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillDto.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillDto.java @@ -80,8 +80,10 @@ public class PmsPurchasebackBillDto implements Dto { @ApiModelProperty("转入预付款") private BigDecimal toPrepayment; // 转入预付款 - @ApiModelProperty("应付金额") + @ApiModelProperty("已付金额") private BigDecimal paidAmount; + @ApiModelProperty("应付金额") + private BigDecimal payableAmount; @ApiModelProperty("应收金额") private BigDecimal receivableAmount; 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 75c4fa6f45..0abf2e3370 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 @@ -34,6 +34,7 @@ import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; +import java.math.BigDecimal; import java.util.List; import java.util.Map; @@ -58,4 +59,8 @@ public interface PmsPurchasebackBillMapper extends BaseMapper map); + + int checkNodeStateBySourceBillSid(String sourceBillSid); + + BigDecimal checkPayableAmountBySourceBillSid(String sourceBillSid); } \ 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 4b4b2c71a6..74258b514b 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 @@ -53,4 +53,21 @@ WHERE sid=#{sid} + + + + \ No newline at end of file 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 f768b4296b..58dc8bd283 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 @@ -29,6 +29,8 @@ import cn.hutool.core.bean.BeanUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.api.R; +import com.sun.org.apache.regexp.internal.RE; import com.yxt.common.core.result.ResultBean; import com.yxt.pms.biz.pms.pmspurchasebackbill.flowable.*; import com.yxt.pms.biz.pms.pmspurchasebackdetail.PmsPurchasebackDetailDetailsVo; @@ -60,6 +62,7 @@ import com.yxt.common.core.vo.PagerVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.math.BigDecimal; import java.util.*; import java.util.stream.Collectors; @@ -144,8 +147,13 @@ public class PmsPurchasebackBillService extends MybatisBaseService saveOrUpdateDto(PmsPurchasebackBillDto dto){ + ResultBean rb = ResultBean.fireFail(); String dtoSid = dto.getSid(); + int i = baseMapper.checkNodeStateBySourceBillSid(dto.getSourceBillSid()); + if (i > 0){ + return rb.setMsg(dto.getSourceBillNo() + "存在待提交或审批中的申请"); + } List pmsPurchasebackDetailList = dto.getPmsPurchasebackDetailList(); if (StringUtils.isBlank(dtoSid)) { String sid = this.insertByDto(dto); @@ -153,7 +161,7 @@ public class PmsPurchasebackBillService extends MybatisBaseService pmsPurchasebackDetailDetailsVos = pmsPurchasebackDetailService.selByMainSid(sid); + for (PmsPurchasebackDetailDetailsVo pmsPurchasebackDetailDetailsVo : pmsPurchasebackDetailDetailsVos) { + pmsPurchasebackDetailDetailsVo.setAmount(pmsPurchasebackDetailDetailsVo.getCount().multiply(pmsPurchasebackDetailDetailsVo.getTaxPrice())); + } vo.setPmsPurchasebackDetailList(pmsPurchasebackDetailDetailsVos); return vo; } @@ -208,7 +219,7 @@ public class PmsPurchasebackBillService extends MybatisBaseService { + @Autowired + private PmsPurchasebackBillService pmsPurchasebackBillService; @Autowired private PmsPurchaseBillDetailService pmsPurchaseBillDetailService; @Autowired @@ -202,6 +202,14 @@ public class PmsPurchaseBillService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.choiceBillListPage(page, qw); + for (PmsPurchaseChoiceBillVo record : pagging.getRecords()) { + BigDecimal money = pmsPurchasebackBillService.checkPayableAmountBySourceBillSid(record.getSid()); + if (money != null){ + record.setPayableAmount(money); + } + List pmsPurchaseBillDetailDetailsVos = pmsPurchaseBillDetailService.selByMainSid(record.getSid()); + record.setPmsPurchaseBillDetailList(pmsPurchaseBillDetailDetailsVos); + } PagerVo p = PagerUtil.pageToVo(pagging, null); return p; } diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillExcelVo.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseChoiceBillQuery.java similarity index 53% rename from yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillExcelVo.java rename to yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseChoiceBillQuery.java index ea0e2d9d19..41940a2ddf 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillExcelVo.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseChoiceBillQuery.java @@ -23,53 +23,57 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.pms.biz.pms.pmspurchasebackbill; +package com.yxt.pms.biz.pms.pmspurchasebill; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.yxt.common.core.utils.ExportEntityMap; -import com.yxt.common.core.vo.Vo; +import com.yxt.common.core.query.Query; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * Project: yxt-pms(采购)
- * File: PmsPurchasebackBillVo.java
- * Class: com.yxt.pms.api.pmspurchasebackbill.PmsPurchasebackBillVo
- * Description: 采购退货单据 视图数据对象.
+ * File: PmsPurchaseBillQuery.java
+ * Class: com.yxt.pms.api.pmspurchasebill.PmsPurchaseBillQuery
+ * Description: 采购单 查询条件.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-19 16:16:12
+ * Makedate: 2024-03-19 13:51:45
* * @author liupopo * @version 1.0 * @since 1.0 */ @Data -@ApiModel(value = "采购退货单据 视图数据对象", description = "采购退货单据 视图数据对象") -public class PmsPurchasebackBillExcelVo implements Vo { +@ApiModel(value = "采购单原单 查询条件", description = "采购单 查询条件") +public class PmsPurchaseChoiceBillQuery implements Query { - @ExportEntityMap(CnName = "单据编号", EnName = "billNo") + @ApiModelProperty("创建组织名称") + private String createOrgName; + @ApiModelProperty("申请部门名称") + private String deptName; + @ApiModelProperty("申请人") + private String createByName; + @ApiModelProperty("单据编号") private String billNo; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") - @ExportEntityMap(CnName = "创建时间", EnName = "createTime") - private Date createTime; - @ExportEntityMap(CnName = "来源单编号", EnName = "sourceBillNo") - private String sourceBillNo; - @ExportEntityMap(CnName = "供应商名称", EnName = "supplierName") + @ApiModelProperty("创建开始日期") + private String createStartTime; + @ApiModelProperty("创建结束日期") + private String createEndTime; + @ApiModelProperty("办结开始日期") + private String finishStartTime; + @ApiModelProperty("办结结束日期") + private String finishEndTime; + @ApiModelProperty("采购类型Value（厂家采购、外采、其他）") + private String purchaseTypeValue; + @ApiModelProperty("采购原因（储备/客户订单/在修车辆）") + private String purchaseReasonValue; + @ApiModelProperty("付款方式value（预付款/月结/单笔付款）") + private String payTypeValue; + @ApiModelProperty("供应商名称") private String supplierName; - @ExportEntityMap(CnName = "供应商联系电话", EnName = "supplierPhone") - private String supplierPhone; - @ExportEntityMap(CnName = "采购员姓名", EnName = "purchaserName") - private String purchaserName; - @ExportEntityMap(CnName = "库管员姓名", EnName = "storekeeperName") - private String storekeeperName; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") - @ExportEntityMap(CnName = "结算时间", EnName = "settleTime") - private Date settleTime; - @ExportEntityMap(CnName = "票据类型", EnName = "billTypeValue") - private String billTypeValue; + @ApiModelProperty("是否需要开发票（是1，否0）") + private String isInvoicing; + + private String createOrgSid; } diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseChoiceBillVo.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseChoiceBillVo.java index 421d08a85c..5eda614bf8 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseChoiceBillVo.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseChoiceBillVo.java @@ -28,12 +28,14 @@ package com.yxt.pms.biz.pms.pmspurchasebill; import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.vo.Vo; +import com.yxt.pms.biz.pms.pmspurchasebilldetail.PmsPurchaseBillDetailDetailsVo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; import java.util.Date; +import java.util.List; /** * Project: yxt-pms(采购)
@@ -88,4 +90,7 @@ public class PmsPurchaseChoiceBillVo implements Vo { private BigDecimal errorAmount; @ApiModelProperty("应付金额（=采购金额+运费-优惠金额）") private BigDecimal payableAmount; + + @ApiModelProperty("采购单商品明细") + private List pmsPurchaseBillDetailList; }