From 718183df7eef508bff5626ce3ec4d149eabca228 Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Fri, 26 Jul 2024 10:41:47 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=8D=95=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E3=80=81=E6=96=B0=E5=A2=9E=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PurchaseBillDetailDto.java                | 83 +++++++++----------
 1 file changed, 39 insertions(+), 44 deletions(-)

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 fd96a72..a252456 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
@@ -38,75 +38,70 @@ import java.util.Date;
 @ApiModel(value = "采购单据明细 数据传输对象", description = "采购单据明细 数据传输对象")
 public class PurchaseBillDetailDto implements Dto {
 
-    private String sid; // sid
+    private String sid;
 
     @ApiModelProperty("备注")
     private String remarks;
     @ApiModelProperty("单据sid")
-    private String billSid; // 单据sid
+    private String billSid;
     @ApiModelProperty("商品基础信息Sid")
-    private String goodsSpuSid; // 商品基础信息Sid
+    private String goodsSpuSid;
     @ApiModelProperty("商品名称")
-    private String goodsSpuName; // 商品名称
+    private String goodsSpuName;
     @ApiModelProperty("商品Skusid")
-    private String goodsSkuSid; // 商品Skusid
+    private String goodsSkuSid;
     @ApiModelProperty("商品Sku名称")
-    private String goodsSkuTitle; // 商品Sku名称
+    private String goodsSkuTitle;
     @ApiModelProperty("商品编码")
-    private String goodsSkuCode; // 商品编码
+    private String goodsSkuCode;
     @ApiModelProperty("商品条码")
-    private String goodsSN; // 商品条码
+    private String goodsSN;
     @ApiModelProperty("货号")
-    private String goodsNum; // 货号
+    private String goodsNum;
     @ApiModelProperty("规格型号")
-    private String goodsSkuOwnSpec; // 规格型号
+    private String goodsSkuOwnSpec;
+    @ApiModelProperty("商品图片")
+    private String goodsImgUrl;
     @ApiModelProperty("计量单位")
-    private String unit; // 计量单位
+    private String unit;
     @ApiModelProperty("单价")
-    private BigDecimal cost; // 单价
+    private BigDecimal cost;
     @ApiModelProperty("数量")
     private BigDecimal count;
-    @ApiModelProperty("数量1")
-    private BigDecimal count1;
-    @ApiModelProperty("已入库数量")
-    private BigDecimal inCount;
-    @ApiModelProperty("已发货数量")
-    private BigDecimal outCount;
-    @ApiModelProperty("已入库数量1")
-    private BigDecimal inCount1;
-    @ApiModelProperty("待入库数量")
-    private BigDecimal notInCount;
-    @ApiModelProperty("待入库数量1")
-    private BigDecimal notInCount1;
+    @ApiModelProperty("数量(pcs)")
+    private BigDecimal pcsCount;
+    @ApiModelProperty("吊牌价")
+    private BigDecimal tagPrice;
     @ApiModelProperty("折扣率")
-    private BigDecimal discountRate; // 折扣率
+    private BigDecimal discountRate;
     @ApiModelProperty("折后单价")
-    private BigDecimal discountPrice; // 折后单价
+    private BigDecimal discountPrice;
     @ApiModelProperty("分摊金额")
-    private BigDecimal shareAmount; // 分摊金额
-    @ApiModelProperty("总价")
-    private BigDecimal costTotal;
+    private BigDecimal shareAmount;
     @ApiModelProperty("分配比例")
-    private BigDecimal shareRate; // 分配比例
+    private BigDecimal shareRate;
     @ApiModelProperty("采购金额")
-    private BigDecimal amount; // 采购金额
-    @ApiModelProperty("采购周期")
-    private Integer cycle; // 采购周期
-    @ApiModelProperty("预期到货日期")
-    private String deliveryDate; // 预期到货日期
-
-    @ApiModelProperty("总税额")
-    private BigDecimal taxAmount;
-    @ApiModelProperty("商品图片")
-    private String goodsImgUrl;
-    @ApiModelProperty("数量(pcs)")
-    private BigDecimal pcsCount;
-    @ApiModelProperty("吊牌价")
-    private BigDecimal tagPrice;
+    private BigDecimal amount;
     @ApiModelProperty("税率")
     private BigDecimal taxRate;
     @ApiModelProperty("未含税价")
     private BigDecimal unTaxPrice;
     @ApiModelProperty("未含税总价（未含税价*采购数量）")
     private BigDecimal unTaxTotalAmount;
+    @ApiModelProperty("采购周期")
+    private Integer cycle;
+    @ApiModelProperty("预期到货日期")
+    private String deliveryDate;
+    @ApiModelProperty("总税额")
+    private BigDecimal taxAmount;
+
+    /*
+     * 商品扩展字段
+     * */
+    @ApiModelProperty("批次号")
+    private String batchNumber;
+    @ApiModelProperty("生产日期")
+    private String madeDate;
+    @ApiModelProperty("过期日期")
+    private String expireDate;
 }
\ No newline at end of file