From 092a98a583c4fe822a3eb4c4dac086f84b16189c Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 26 九月 2025 17:58:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TErpClinicWarehousing.java | 31 ++++++++++++++-----------------
1 files changed, 14 insertions(+), 17 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 0e4b12f..2be7174 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
@@ -38,29 +38,12 @@
@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 BigDecimal salesAmount;
-
- @ApiModelProperty(value = "所需数量（采购数量）")
- @TableField("purchase_count")
- private Integer purchaseCount;
@ApiModelProperty(value = "总价")
@TableField("total_price")
@@ -70,4 +53,18 @@
@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;
}
--
Gitblit v1.7.1