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 7b53d96fd8..ec390ca84c 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 receivableAmount; @ApiModelProperty("申请部门sid") private String deptSid; 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 a610a0a513..01c77d3b1c 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 receivableAmount; @ApiModelProperty("申请部门sid") private String deptSid; 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 c51163afbd..486bb05477 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 receivableAmount; @ApiModelProperty("申请部门sid") private String deptSid; 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 f2375b8b3c..4b4b2c71a6 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 @@ -17,7 +17,8 @@ pb.`purchaseReasonValue`, pb.`purchaseTypeValue`, pb.supplierName, - SUM(ppbd.backAmount) AS backAmountCount + SUM(ppbd.backAmount) AS backAmountCount, + ppb.receivableAmount FROM pms_purchaseback_bill ppb LEFT JOIN pms_purchase_bill pb diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetail.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetail.java index 48ac61fc04..b757e2995c 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetail.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetail.java @@ -56,8 +56,6 @@ public class PmsPurchasebackDetail extends BaseEntity { private String createByName; // 制单人姓名 @ApiModelProperty("单据sid") private String billSid; // 单据sid - @ApiModelProperty("商品库存sid") - private String inventorySid; // 商品库存sid @ApiModelProperty("商品基础信息Sid") private String goodsSpuSid; // 商品基础信息Sid @ApiModelProperty("商品名称") @@ -70,22 +68,12 @@ public class PmsPurchasebackDetail extends BaseEntity { private String goodsSkuCode; // 商品编码（图号） @ApiModelProperty("规格") private String goodsSkuOwnSpec; // 规格 - @ApiModelProperty("退货前的库存数量") - private BigDecimal currentCount; // 退货前的库存数量 @ApiModelProperty("计量单位") private String unit; // 计量单位 @ApiModelProperty("仓库sid") private String warehouseSid; // 仓库sid @ApiModelProperty("仓库名称") private String warehouseName; // 仓库名称 - @ApiModelProperty("库区/货位sid") - private String areaSid; // 库区/货位sid - @ApiModelProperty("库区名称") - private String warehouseAreaName; // 库区名称 - @ApiModelProperty("货架sid") - private String rackSid; // 货架sid - @ApiModelProperty("货架名称") - private String warehouseRackName; // 货架名称 @ApiModelProperty("已退数量") private BigDecimal returnedCount; // 已退数量 @ApiModelProperty("退货数量") diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailDetailsVo.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailDetailsVo.java index 12b3a34616..680c18a0eb 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailDetailsVo.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailDetailsVo.java @@ -57,8 +57,6 @@ public class PmsPurchasebackDetailDetailsVo implements Vo { private String createByName; // 制单人姓名 @ApiModelProperty("单据sid") private String billSid; // 单据sid - @ApiModelProperty("商品库存sid") - private String inventorySid; // 商品库存sid @ApiModelProperty("商品基础信息Sid") private String goodsSpuSid; // 商品基础信息Sid @ApiModelProperty("商品名称") @@ -71,22 +69,12 @@ public class PmsPurchasebackDetailDetailsVo implements Vo { private String goodsSkuCode; // 商品编码（图号） @ApiModelProperty("规格") private String goodsSkuOwnSpec; // 规格 - @ApiModelProperty("退货前的库存数量") - private BigDecimal currentCount; // 退货前的库存数量 @ApiModelProperty("计量单位") private String unit; // 计量单位 @ApiModelProperty("仓库sid") private String warehouseSid; // 仓库sid @ApiModelProperty("仓库名称") private String warehouseName; // 仓库名称 - @ApiModelProperty("库区/货位sid") - private String areaSid; // 库区/货位sid - @ApiModelProperty("库区名称") - private String warehouseAreaName; // 库区名称 - @ApiModelProperty("货架sid") - private String rackSid; // 货架sid - @ApiModelProperty("货架名称") - private String warehouseRackName; // 货架名称 @ApiModelProperty("已退数量") private BigDecimal returnedCount; // 已退数量 @ApiModelProperty("退货数量") diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailDto.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailDto.java index 1a3dfce4f2..0ac12eeedc 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailDto.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailDto.java @@ -57,8 +57,6 @@ public class PmsPurchasebackDetailDto implements Dto { private String createByName; // 制单人姓名 @ApiModelProperty("单据sid") private String billSid; // 单据sid - @ApiModelProperty("商品库存sid") - private String inventorySid; // 商品库存sid @ApiModelProperty("商品基础信息Sid") private String goodsSpuSid; // 商品基础信息Sid @ApiModelProperty("商品名称") @@ -71,22 +69,12 @@ public class PmsPurchasebackDetailDto implements Dto { private String goodsSkuCode; // 商品编码（图号） @ApiModelProperty("规格") private String goodsSkuOwnSpec; // 规格 - @ApiModelProperty("退货前的库存数量") - private BigDecimal currentCount; // 退货前的库存数量 @ApiModelProperty("计量单位") private String unit; // 计量单位 @ApiModelProperty("仓库sid") private String warehouseSid; // 仓库sid @ApiModelProperty("仓库名称") private String warehouseName; // 仓库名称 - @ApiModelProperty("库区/货位sid") - private String areaSid; // 库区/货位sid - @ApiModelProperty("库区名称") - private String warehouseAreaName; // 库区名称 - @ApiModelProperty("货架sid") - private String rackSid; // 货架sid - @ApiModelProperty("货架名称") - private String warehouseRackName; // 货架名称 @ApiModelProperty("已退数量") private BigDecimal returnedCount; // 已退数量 @ApiModelProperty("退货数量") diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailMapper.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailMapper.java index 7d248f9411..fad5f2bec5 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailMapper.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailMapper.java @@ -54,11 +54,6 @@ public interface PmsPurchasebackDetailMapper extends BaseMapper selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - - @Select("select * from pms_purchaseback_detail") - List selectListVo(); - @Delete("delete from pms_purchaseback_detail where billSid = #{dtoSid}") void delByMainSid(String dtoSid); diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailMapper.xml b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailMapper.xml index 6c6a1a31b2..c53939af7f 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailMapper.xml +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailMapper.xml @@ -6,8 +6,4 @@ - - \ No newline at end of file diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailQuery.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailQuery.java index 3eb8a39182..027b5e6e5b 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailQuery.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailQuery.java @@ -51,49 +51,4 @@ import java.math.BigDecimal; @ApiModel(value = "采购退货单据明细 查询条件", description = "采购退货单据明细 查询条件") public class PmsPurchasebackDetailQuery implements Query { - @ApiModelProperty("制单人姓名") - private String createByName; // 制单人姓名 - @ApiModelProperty("单据sid") - private String billSid; // 单据sid - @ApiModelProperty("商品库存sid") - private String inventorySid; // 商品库存sid - @ApiModelProperty("商品基础信息Sid") - private String goodsSpuSid; // 商品基础信息Sid - @ApiModelProperty("商品名称") - private String goodsSpuName; // 商品名称 - @ApiModelProperty("商品Skusid") - private String goodsSkuSid; // 商品Skusid - @ApiModelProperty("商品Sku名称") - private String goodsSkuTitle; // 商品Sku名称 - @ApiModelProperty("商品编码（图号）") - private String goodsSkuCode; // 商品编码（图号） - @ApiModelProperty("规格") - private String goodsSkuOwnSpec; // 规格 - @ApiModelProperty("退货前的库存数量") - private BigDecimal currentCount; // 退货前的库存数量 - @ApiModelProperty("计量单位") - private String unit; // 计量单位 - @ApiModelProperty("仓库sid") - private String warehouseSid; // 仓库sid - @ApiModelProperty("仓库名称") - private String warehouseName; // 仓库名称 - @ApiModelProperty("库区/货位sid") - private String areaSid; // 库区/货位sid - @ApiModelProperty("库区名称") - private String warehouseAreaName; // 库区名称 - @ApiModelProperty("货架sid") - private String rackSid; // 货架sid - @ApiModelProperty("货架名称") - private String warehouseRackName; // 货架名称 - @ApiModelProperty("已退数量") - private BigDecimal returnedCount; // 已退数量 - @ApiModelProperty("退货数量") - private BigDecimal backCount; // 退货数量 - @ApiModelProperty("税额") - private BigDecimal maxAmount; // 税额 - @ApiModelProperty("含税价") - private BigDecimal maxPrice; // 含税价 - @ApiModelProperty("退货金额") - private BigDecimal backAmount; // 退货金额 - } diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailVo.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailVo.java index 87a8cb89f6..2c1ecf4750 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailVo.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailVo.java @@ -51,51 +51,4 @@ import java.math.BigDecimal; @ApiModel(value = "采购退货单据明细 视图数据对象", description = "采购退货单据明细 视图数据对象") public class PmsPurchasebackDetailVo implements Vo { - private String sid; // sid - - @ApiModelProperty("制单人姓名") - private String createByName; // 制单人姓名 - @ApiModelProperty("单据sid") - private String billSid; // 单据sid - @ApiModelProperty("商品库存sid") - private String inventorySid; // 商品库存sid - @ApiModelProperty("商品基础信息Sid") - private String goodsSpuSid; // 商品基础信息Sid - @ApiModelProperty("商品名称") - private String goodsSpuName; // 商品名称 - @ApiModelProperty("商品Skusid") - private String goodsSkuSid; // 商品Skusid - @ApiModelProperty("商品Sku名称") - private String goodsSkuTitle; // 商品Sku名称 - @ApiModelProperty("商品编码（图号）") - private String goodsSkuCode; // 商品编码（图号） - @ApiModelProperty("规格") - private String goodsSkuOwnSpec; // 规格 - @ApiModelProperty("退货前的库存数量") - private BigDecimal currentCount; // 退货前的库存数量 - @ApiModelProperty("计量单位") - private String unit; // 计量单位 - @ApiModelProperty("仓库sid") - private String warehouseSid; // 仓库sid - @ApiModelProperty("仓库名称") - private String warehouseName; // 仓库名称 - @ApiModelProperty("库区/货位sid") - private String areaSid; // 库区/货位sid - @ApiModelProperty("库区名称") - private String warehouseAreaName; // 库区名称 - @ApiModelProperty("货架sid") - private String rackSid; // 货架sid - @ApiModelProperty("货架名称") - private String warehouseRackName; // 货架名称 - @ApiModelProperty("已退数量") - private BigDecimal returnedCount; // 已退数量 - @ApiModelProperty("退货数量") - private BigDecimal backCount; // 退货数量 - @ApiModelProperty("税额") - private BigDecimal maxAmount; // 税额 - @ApiModelProperty("含税价") - private BigDecimal maxPrice; // 含税价 - @ApiModelProperty("退货金额") - private BigDecimal backAmount; // 退货金额 - }