From ad87b352088eaa0c379b293f1900785d7d74a67b Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Tue, 6 Aug 2024 17:23:16 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=AE=A1=E6=A0=B8=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=9C=AC=E5=9C=B0=E4=BB=98=E6=AC=BE=E3=80=81=E5=8F=91?=
 =?UTF-8?q?=E8=B4=A7=E7=8A=B6=E6=80=81=E3=80=81=E6=94=B6=E8=B4=A7=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/yxt/purchase/biz/purchasebill/PurchaseBillExVo.java | 5 +++++
 .../yxt/purchase/biz/purchasebill/PurchaseBillMapper.xml    | 6 ++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillExVo.java b/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillExVo.java
index 00ebb67..213798a 100644
--- a/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillExVo.java
+++ b/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillExVo.java
@@ -68,4 +68,9 @@ public class PurchaseBillExVo implements Vo {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     @ApiModelProperty("最后修改时间")
     private Date modifyTime;
+
+    @ApiModelProperty("收货状态value")
+    private String receiveStateValue;
+    @ApiModelProperty("发货状态value")
+    private String deliveryStateValue;
 }
diff --git a/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillMapper.xml b/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillMapper.xml
index 8d6258b..0877d22 100644
--- a/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillMapper.xml
+++ b/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillMapper.xml
@@ -56,12 +56,14 @@
 						when 2 then '已审核'
 						when 3 then '审核未通过' end as state,
 				SUM(pbd.amount) AS amountTotal,
-				pba.thisPayAmount,
 				SUM(pbd.taxAmount) AS taxAmount,
 				SUM(pbd.count) AS countTotal,
 				pb.`remarks`,
 				pb.`createByName`,
-				pb.`modifyTime`
+				pb.`modifyTime`,
+				pba.prepayment AS thisPayAmount,
+				pbe.receiveStateValue,
+				pbe.deliveryStateValue
 		FROM
 				purchase_bill pb
 						LEFT JOIN purchase_bill_detail pbd