From bbaec3b5f56be4b6c00e0c9fabbb6941ab793244 Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Tue, 6 Aug 2024 11:20:08 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=95=86=E5=93=81=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=BD=93=E5=89=8D=E5=8D=95=E4=BD=8D=E4=B8=8B=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E5=AE=8C=E6=88=90=20=E9=80=89=E6=8B=A9=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E8=BF=94=E5=9B=9E=E6=9C=89=E6=95=88=E6=9C=9F=E5=92=8C?=
 =?UTF-8?q?=E7=A8=8E=E7=8E=87=EF=BC=8C=E4=BF=9D=E5=AD=98=E9=87=87=E8=B4=AD?=
 =?UTF-8?q?=E5=8D=95=E4=BF=9D=E5=AD=98=E6=9C=89=E6=95=88=E6=9C=9F=E5=88=B0?=
 =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=95=86=E5=93=81=E6=98=8E=E7=BB=86=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oms/biz/func/purchasebill/GoodsSkuPurSelectList.java    | 4 ++++
 .../oms/biz/func/purchasebill/GoodsSkuPurSelectQuery.java   | 6 +-----
 .../purchasebilldetail/PurchaseBillDetailDetailsVo.java     | 2 ++
 .../biz/func/purchasebilldetail/PurchaseBillDetailDto.java  | 2 ++
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/GoodsSkuPurSelectList.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/GoodsSkuPurSelectList.java
index 9d2faa5..5b5fd49 100644
--- a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/GoodsSkuPurSelectList.java
+++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/GoodsSkuPurSelectList.java
@@ -36,6 +36,10 @@ public class GoodsSkuPurSelectList {
     private BigDecimal cost;
     //单价1
     private BigDecimal cost1;
+    //保质期
+    private String shelfLife;
+    //税率
+    private BigDecimal taxRate;
     //货号
     private String itemNumber;
 }
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/GoodsSkuPurSelectQuery.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/GoodsSkuPurSelectQuery.java
index 3684cf8..581c3d6 100644
--- a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/GoodsSkuPurSelectQuery.java
+++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/GoodsSkuPurSelectQuery.java
@@ -15,10 +15,6 @@ public class GoodsSkuPurSelectQuery implements Query {
     private String goodsSkuCode;
     //商品名称
     private String goodsName;
-    //商品条码
-    private String barCode;
-    //规格名称
-    private String goodsSkuOwnSpec;
 
-    private String orgPath;
+    private String createOrgSid;
 }
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailDetailsVo.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailDetailsVo.java
index 369f08c..6785d18 100644
--- a/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailDetailsVo.java
+++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailDetailsVo.java
@@ -99,6 +99,8 @@ public class PurchaseBillDetailDetailsVo implements Vo {
     private Date deliveryDate;
     @ApiModelProperty("总税额")
     private BigDecimal taxAmount;
+    @ApiModelProperty("保质期")
+    private Integer shelfLife;
 
     /*
      * 商品扩展字段
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailDto.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailDto.java
index a252456..20c01bb 100644
--- a/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailDto.java
+++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailDto.java
@@ -94,6 +94,8 @@ public class PurchaseBillDetailDto implements Dto {
     private String deliveryDate;
     @ApiModelProperty("总税额")
     private BigDecimal taxAmount;
+    @ApiModelProperty("保质期")
+    private Integer shelfLife;
 
     /*
      * 商品扩展字段