From fdbb0bf343f463d3fd5a37a3a3b9daab86e5f718 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Fri, 30 Aug 2024 18:23:30 +0800 Subject: [PATCH] 1 --- .../AppPurchasebackBillDetailsVo.java | 66 ++-------- .../AppPurchasebackDetailDetailsVo.java | 77 +++-------- .../AppPurchaseBillDetailDetailsVo.java | 56 ++------ .../AppPurchaseBillDetailsVo.java | 120 ++++-------------- .../AppPurchaseBillInvoiceDetailsVo.java | 26 +--- .../purchasebill/AppPurchasePayDetailsVo.java | 36 +++--- .../anrui/terminal/TerminalApplication.java | 2 +- .../AppPurchaseBackBillService.java | 1 + .../purchasebill/AppPurchaseBillService.java | 7 +- 9 files changed, 96 insertions(+), 295 deletions(-) diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/pms/pmspurchasebackbill/AppPurchasebackBillDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/pms/pmspurchasebackbill/AppPurchasebackBillDetailsVo.java index 63460e868d..0343d6a1db 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/pms/pmspurchasebackbill/AppPurchasebackBillDetailsVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/pms/pmspurchasebackbill/AppPurchasebackBillDetailsVo.java @@ -53,8 +53,11 @@ import java.util.List; @ApiModel(value = "采购退货单据 视图数据详情", description = "采购退货单据 视图数据详情") public class AppPurchasebackBillDetailsVo implements Vo { - private String sid; // sid - + private String sid; + @ApiModelProperty("申请部门名称") + private String deptName; + @ApiModelProperty("制单人姓名") + private String createByName; @ApiModelProperty("申请日期") @JsonFormat( pattern = "yyyy-MM-dd", @@ -63,61 +66,14 @@ public class AppPurchasebackBillDetailsVo implements Vo { private Date createTime; @ApiModelProperty("备注") private String remarks; - @ApiModelProperty("制单人sid") - private String createBySid; - @ApiModelProperty("制单人姓名") - private String createByName; // 制单人姓名 - @ApiModelProperty("单据编号") - private String billNo; // 单据编号 - @ApiModelProperty("退误差调整金额") - private BigDecimal backErrorAmount; // 退误差调整金额 - - @ApiModelProperty("退运费") - private BigDecimal backFreight; - - @ApiModelProperty("退优惠金额") - private BigDecimal backDiscountAmount; // 退优惠金额 - @ApiModelProperty("抵扣欠款") - private BigDecimal deductDebts; // 抵扣欠款 - @ApiModelProperty("抵扣单号") - private String deductBillNo; // 抵扣单号 - @ApiModelProperty("转入预付款") - private BigDecimal toPrepayment; // 转入预付款 - - @ApiModelProperty("已付金额") - private BigDecimal paidAmount; - @ApiModelProperty("应付金额") - private BigDecimal payableAmount; - @ApiModelProperty("应收金额") - private BigDecimal receivableAmount; - - @ApiModelProperty("申请部门sid") - private String deptSid; - @ApiModelProperty("申请部门名称") - private String deptName; - @ApiModelProperty("流程定义的id") - private String procDefId; // 流程定义的id - @ApiModelProperty("环节定义的sid") - private String nodeId; // 环节定义的sid @ApiModelProperty("流程实例的sid") - private String procInstId; // 流程实例的sid - @ApiModelProperty("流程状态") - private String nodeState; // 流程状态 + private String procInsId; @ApiModelProperty("任务id") - private String taskId; // 任务id - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") - @ApiModelProperty("办结时间") - private Date finishTime; // 办结时间 - - @ApiModelProperty("使用组织sid") - private String useOrgSid; - @ApiModelProperty("使用组织名称") - private String useOrgName; - @ApiModelProperty("创建组织sid") - private String createOrgSid; - @ApiModelProperty("创建组织名称") - private String createOrgName; - + private String taskId; + @ApiModelProperty("价格信息") + private String priceInfo; + @ApiModelProperty("商品信息") + private String goodsInfo; @ApiModelProperty("采购退货单明细") private List pmsPurchasebackDetailList; } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/pms/pmspurchasebackbill/AppPurchasebackDetailDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/pms/pmspurchasebackbill/AppPurchasebackDetailDetailsVo.java index 2e77896699..1a484146b6 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/pms/pmspurchasebackbill/AppPurchasebackDetailDetailsVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/pms/pmspurchasebackbill/AppPurchasebackDetailDetailsVo.java @@ -50,69 +50,28 @@ import java.math.BigDecimal; @ApiModel(value = "采购退货单据明细 视图数据详情", description = "采购退货单据明细 视图数据详情") public class AppPurchasebackDetailDetailsVo implements Vo { - private String sid; // sid - - @ApiModelProperty("制单人姓名") - private String createByName; // 制单人姓名 - @ApiModelProperty("单据sid") - private String billSid; // 单据sid + @ApiModelProperty("商品名称") + private String goodsSpuName; @ApiModelProperty("商品ID") private String goodsID; - @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 String unit; // 计量单位 - @ApiModelProperty("仓库sid") - private String warehouseSid; // 仓库sid - @ApiModelProperty("仓库名称") - private String warehouseName; // 仓库名称 - - @ApiModelProperty("库区sid") - private String warehouseAreaSid; - @ApiModelProperty("库区名称") - private String warehouseArea; - @ApiModelProperty("库位sid") - private String warehouseRackSid; - @ApiModelProperty("库位编码") - private String warehouseRackCode; - @ApiModelProperty("采购订单sid") - private String manufactorBillSid; - @ApiModelProperty("厂家订单号") - private String manufactorBillNo; - @ApiModelProperty("供应商sid") - private String supplierSid; - @ApiModelProperty("供应商名称") - private String supplierName; - @ApiModelProperty("厂家sid") - private String manufacturerSid; - @ApiModelProperty("厂家名称") - private String manufacturerName; - - @ApiModelProperty("已退数量") - private BigDecimal returnedCount; // 已退数量 - @ApiModelProperty("退货数量") - private BigDecimal backCount; // 退货数量 - + @ApiModelProperty("商品编码（图号）") + private String goodsSkuCode; @ApiModelProperty("采购数量") private BigDecimal count; + @ApiModelProperty("规格") + private String goodsSkuOwnSpec; + @ApiModelProperty("计量单位") + private String unit; + @ApiModelProperty("采购单价") + private BigDecimal cost; @ApiModelProperty("采购金额") private BigDecimal amount; - @ApiModelProperty("税额") - private BigDecimal taxAmount; - @ApiModelProperty("含税价") - private BigDecimal taxPrice; - - @ApiModelProperty("退货金额") - private BigDecimal backAmount; // 退货金额 - + @ApiModelProperty("已退数量") + private BigDecimal returnedCount; + @ApiModelProperty("退货金额") + private BigDecimal backAmount; + @ApiModelProperty("厂家订单号") + private BigDecimal manufacturersOrderNumber; + @ApiModelProperty("仓库-库区-库位") + private BigDecimal locationName; } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/pms/purchasebill/AppPurchaseBillDetailDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/pms/purchasebill/AppPurchaseBillDetailDetailsVo.java index 218ccd9301..d8bed17296 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/pms/purchasebill/AppPurchaseBillDetailDetailsVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/pms/purchasebill/AppPurchaseBillDetailDetailsVo.java @@ -50,48 +50,20 @@ import java.math.BigDecimal; @ApiModel(value = "采购单据明细 视图数据详情", description = "采购单据明细 视图数据详情") public class AppPurchaseBillDetailDetailsVo implements Vo { - private String sid; // sid - - @ApiModelProperty("备注") - private String remarks; - @ApiModelProperty("单据sid") - private String billSid; // 单据sid - @ApiModelProperty("商品基础信息Sid") - private String goodSpuSid; // 商品基础信息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 String goodsSpuName; + @ApiModelProperty("商品编码（图号）") + private String goodsSkuCode; + @ApiModelProperty("采购数量") + private BigDecimal count; + @ApiModelProperty("规格型号") + private String goodsSkuOwnSpec; @ApiModelProperty("单位") private String unit; - - @ApiModelProperty("仓库sid") - private String warehouseSid; // 仓库sid - @ApiModelProperty("仓库名称") - private String warehouseName; // 仓库名称 - @ApiModelProperty("单位成本（进货价）") - private BigDecimal cost; // 单位成本（进货价） - @ApiModelProperty("采购数量") - private BigDecimal count; // 采购数量 - @ApiModelProperty("税额") - private BigDecimal taxAmount; // 税额 - @ApiModelProperty("含税价") - private BigDecimal taxPrice; // 含税价 - @ApiModelProperty("采购金额") - private BigDecimal amount; // 采购金额 - - @ApiModelProperty("厂家sid") - private String manufacturerSid; - @ApiModelProperty("厂家名称") - private String manufacturerName; - - @ApiModelProperty("已退数量") - private BigDecimal returnedCount; + @ApiModelProperty("含税价") + private BigDecimal taxPrice; + @ApiModelProperty("采购金额") + private BigDecimal amount; + @ApiModelProperty("备注") + private String remarks; } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/pms/purchasebill/AppPurchaseBillDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/pms/purchasebill/AppPurchaseBillDetailsVo.java index 4a9211d3fa..5a59631c26 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/pms/purchasebill/AppPurchaseBillDetailsVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/pms/purchasebill/AppPurchaseBillDetailsVo.java @@ -40,122 +40,54 @@ import java.util.List; public class AppPurchaseBillDetailsVo implements Vo { private String sid; - - @ApiModelProperty("备注") - private String remarks; + @ApiModelProperty("申请部门名称") + private String deptName; + @ApiModelProperty("制单人姓名") + private String createByName; @ApiModelProperty("申请日期") @JsonFormat( pattern = "yyyy-MM-dd", timezone = "GMT+8" ) private Date createTime; - @ApiModelProperty("制单人sid") - private String createBySid; - @ApiModelProperty("制单人姓名") - private String createByName; - @ApiModelProperty("来源单sid（工单sid）") - private String sourceBillSid; - @ApiModelProperty("来源单编号/外部编号") - private String sourceBillNo; - @ApiModelProperty("单据编号") - private String billNo; - - @ApiModelProperty("经营品牌Key") - private String operateBrandKey; - @ApiModelProperty("经营品牌Value") - private String operateBrandValue; - @ApiModelProperty("仓库类型Key") - private String warehouseTypeKey; - @ApiModelProperty("仓库类型Value") - private String warehouseTypeValue; - - @ApiModelProperty("采购类型Key") - private String purchaseTypeKey; - @ApiModelProperty("采购类型Value（厂家采购、外采、其他）") - private String purchaseTypeValue; - - @ApiModelProperty("采购原因key") - private String purchaseReasonKey; @ApiModelProperty("采购原因（储备/客户订单/在修车辆）") private String purchaseReasonValue; - @ApiModelProperty("付款方式key") - private String payTypeKey; + @ApiModelProperty("采购类型Value（厂家采购、外采、其他）") + private String purchaseTypeValue; + @ApiModelProperty("经营品牌Value") + private String operateBrandValue; @ApiModelProperty("付款方式value（预付款/月结/单笔付款）") private String payTypeValue; - - @ApiModelProperty("厂家订单类型key") - private String manufacturersOrderTypeKey; - @ApiModelProperty("厂家订单类型value") - private String manufacturersOrderTypeValue; - @ApiModelProperty("厂家订单号") - private String manufacturersOrderNumber; - - @ApiModelProperty("误差调整金额") - private BigDecimal errorAmount; - - @ApiModelProperty("供应商sid") - private String supplierSid; - @ApiModelProperty("供应商名称") + @ApiModelProperty("供应商名称") private String supplierName; - @ApiModelProperty("供应商联系电话") - private String supplierPhone; - @ApiModelProperty("采购员sid（单选）") - private String purchaserSid; - @ApiModelProperty("采购员姓名") - private String purchaserName; - @ApiModelProperty("预计到货日期") - @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") - private Date deliveryDate; - @ApiModelProperty("运费") - private BigDecimal freight; - @ApiModelProperty("优惠金额") - private BigDecimal discountAmount; - @ApiModelProperty("应付金额（=采购金额+运费-优惠金额）") - private BigDecimal payableAmount; - + @ApiModelProperty("仓库类型Value") + private String warehouseTypeValue; @ApiModelProperty("当前预付款项金额") private BigDecimal prepaymentAmount; @ApiModelProperty("累计欠款金额") private BigDecimal owedAmount; - - @ApiModelProperty("申请部门sid") - private String deptSid; - @ApiModelProperty("申请部门名称") - private String deptName; - @ApiModelProperty("流程定义的id") - private String procDefId; // 流程定义的id - @ApiModelProperty("环节定义的sid") - private String nodeId; // 环节定义的sid + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("预计到货日期") + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + private Date deliveryDate; @ApiModelProperty("流程实例的sid") - private String procInstId; // 流程实例的sid - @ApiModelProperty("流程状态") - private String nodeState; // 流程状态 + private String procInsId; @ApiModelProperty("任务id") - private String taskId; // 任务id - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") - @ApiModelProperty("办结时间") - private Date finishTime; // 办结时间 - - @ApiModelProperty("使用组织sid") - private String useOrgSid; - @ApiModelProperty("使用组织名称") - private String useOrgName; - @ApiModelProperty("创建组织sid") - private String createOrgSid; - @ApiModelProperty("创建组织名称") - private String createOrgName; - @ApiModelProperty("组织全路径") - private String orgPath; + private String taskId; - @ApiModelProperty("采购人") - private String purchasingAgent; - @ApiModelProperty("采购人sid") - private String purchasingAgentSid; + private Boolean showApply = false; + @ApiModelProperty("厂家订单类型value") + private String manufacturersOrderTypeValue; + @ApiModelProperty("厂家订单号") + private String manufacturersOrderNumber; + @ApiModelProperty("采购员姓名") + private String purchaserName; @ApiModelProperty("付款信息") private AppPurchasePayDetailsVo purchasePay; @ApiModelProperty("发票信息") private AppPurchaseBillInvoiceDetailsVo purchaseBillInvoice; @ApiModelProperty("采购单商品明细") - private List purchaseBillDetailList; + private List pmsPurchaseBillDetailList; } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/pms/purchasebill/AppPurchaseBillInvoiceDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/pms/purchasebill/AppPurchaseBillInvoiceDetailsVo.java index cd5a66a7b3..31ee269f69 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/pms/purchasebill/AppPurchaseBillInvoiceDetailsVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/pms/purchasebill/AppPurchaseBillInvoiceDetailsVo.java @@ -38,30 +38,10 @@ import java.util.Date; @ApiModel(value = "采购单-发票 视图数据详情", description = "采购单-发票 视图数据详情") public class AppPurchaseBillInvoiceDetailsVo implements Vo { - private String sid; // sid - - @ApiModelProperty("制单人姓名") - private String createByName; // 制单人姓名 - @ApiModelProperty("单据sid") - private String billSid; // 单据sid @ApiModelProperty("是否需要开发票（是1，否0）") private String isInvoicing; // 是否需要开发票（是1，否0） - @ApiModelProperty("票据类型key") - private String billTypeKey; // 票据类型key + @ApiModelProperty("是否需要开发票（是1，否0）") + private String isInvoicing2; @ApiModelProperty("票据类型(不含税、增值税、普通税、已含增值税)") - private String billType; // 票据类型(不含税、增值税、普通税、已含增值税) - @ApiModelProperty("开票名称") - private String invoicingName; // 开票名称 - @ApiModelProperty("税号") - private String taxpayerNo; // 税号 - @ApiModelProperty("发票代码") - private String invoiceCode; // 发票代码 - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") - @ApiModelProperty("开票日期") - private Date invoiceDate; // 开票日期 - @ApiModelProperty("发票金额") - private BigDecimal invoiceAmount; // 发票金额 - @ApiModelProperty("税率") - private BigDecimal taxRate; // 税率 - + private String invoiceInfo; // 票据类型(不含税、增值税、普通税、已含增值税) } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/pms/purchasebill/AppPurchasePayDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/pms/purchasebill/AppPurchasePayDetailsVo.java index 66a52c3789..d8127b8b5b 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/pms/purchasebill/AppPurchasePayDetailsVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/pms/purchasebill/AppPurchasePayDetailsVo.java @@ -38,31 +38,27 @@ import java.util.List; @ApiModel(value = "付款说明 视图数据详情", description = "付款说明 视图数据详情") public class AppPurchasePayDetailsVo implements Vo { - private String sid; // sid - - @ApiModelProperty("制单人姓名") - private String createByName; // 制单人姓名 - @ApiModelProperty("单据sid") - private String billSid; // 单据sid - @ApiModelProperty("是否先付货款 0否，1是") + @ApiModelProperty("是否先付货款 0否，1是") private String isFirstPay; // 是否先付货款 0否，1是 - @ApiModelProperty("订金") - private BigDecimal deposit; // 订金 - @ApiModelProperty("货款") - private BigDecimal goodsMoney; // 货款 - @ApiModelProperty("收款账户") - private String accountName; // 收款账户 - @ApiModelProperty("开户行") - private String bankName; // 开户行 + @ApiModelProperty("是否先付货款 0否，1是") + private String isFirstPay2; + @ApiModelProperty("订金") + private BigDecimal deposit; + @ApiModelProperty("货款") + private BigDecimal goodsMoney; + @ApiModelProperty("收款账户") + private String accountName; + @ApiModelProperty("开户行") + private String bankName; @ApiModelProperty("收款账号") - private String bankAccount; // 收款账号 + private String bankAccount; @ApiModelProperty("其他费用名称") - private String otherAmountName; // 其他费用名称 + private String otherAmountName; @ApiModelProperty("其他费用金额") - private BigDecimal otherAmount; // 其他费用金额 + private BigDecimal otherAmount; @ApiModelProperty("付款备注") - private String payRemark; // 付款备注 + private String payRemark; @ApiModelProperty("附件") - private List appFilePaths = new ArrayList<>(); // 附件 + private List filePaths = new ArrayList<>(); } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/TerminalApplication.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/TerminalApplication.java index 97a5d68499..f6f513d1ae 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/TerminalApplication.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/TerminalApplication.java @@ -15,7 +15,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients; "com.yxt.anrui.terminal", "com.yxt.common.base.config" },exclude = {DataSourceAutoConfiguration.class}) -@EnableFeignClients(basePackages = {"com.yxt.anrui.portal", "com.yxt.anrui.crm", "com.yxt.anrui.base", "com.yxt.anrui.riskcenter","com.yxt.anrui.flowable","com.yxt.anrui.buscenter","com.yxt.anrui.scm","com.yxt.anrui.fin", "com.yxt.anrui.terminal.fegin.wmsinventorycheckbill","com.yxt.anrui.terminal.fegin.wmsinventoryprofitin","com.yxt.anrui.terminal.fegin.wmsinventoryprofitout","com.yxt.anrui.terminal.fegin.basegoodssku","com.yxt.anrui.terminal.fegin.basesupplierinfo","com.yxt.anrui.terminal.fegin.wmsInventory","com.yxt.anrui.terminal.fegin.asbusrepairbill"}) +@EnableFeignClients(basePackages = {"com.yxt.anrui.portal", "com.yxt.anrui.crm", "com.yxt.anrui.base", "com.yxt.anrui.riskcenter","com.yxt.anrui.flowable","com.yxt.anrui.buscenter","com.yxt.anrui.scm","com.yxt.anrui.fin", "com.yxt.anrui.terminal.fegin.wmsinventorycheckbill","com.yxt.anrui.terminal.fegin.wmsinventoryprofitin","com.yxt.anrui.terminal.fegin.wmsinventoryprofitout","com.yxt.anrui.terminal.fegin.basegoodssku","com.yxt.anrui.terminal.fegin.basesupplierinfo","com.yxt.anrui.terminal.fegin.wmsInventory","com.yxt.anrui.terminal.fegin.asbusrepairbill","com.yxt.anrui.terminal.fegin.pmspurchasebill","com.yxt.anrui.terminal.fegin.pmspurchasebackbill"}) public class TerminalApplication { public static void main(String[] args) { diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/pms/pmspurchasebackbill/AppPurchaseBackBillService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/pms/pmspurchasebackbill/AppPurchaseBackBillService.java index 39fe5cc006..3558765a7f 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/pms/pmspurchasebackbill/AppPurchaseBackBillService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/pms/pmspurchasebackbill/AppPurchaseBackBillService.java @@ -61,6 +61,7 @@ public class AppPurchaseBackBillService { PmsPurchasebackBillDetailsVo data = pmsPurchaseBackBillFeign.fetchDetailsBySid(sid).getData(); AppPurchasebackBillDetailsVo appPurchasebackBillDetailsVo = new AppPurchasebackBillDetailsVo(); BeanUtil.copyProperties(data,appPurchasebackBillDetailsVo); + appPurchasebackBillDetailsVo.setProcInsId(data.getProcInstId()); return rb.success().setData(appPurchasebackBillDetailsVo); } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/pms/purchasebill/AppPurchaseBillService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/pms/purchasebill/AppPurchaseBillService.java index 06f504a370..d84359ab2a 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/pms/purchasebill/AppPurchaseBillService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/pms/purchasebill/AppPurchaseBillService.java @@ -63,12 +63,17 @@ public class AppPurchaseBillService { PmsPurchaseBillDetailsVo data = pmsPurchaseBillFeign.fetchDetailsBySid(sid).getData(); AppPurchaseBillDetailsVo appPurchaseBillDetailsVo = new AppPurchaseBillDetailsVo(); BeanUtil.copyProperties(data,appPurchaseBillDetailsVo); + appPurchaseBillDetailsVo.setShowApply(data.getPayTypeKey().equals("003")); + appPurchaseBillDetailsVo.getPurchaseBillInvoice().setIsInvoicing2(data.getPurchaseBillInvoice().getIsInvoicing().equals("1") ? "是" : "否"); + appPurchaseBillDetailsVo.getPurchaseBillInvoice().setInvoiceInfo(data.getPurchaseBillInvoice().getBillType()); + appPurchaseBillDetailsVo.getPurchasePay().setIsFirstPay2(data.getPurchasePay().getIsFirstPay().equals("1") ? "是" : "否"); + appPurchaseBillDetailsVo.setProcInsId(data.getProcInstId()); List filePaths = data.getPurchasePay().getFilePaths(); List appfiles = new ArrayList<>(); for (PmsPurchasePayFile filePath : filePaths) { appfiles.add(filePath.getUrl()); } - appPurchaseBillDetailsVo.getPurchasePay().setAppFilePaths(appfiles); + appPurchaseBillDetailsVo.getPurchasePay().setFilePaths(appfiles); return rb.success().setData(appPurchaseBillDetailsVo); }