From f8d30932873605f5eb407228b22a38ec5ff96af9 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 12 九月 2025 15:57:28 +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/TErpGoods.java | 132 +++++++++++++++++++++++++++++++++++++------
1 files changed, 113 insertions(+), 19 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 a98e302..972de08 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
@@ -1,13 +1,16 @@
package com.ruoyi.system.model;
+import cn.afterturn.easypoi.excel.annotation.Excel;
import com.baomidou.mybatisplus.annotation.*;
import com.ruoyi.common.core.domain.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import org.aspectj.weaver.ast.Not;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
@@ -29,37 +32,59 @@
@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 Integer goodsSource;
@ApiModelProperty(value = "商品名称")
@TableField("goods_name")
+ @Excel(name = "*商品名称")
private String goodsName;
@ApiModelProperty(value = "商品标识码")
@TableField("goods_id_code")
+ @Excel(name = "*商品标识码")
private String goodsIdCode;
@ApiModelProperty(value = "国药准字号")
@TableField("quasi_number")
+ @Excel(name = "*国药准字号")
private String quasiNumber;
@ApiModelProperty(value = "生产厂家")
@TableField("manufacturer")
+ @Excel(name = "*生产厂家")
private String manufacturer;
@ApiModelProperty(value = "制剂规格")
@TableField("formulation_spec")
+ @Excel(name = "*制剂规格")
private String formulationSpec;
@ApiModelProperty(value = "包装规格")
@TableField("packing_spec")
+ @Excel(name = "*包装规格")
private String packingSpec;
+
+ @ApiModelProperty(value = "商品类型名称")
+ @TableField(exist = false)
+ @Excel(name = "*商品类型")
+ private String typeName;
+
+ @ApiModelProperty(value = "诊所采购价")
+ @TableField("clinic_purchase_price")
+ @Excel(name = "*诊所采购价")
+ private BigDecimal clinicPurchasePrice;
+
+ @ApiModelProperty(value = "预警库存")
+ @TableField("warning_inventory")
+ @Excel(name = "*预警库存")
+ private Integer warningInventory;
+
@ApiModelProperty(value = "商品类型id")
@TableField("type_id")
@@ -67,63 +92,132 @@
@ApiModelProperty(value = "商品69码")
@TableField("goods_yards")
+ @Excel(name = "商品69码")
private String goodsYards;
- @ApiModelProperty(value = "保养周期")
- @TableField("maintenance_interval")
+ @Excel(name = "保养周期(天)")
private String maintenanceInterval;
@ApiModelProperty(value = "最低采购数量")
@TableField("low_purchase_quantity")
+ @Excel(name = "最低采购数量")
private Integer lowPurchaseQuantity;
@ApiModelProperty(value = "最低采购单位,单位id")
@TableField("low_unit_id")
private String lowUnitId;
+ @Excel(name = "最低采购单位")
+ @TableField(exist = false)
+ private String lowUnitName;
+
@ApiModelProperty(value = "是否为处方药 1=是 2=否")
@TableField("is_prescription_drug")
+ @Excel(name = "是否为处方药",replace = {"是_1","否_2"})
private Integer isPrescriptionDrug;
+
+ @Excel(name = "包装单位")
+ @TableField(exist = false)
+ private String packingUnitName;
+
@ApiModelProperty(value = "商品规格")
@TableField("goods_spec")
private String goodsSpec;
- @ApiModelProperty(value = "预警库存")
- @TableField("warning_inventory")
- private Integer warningInventory;
+
@ApiModelProperty(value = "商品售价")
@TableField("sales_amount")
- private Double salesAmount;
+ private BigDecimal salesAmount;
@ApiModelProperty(value = "包装单位,单位id")
@TableField("packing_unit_id")
private String packingUnitId;
+
+
@ApiModelProperty(value = "使用说明")
@TableField("instructions_use")
+ @Excel(name = "使用说明")
private String instructionsUse;
@ApiModelProperty(value = "副作用")
@TableField("side_effect")
+ @Excel(name = "副作用")
private String sideEffect;
- @ApiModelProperty(value = "诊所采购价")
- @TableField("clinic_purchase_price")
- private Double clinicPurchasePrice;
@ApiModelProperty(value = "平台分佣金额")
@TableField("platform_commission_price")
- private Double platformCommissionPrice;
+ private BigDecimal platformCommissionPrice;
@ApiModelProperty(value = "1启用 2禁用")
private Integer state;
- @ApiModelProperty(value = "商品类型名称")
- @TableField(exist = false)
- private String typeName;
+ @ApiModelProperty(value = "拼音简码")
+ @TableField("simplified_code")
+ @Excel(name = "拼音简码")
+ private String simplifiedCode;
+
+ @ApiModelProperty(value = "剂型")
+ @TableField("dosage_form")
+ @Excel(name = "剂型")
+ private String dosageForm;
+
+ @ApiModelProperty(value = "用途分类")
+ @TableField("usage_classification")
+ @Excel(name = "用途分类")
+ private String usageClassification;
+
+ @ApiModelProperty(value = "商品品牌名")
+ @TableField("product_brand")
+ @Excel(name = "商品名(品牌)")
+ private String productBrand;
+
+ @ApiModelProperty(value = "产地")
+ @TableField("place_of_origin")
+ @Excel(name = "产地")
+ private String placeOfOrigin;
+
+ @ApiModelProperty(value = "成分")
+ @TableField("ingredient")
+ @Excel(name = "主要成分")
+ private String ingredient;
+
+ @ApiModelProperty(value = "性状")
+ @TableField("trait")
+ @Excel(name = "性状")
+ private String trait;
+
+ @ApiModelProperty(value = "适应症")
+ @TableField("indication")
+ @Excel(name = "适应症")
+ private String indication;
+
+ @ApiModelProperty(value = "禁忌")
+ @TableField("taboo")
+ @Excel(name = "禁忌")
+ private String taboo;
+
+ @ApiModelProperty(value = "注意事项")
+ @TableField("precautions")
+ @Excel(name = "注意事项")
+ private String precautions;
+
+ @ApiModelProperty(value = "相互作用")
+ @TableField("interaction")
+ @Excel(name = "相互作用")
+ private String interaction;
+
+ @ApiModelProperty(value = "贮藏")
+ @TableField("storage")
+ @Excel(name = "贮藏")
+ private String storage;
+
+
+
}
--
Gitblit v1.7.1