From ad82332e6bd057ba2def55340dff3f48581ad627 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 13 十月 2025 15:15:54 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/haizhentong
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TErpClinicWarehousing.java | 37 +++++++++++++++++++------------------
1 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpClinicWarehousing.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpClinicWarehousing.java
index 7d635b3..307992a 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpClinicWarehousing.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpClinicWarehousing.java
@@ -8,6 +8,7 @@
import lombok.EqualsAndHashCode;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
@@ -37,36 +38,36 @@
@TableField("clinic_id")
private String clinicId;
- @ApiModelProperty(value = "商品id")
- @TableField("goods_id")
- private String goodsId;
-
- @ApiModelProperty(value = "商品名称")
- @TableField("goods_name")
- private String goodsName;
@ApiModelProperty(value = "供应商名称")
@TableField("supplier_name")
private String supplierName;
- @ApiModelProperty(value = "国药准字号")
- @TableField("quasi_number")
- private String quasiNumber;
- @ApiModelProperty(value = "售价")
- @TableField("sales_amount")
- private Double salesAmount;
-
- @ApiModelProperty(value = "所需数量（采购数量）")
- @TableField("purchase_count")
- private Integer purchaseCount;
@ApiModelProperty(value = "总价")
@TableField("total_price")
- private Double totalPrice;
+ private BigDecimal totalPrice;
@ApiModelProperty(value = "入库类型 1=平台商品入库 2=非平台商品入库")
@TableField("warehousing_type")
private Integer warehousingType;
+ @ApiModelProperty(value = "入库单号")
+ @TableField("warehouse_no")
+ private String warehouseNo;
+
+ @ApiModelProperty(value = "1采购 2盘点 3手动")
+ private Integer type;
+
+ @ApiModelProperty(value = "供应商id")
+ @TableField("supplier_id")
+ private String supplierId;
+
+ @ApiModelProperty(value = "盘点id")
+ @TableField("inventory_id")
+ private String inventoryId;
+
+ @ApiModelProperty(value = "入库状态 1=草稿 2=正常")
+ private Integer status;
}
--
Gitblit v1.7.1