From ea049832c6b1c9f7ba996a6471d73421fcffb32e Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 01 九月 2025 09:41:08 +0800
Subject: [PATCH] erp商品修改
---
ruoyi-system/src/main/resources/mapper/system/TErpGoodsMapper.xml | 5 +++--
ruoyi-system/src/main/java/com/ruoyi/system/model/TErpGoods.java | 10 +++++++---
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpGoods.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpGoods.java
index 1ffc9a2..0e0db33 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpGoods.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpGoods.java
@@ -29,14 +29,18 @@
@TableId(value = "id", type = IdType.ASSIGN_ID)
private String id;
- @ApiModelProperty(value = "供应商id")
- @TableField("supplier_id")
- private String supplierId;
+ @ApiModelProperty(value = "供应商id/诊所id")
+ @TableField("supplier_clinic_id")
+ private String supplierClinicId;
@ApiModelProperty(value = "诊所id")
@TableField("clinic_id")
private String clinicId;
+ @ApiModelProperty(value = "商品来源 1=平台添加 2=线下添加")
+ @TableField("goods_source")
+ private String goodsSource;
+
@ApiModelProperty(value = "商品名称")
@TableField("goods_name")
private String goodsName;
diff --git a/ruoyi-system/src/main/resources/mapper/system/TErpGoodsMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TErpGoodsMapper.xml
index 2a2e697..0f12e06 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TErpGoodsMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TErpGoodsMapper.xml
@@ -5,7 +5,8 @@
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.ruoyi.system.model.TErpGoods">
<id column="id" property="id" />
- <result column="supplier_id" property="supplierId" />
+ <result column="supplier_clinic_id" property="supplierClinicId" />
+ <result column="goods_source" property="goodsSource" />
<result column="clinic_id" property="clinicId" />
<result column="goods_name" property="goodsName" />
<result column="goods_id_code" property="goodsIdCode" />
@@ -36,7 +37,7 @@
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
- id, supplier_id, clinic_id, goods_name, goods_id_code, quasi_number, manufacturer, formulation_spec, packing_spec, type_id, goods_yards, maintenance_interval, low_purchase_quantity, low_unit_id, is_prescription_drug, goods_spec, warning_inventory, sales_amount, packing_unit_id, instructions_use, side_effect, clinic_purchase_price, platform_commission_price, create_time, update_time, create_by, update_by, disabled
+ id, supplier_clinic_id, goods_source, goods_name, goods_id_code, quasi_number, manufacturer, formulation_spec, packing_spec, type_id, goods_yards, maintenance_interval, low_purchase_quantity, low_unit_id, is_prescription_drug, goods_spec, warning_inventory, sales_amount, packing_unit_id, instructions_use, side_effect, clinic_purchase_price, platform_commission_price, create_time, update_time, create_by, update_by, disabled
</sql>
</mapper>
--
Gitblit v1.7.1