From 80e8110e4f3a132ee2819f2560a661c6f6693fcf Mon Sep 17 00:00:00 2001
From: houjie <714924425@qq.com>
Date: 星期三, 30 八月 2023 18:51:59 +0800
Subject: [PATCH] 备件调整  导入导出

---
 lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparesPartInventory.java |   25 ++++++++++++-------------
 1 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparesPartInventory.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparesPartInventory.java
index 7b5386f..d6dde01 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparesPartInventory.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparesPartInventory.java
@@ -27,7 +27,6 @@
     /**
      * 澶囦欢id
      */
-    @Excel(name = "澶囦欢id", width = 15)
     @ApiModelProperty(value = "澶囦欢id")
     private java.lang.String sparePartId;
     /**
@@ -54,36 +53,36 @@
     /**
      * 鍒堕�犲晢
      */
-    @Excel(name = "鍒堕�犲晢", width = 15)
+    @Excel(name = "鍒堕�犲晢", width = 15,dictTable = "mom_base_constructor", dicCode = "id", dicText = "name")
     @ApiModelProperty(value = "鍒堕�犲晢")
     @Dict(dictTable = "mom_base_constructor", dicCode = "id", dicText = "name")
     private java.lang.String constructorId;
     /**
      * 涓诲崟浣峣d
      */
-    @Excel(name = "涓诲崟浣峣d", width = 15)
+    @Excel(name = "涓诲崟浣峣d", width = 15,dictTable = "mom_base_unit", dicCode = "id", dicText = "name")
     @ApiModelProperty(value = "涓诲崟浣峣d")
     @Dict(dictTable = "mom_base_unit", dicCode = "id", dicText = "name")
     private java.lang.String mainUnitId;
     /**
      * 杈呭崟浣峣d
      */
-    @Excel(name = "杈呭崟浣峣d", width = 15)
+
     @ApiModelProperty(value = "杈呭崟浣峣d")
     @Dict(dictTable = "mom_base_unit", dicCode = "id", dicText = "name")
     private java.lang.String auxiliaryUnitId;
 
-    @Excel(name = "浠撳簱id", width = 15)
+    @Excel(name = "浠撳簱id", width = 15,dictTable = "mom_base_warehouse", dicCode = "id", dicText = "name")
     @ApiModelProperty(value = "浠撳簱id")
     @Dict(dictTable = "mom_base_warehouse", dicCode = "id", dicText = "name")
     private java.lang.String warehouseId;
 
-    @Excel(name = "搴撳尯id", width = 15)
+    @Excel(name = "搴撳尯id", width = 15,dictTable = "mom_base_warehouse_area", dicCode = "id", dicText = "name")
     @ApiModelProperty(value = "搴撳尯id")
     @Dict(dictTable = "mom_base_warehouse_area", dicCode = "id", dicText = "name")
     private java.lang.String warehouseAreaId;
 
-    @Excel(name = "搴撲綅id", width = 15)
+    @Excel(name = "搴撲綅id", width = 15,dictTable = "mom_base_warehouse_location", dicCode = "id", dicText = "name")
     @ApiModelProperty(value = "搴撲綅id")
     @Dict(dictTable = "mom_base_warehouse_location", dicCode = "id", dicText = "name")
     private java.lang.String warehouseLocationId;
@@ -96,7 +95,6 @@
     /**
      * 杈呮暟閲�
      */
-    @Excel(name = "杈呮暟閲�", width = 15)
     @ApiModelProperty(value = "杈呮暟閲�")
     private java.lang.Double auxiliaryQuantity;
 
@@ -113,6 +111,7 @@
      * 渚涘簲鍟唅d
      */
     @Excel(name = "渚涘簲鍟唅d", width = 15)
+    @Dict(dictTable = "mom_base_supplier", dicCode = "id", dicText = "name")
     @ApiModelProperty(value = "渚涘簲鍟唅d")
     private String supplierId;
 
@@ -154,31 +153,31 @@
     /**
      * 澶囩敤瀛楁1
      */
-    @Excel(name = "澶囩敤瀛楁1", width = 15)
+
     @ApiModelProperty(value = "澶囩敤瀛楁1")
     private java.lang.String sparesUda1;
     /**
      * 澶囩敤瀛楁2
      */
-    @Excel(name = "澶囩敤瀛楁2", width = 15)
+
     @ApiModelProperty(value = "澶囩敤瀛楁2")
     private java.lang.String sparesUda2;
     /**
      * 澶囩敤瀛楁3
      */
-    @Excel(name = "澶囩敤瀛楁3", width = 15)
+
     @ApiModelProperty(value = "澶囩敤瀛楁3")
     private java.lang.String sparesUda3;
     /**
      * 澶囩敤瀛楁4
      */
-    @Excel(name = "澶囩敤瀛楁4", width = 15)
+
     @ApiModelProperty(value = "澶囩敤瀛楁4")
     private java.lang.String sparesUda4;
     /**
      * 澶囩敤瀛楁5
      */
-    @Excel(name = "澶囩敤瀛楁5", width = 15)
+
     @ApiModelProperty(value = "澶囩敤瀛楁5")
     private java.lang.String sparesUda5;
 

--
Gitblit v1.9.3