From ee4eb46cda0c8a9994b301cb9e410a8fd0f05809 Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Wed, 24 Jul 2024 09:50:26 +0800
Subject: [PATCH] =?UTF-8?q?oms=E9=87=87=E8=B4=AD=E5=8D=95=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../func/purchasebill/PurchaseBillQuery.java  | 22 ++++++++++---------
 .../biz/func/purchasebill/PurchaseBillVo.java | 13 +++++++++++
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillQuery.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillQuery.java
index e4fd620..6dadc59 100644
--- a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillQuery.java
+++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillQuery.java
@@ -34,26 +34,28 @@ import lombok.Data;
 @ApiModel(value = "采购单 查询条件", description = "采购单 查询条件")
 public class PurchaseBillQuery implements Query {
 
+    @ApiModelProperty("创建开始日期")
+    private String createStartTime;
+    @ApiModelProperty("创建结束日期")
+    private String createEndTime;
     @ApiModelProperty("供应商名称")
-    private String supplierName;
+    private String supplierSid;
     @ApiModelProperty("仓库名称")
-    private String wareHouseName;
+    private String wareHouseSid;
     @ApiModelProperty("收货状态key")
     private String receiveStateKey;
     @ApiModelProperty("物流单号")
     private String logisticsNum;
-    @ApiModelProperty("发货状态key")
-    private String deliveryStateKey;
     @ApiModelProperty("单据编号")
     private String billNo;
-    @ApiModelProperty("采购员姓名")
-    private String purchaserName;
+    @ApiModelProperty("采购员")
+    private String purchaserSid;
     @ApiModelProperty("备注")
     private String remarks;
-    @ApiModelProperty("创建开始日期")
-    private String createStartTime;
-    @ApiModelProperty("创建结束日期")
-    private String createEndTime;
+    @ApiModelProperty("发货状态key")
+    private String deliveryStateKey;
+    @ApiModelProperty("商品sid")
+    private String goodsSid;
 
     private String orgLevelKey;
     @ApiModelProperty("菜单路由")
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillVo.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillVo.java
index e6f7ac7..0771f75 100644
--- a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillVo.java
+++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillVo.java
@@ -61,16 +61,29 @@ public class PurchaseBillVo implements Vo {
     private BigDecimal otherAmount;
     @ApiModelProperty("预付金额")
     private BigDecimal prepayment;
+    @ApiModelProperty("总税额")
+    private BigDecimal taxAmount;
     @ApiModelProperty("物流单号")
     private String logisticsNum;
     @ApiModelProperty("生产进度")
     private String productProgress;
+    @ApiModelProperty("未含税总价（未含税价*采购数量）")
+    private BigDecimal unTaxTotalAmount;
     @ApiModelProperty("总采购数量")
     private String countTotal;
+    @ApiModelProperty("已入库数量")
+    private BigDecimal enterWareCount;
+    @ApiModelProperty("已入库金额")
+    private BigDecimal enterWareAmount;
+    @ApiModelProperty("已发货数量")
+    private BigDecimal deliveryCount;
     @ApiModelProperty("发货状态value")
     private Integer deliveryStateValue;
     @ApiModelProperty("备注")
     private String remarks;
     @ApiModelProperty("制单人姓名")
     private String createByName;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @ApiModelProperty("最后修改时间")
+    private Date modifyTime;
 }