Explorar el Código

修改pom依赖与平台依赖一致

wangqiong hace 1 año
padre
commit
ef686c0db1

+ 54
- 15
pom.xml Ver fichero

1
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<project xmlns="http://maven.apache.org/POM/4.0.0"
3
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3
     <modelVersion>4.0.0</modelVersion>
5
     <modelVersion>4.0.0</modelVersion>
4
     <groupId>com.zzsmart.qomo</groupId>
6
     <groupId>com.zzsmart.qomo</groupId>
5
     <artifactId>qomo-kn-forecast</artifactId>
7
     <artifactId>qomo-kn-forecast</artifactId>
6
     <version>${revision}</version>
8
     <version>${revision}</version>
7
     <packaging>pom</packaging>
9
     <packaging>pom</packaging>
8
-    <name>QOMO FORECAST</name>
9
-
10
+    <name>QOMO Cost Manage</name>
11
+    <modules>
12
+        <module>qomo-kn-cost-manage-start</module>
13
+        <module>qomo-kn-cost-manage</module>
14
+    </modules>
10
     <developers>
15
     <developers>
11
         <developer>
16
         <developer>
12
             <name>武汉中制智造</name>
17
             <name>武汉中制智造</name>
24
     <properties>
29
     <properties>
25
         <revision>2.0.0-SNAPSHOT</revision>
30
         <revision>2.0.0-SNAPSHOT</revision>
26
         <adp.version>2.0.0-SNAPSHOT</adp.version>
31
         <adp.version>2.0.0-SNAPSHOT</adp.version>
32
+        <dmp.version>2.0.0-SNAPSHOT</dmp.version>
27
     </properties>
33
     </properties>
28
-
29
-    <modules>
30
-        <module>qomo-kn-cost-manage-start</module>
31
-        <module>qomo-kn-cost-manage</module>
32
-    </modules>
33
-
34
     <repositories>
34
     <repositories>
35
         <repository>
35
         <repository>
36
             <id>zzzz</id>
36
             <id>zzzz</id>
99
                 <version>${revision}</version>
99
                 <version>${revision}</version>
100
             </dependency>
100
             </dependency>
101
             <dependency>
101
             <dependency>
102
-                <groupId>commons-io</groupId>
103
-                <artifactId>commons-io</artifactId>
104
-                <version>2.11.0</version>
102
+                <groupId>com.zzsmart.qomo</groupId>
103
+                <artifactId>qomo-data-model</artifactId>
104
+                <version>${dmp.version}</version>
105
+            </dependency>
106
+
107
+            <dependency>
108
+                <groupId>com.zzsmart.qomo</groupId>
109
+                <artifactId>qomo-assets-management</artifactId>
110
+                <version>${dmp.version}</version>
111
+            </dependency>
112
+
113
+            <dependency>
114
+                <groupId>com.zzsmart.qomo</groupId>
115
+                <artifactId>qomo-data-integration</artifactId>
116
+                <version>${dmp.version}</version>
117
+            </dependency>
118
+
119
+            <dependency>
120
+                <groupId>com.zzsmart.qomo</groupId>
121
+                <artifactId>qomo-data-metadata</artifactId>
122
+                <version>${dmp.version}</version>
123
+            </dependency>
124
+
125
+            <dependency>
126
+                <groupId>com.zzsmart.qomo</groupId>
127
+                <artifactId>qomo-work-flow</artifactId>
128
+                <version>${dmp.version}</version>
129
+            </dependency>
130
+
131
+            <dependency>
132
+                <groupId>com.zzsmart.qomo</groupId>
133
+                <artifactId>qomo-data-warehouse</artifactId>
134
+                <version>${dmp.version}</version>
105
             </dependency>
135
             </dependency>
136
+            <dependency>
137
+                <groupId>com.zzsmart.qomo</groupId>
138
+                <artifactId>qomo-data-selfReport</artifactId>
139
+                <version>${dmp.version}</version>
140
+            </dependency>
141
+<!--            <dependency>-->
142
+<!--                <groupId>commons-io</groupId>-->
143
+<!--                <artifactId>commons-io</artifactId>-->
144
+<!--                <version>2.11.0</version>-->
145
+<!--            </dependency>-->
106
         </dependencies>
146
         </dependencies>
107
     </dependencyManagement>
147
     </dependencyManagement>
108
-
109
     <!-- 环境 -->
148
     <!-- 环境 -->
110
     <profiles>
149
     <profiles>
111
         <!-- 开发 -->
150
         <!-- 开发 -->
180
         </profile>
219
         </profile>
181
         <!-- SpringCloud运行环境 -->
220
         <!-- SpringCloud运行环境 -->
182
     </profiles>
221
     </profiles>
183
-</project>
222
+</project>

+ 49
- 2
qomo-kn-cost-manage-start/pom.xml Ver fichero

2
 <project xmlns="http://maven.apache.org/POM/4.0.0"
2
 <project xmlns="http://maven.apache.org/POM/4.0.0"
3
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5
+    <modelVersion>4.0.0</modelVersion>
5
     <parent>
6
     <parent>
6
         <groupId>com.zzsmart.qomo</groupId>
7
         <groupId>com.zzsmart.qomo</groupId>
7
         <artifactId>qomo-kn-forecast</artifactId>
8
         <artifactId>qomo-kn-forecast</artifactId>
8
         <version>${revision}</version>
9
         <version>${revision}</version>
9
     </parent>
10
     </parent>
10
-    <modelVersion>4.0.0</modelVersion>
11
-
12
     <artifactId>qomo-kn-cost-manage-start</artifactId>
11
     <artifactId>qomo-kn-cost-manage-start</artifactId>
13
 
12
 
14
     <properties>
13
     <properties>
52
             </plugin>
51
             </plugin>
53
         </plugins>
52
         </plugins>
54
     </build>
53
     </build>
54
+    <profiles>
55
+        <profile>
56
+            <id>dmp</id>
57
+            <activation>
58
+                <!--默认激活配置-->
59
+                <activeByDefault>true</activeByDefault>
60
+            </activation>
61
+            <properties>
62
+                <profile.name>dmp</profile.name>
63
+            </properties>
64
+            <dependencies>
65
+                <dependency>
66
+                    <groupId>com.zzsmart.qomo</groupId>
67
+                    <artifactId>qomo-data-model</artifactId>
68
+                </dependency>
69
+
70
+                <dependency>
71
+                    <groupId>com.zzsmart.qomo</groupId>
72
+                    <artifactId>qomo-assets-management</artifactId>
73
+                </dependency>
74
+
75
+                <dependency>
76
+                    <groupId>com.zzsmart.qomo</groupId>
77
+                    <artifactId>qomo-data-integration</artifactId>
78
+                </dependency>
79
+
80
+                <dependency>
81
+                    <groupId>com.zzsmart.qomo</groupId>
82
+                    <artifactId>qomo-data-metadata</artifactId>
83
+                </dependency>
84
+
85
+                <dependency>
86
+                    <groupId>com.zzsmart.qomo</groupId>
87
+                    <artifactId>qomo-work-flow</artifactId>
88
+                </dependency>
89
+
90
+                <dependency>
91
+                    <groupId>com.zzsmart.qomo</groupId>
92
+                    <artifactId>qomo-data-warehouse</artifactId>
93
+                </dependency>
94
+                <dependency>
95
+                    <groupId>com.zzsmart.qomo</groupId>
96
+                    <artifactId>qomo-data-selfReport</artifactId>
97
+                </dependency>
98
+            </dependencies>
99
+        </profile>
100
+    </profiles>
101
+
55
 </project>
102
 </project>

+ 25
- 28
qomo-kn-cost-manage/pom.xml Ver fichero

2
 <project xmlns="http://maven.apache.org/POM/4.0.0"
2
 <project xmlns="http://maven.apache.org/POM/4.0.0"
3
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5
+    <modelVersion>4.0.0</modelVersion>
5
     <parent>
6
     <parent>
6
         <groupId>com.zzsmart.qomo</groupId>
7
         <groupId>com.zzsmart.qomo</groupId>
7
         <artifactId>qomo-kn-forecast</artifactId>
8
         <artifactId>qomo-kn-forecast</artifactId>
8
         <version>${revision}</version>
9
         <version>${revision}</version>
9
     </parent>
10
     </parent>
10
-    <modelVersion>4.0.0</modelVersion>
11
-
12
     <artifactId>qomo-kn-cost-manage</artifactId>
11
     <artifactId>qomo-kn-cost-manage</artifactId>
13
-
14
-    <properties>
15
-        <maven.compiler.source>8</maven.compiler.source>
16
-        <maven.compiler.target>8</maven.compiler.target>
17
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
18
-    </properties>
19
-
20
     <dependencies>
12
     <dependencies>
21
         <dependency>
13
         <dependency>
22
             <groupId>org.qomo.boot</groupId>
14
             <groupId>org.qomo.boot</groupId>
23
             <artifactId>qomo-system-biz</artifactId>
15
             <artifactId>qomo-system-biz</artifactId>
24
-            <version>2.0.1-SNAPSHOT</version>
25
-        </dependency>
26
-        <dependency>
27
-            <groupId>org.springframework.boot</groupId>
28
-            <artifactId>spring-boot-test</artifactId>
29
-            <scope>test</scope>
16
+            <version>${revision}</version>
30
         </dependency>
17
         </dependency>
31
         <dependency>
18
         <dependency>
32
-            <groupId>junit</groupId>
33
-            <artifactId>junit</artifactId>
34
-            <scope>test</scope>
19
+            <groupId>org.projectlombok</groupId>
20
+            <artifactId>lombok</artifactId>
21
+            <scope>provided</scope>
35
         </dependency>
22
         </dependency>
36
         <dependency>
23
         <dependency>
37
-            <groupId>com.baomidou</groupId>
38
-            <artifactId>mybatis-plus-generator</artifactId>
39
-            <version>3.5.1</version>
24
+            <groupId>com.google.auto.service</groupId>
25
+            <artifactId>auto-service</artifactId>
26
+            <scope>provided</scope>
40
         </dependency>
27
         </dependency>
41
         <dependency>
28
         <dependency>
42
-            <groupId>com.alibaba</groupId>
43
-            <artifactId>easyexcel</artifactId>
44
-            <version>4.0.1</version> <!-- 请检查并使用最新稳定版本 -->
29
+            <groupId>com.zzsmart.qomo</groupId>
30
+            <artifactId>qomo-data-integration</artifactId>
45
         </dependency>
31
         </dependency>
46
         <dependency>
32
         <dependency>
47
-            <groupId>commons-io</groupId>
48
-            <artifactId>commons-io</artifactId>
49
-            <version>2.11.0</version>
33
+            <groupId>org.projectlombok</groupId>
34
+            <artifactId>lombok</artifactId>
35
+            <version>RELEASE</version>
36
+            <scope>compile</scope>
50
         </dependency>
37
         </dependency>
51
         <dependency>
38
         <dependency>
52
             <groupId>org.apache.poi</groupId>
39
             <groupId>org.apache.poi</groupId>
58
             <artifactId>poi-ooxml</artifactId>
45
             <artifactId>poi-ooxml</artifactId>
59
             <version>5.2.3</version>
46
             <version>5.2.3</version>
60
         </dependency>
47
         </dependency>
48
+        <!--自己添加的依赖-->
49
+<!--        <dependency>-->
50
+<!--            <groupId>commons-io</groupId>-->
51
+<!--            <artifactId>commons-io</artifactId>-->
52
+<!--            <version>2.11.0</version>-->
53
+<!--        </dependency>-->
54
+        <dependency>
55
+            <groupId>com.alibaba</groupId>
56
+            <artifactId>easyexcel</artifactId>
57
+            <version>4.0.1</version> <!-- 请检查并使用最新稳定版本 -->
58
+        </dependency>
61
     </dependencies>
59
     </dependencies>
62
-
63
 </project>
60
 </project>

+ 0
- 11
qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/CostStandardDetailController.java Ver fichero

1
 package com.zzsmart.qomo.kn.cost.manage.controller;
1
 package com.zzsmart.qomo.kn.cost.manage.controller;
2
 
2
 
3
 
3
 
4
-import com.alibaba.excel.EasyExcel;
5
 import com.alibaba.fastjson.JSONObject;
4
 import com.alibaba.fastjson.JSONObject;
6
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
7
 import com.baomidou.mybatisplus.core.metadata.IPage;
5
 import com.baomidou.mybatisplus.core.metadata.IPage;
8
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
6
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
9
-import com.google.gson.JsonObject;
10
 import com.zzsmart.qomo.kn.cost.manage.entity.CostStandardDetail;
7
 import com.zzsmart.qomo.kn.cost.manage.entity.CostStandardDetail;
11
 import com.zzsmart.qomo.kn.cost.manage.service.CostStandardDetailService;
8
 import com.zzsmart.qomo.kn.cost.manage.service.CostStandardDetailService;
12
 import com.zzsmart.qomo.kn.cost.manage.vo.CostStandardDetailSearch;
9
 import com.zzsmart.qomo.kn.cost.manage.vo.CostStandardDetailSearch;
16
 import lombok.extern.slf4j.Slf4j;
13
 import lombok.extern.slf4j.Slf4j;
17
 import org.jeecg.common.api.vo.Result;
14
 import org.jeecg.common.api.vo.Result;
18
 import org.jeecg.common.system.base.controller.JeecgController;
15
 import org.jeecg.common.system.base.controller.JeecgController;
19
-import org.jeecg.common.system.query.QueryGenerator;
20
 import org.springframework.beans.factory.annotation.Autowired;
16
 import org.springframework.beans.factory.annotation.Autowired;
21
 import org.springframework.web.bind.annotation.*;
17
 import org.springframework.web.bind.annotation.*;
22
 
18
 
23
 import javax.servlet.http.HttpServletRequest;
19
 import javax.servlet.http.HttpServletRequest;
24
 import javax.servlet.http.HttpServletResponse;
20
 import javax.servlet.http.HttpServletResponse;
25
 import java.io.IOException;
21
 import java.io.IOException;
26
-import java.lang.reflect.Field;
27
-import java.util.HashSet;
28
-import java.util.List;
29
-import java.util.Set;
30
-
31
-import static com.zzsmart.qomo.kn.cost.manage.util.EasyExcelUtil.getExcelPropertyAnnotatedFields;
32
-import static com.zzsmart.qomo.kn.cost.manage.util.EasyExcelUtil.getIncludeFields;
33
 
22
 
34
 /**
23
 /**
35
  * <p>
24
  * <p>

+ 31
- 30
qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/entity/CostStandardDetail.java Ver fichero

1
 package com.zzsmart.qomo.kn.cost.manage.entity;
1
 package com.zzsmart.qomo.kn.cost.manage.entity;
2
 
2
 
3
-import com.alibaba.excel.annotation.ExcelProperty;
4
 import com.baomidou.mybatisplus.annotation.IdType;
3
 import com.baomidou.mybatisplus.annotation.IdType;
5
 import com.baomidou.mybatisplus.annotation.TableField;
4
 import com.baomidou.mybatisplus.annotation.TableField;
6
 import com.baomidou.mybatisplus.annotation.TableId;
5
 import com.baomidou.mybatisplus.annotation.TableId;
7
 import com.baomidou.mybatisplus.annotation.TableName;
6
 import com.baomidou.mybatisplus.annotation.TableName;
7
+import io.swagger.annotations.ApiModelProperty;
8
+import lombok.Data;
9
+import lombok.EqualsAndHashCode;
10
+import lombok.experimental.Accessors;
11
+import org.jeecgframework.poi.excel.annotation.Excel;
12
+
8
 import java.io.Serializable;
13
 import java.io.Serializable;
9
 import java.math.BigDecimal;
14
 import java.math.BigDecimal;
10
 import java.time.LocalDateTime;
15
 import java.time.LocalDateTime;
11
 
16
 
12
-import io.swagger.annotations.ApiModelProperty;
13
-import lombok.*;
14
-import lombok.experimental.Accessors;
15
-
16
 /**
17
 /**
17
  * <p>
18
  * <p>
18
  * 标准成本明细表
19
  * 标准成本明细表
19
  * </p>
20
  * </p>
20
  *
21
  *
21
- * @author  
22
+ * @author
22
  * @since 2024-06-20
23
  * @since 2024-06-20
23
  */
24
  */
24
 @Data
25
 @Data
40
      */
41
      */
41
     @TableField("material_number")
42
     @TableField("material_number")
42
     @ApiModelProperty(value = "物料号,关联kn_new_sap_mara表matnr字段")
43
     @ApiModelProperty(value = "物料号,关联kn_new_sap_mara表matnr字段")
43
-    @ExcelProperty("物料号")
44
+    @Excel(name = "物料号")
44
     private String materialNumber;
45
     private String materialNumber;
45
 
46
 
46
     /**
47
     /**
48
      */
49
      */
49
     @TableField("material_name")
50
     @TableField("material_name")
50
     @ApiModelProperty(value = "物料名称")
51
     @ApiModelProperty(value = "物料名称")
51
-    @ExcelProperty("物料名称")
52
+    @Excel(name = "物料名称")
52
     private String materialName;
53
     private String materialName;
53
 
54
 
54
     /**
55
     /**
56
      */
57
      */
57
     @TableField("parent_material_number")
58
     @TableField("parent_material_number")
58
     @ApiModelProperty(value = "父类物料号")
59
     @ApiModelProperty(value = "父类物料号")
59
-    @ExcelProperty("父类物料号")
60
+    @Excel(name = "父类物料号")
60
     private String parentMaterialNumber;
61
     private String parentMaterialNumber;
61
 
62
 
62
     /**
63
     /**
71
      */
72
      */
72
     @TableField("level")
73
     @TableField("level")
73
     @ApiModelProperty(value = "层级")
74
     @ApiModelProperty(value = "层级")
74
-    @ExcelProperty("层级")
75
+    @Excel(name = "层级")
75
     private Integer level;
76
     private Integer level;
76
 
77
 
77
     /**
78
     /**
79
      */
80
      */
80
     @TableField("figure_number")
81
     @TableField("figure_number")
81
     @ApiModelProperty(value = "图号")
82
     @ApiModelProperty(value = "图号")
82
-    @ExcelProperty("图号")
83
+    @Excel(name = "图号")
83
     private String figureNumber;
84
     private String figureNumber;
84
 
85
 
85
     /**
86
     /**
87
      */
88
      */
88
     @TableField("dosage")
89
     @TableField("dosage")
89
     @ApiModelProperty(value = "用量")
90
     @ApiModelProperty(value = "用量")
90
-    @ExcelProperty("用量")
91
+    @Excel(name = "用量")
91
     private Double dosage;
92
     private Double dosage;
92
 
93
 
93
     /**
94
     /**
95
      */
96
      */
96
     @TableField("unit")
97
     @TableField("unit")
97
     @ApiModelProperty(value = "单位")
98
     @ApiModelProperty(value = "单位")
98
-    @ExcelProperty("单位")
99
+    @Excel(name = "单位")
99
     private String unit;
100
     private String unit;
100
 
101
 
101
     /**
102
     /**
103
      */
104
      */
104
     @TableField("specification")
105
     @TableField("specification")
105
     @ApiModelProperty(value = "规格")
106
     @ApiModelProperty(value = "规格")
106
-    @ExcelProperty("规格")
107
+    @Excel(name = "规格")
107
     private String specification;
108
     private String specification;
108
 
109
 
109
     /**
110
     /**
111
      */
112
      */
112
     @TableField("bom_cost")
113
     @TableField("bom_cost")
113
     @ApiModelProperty(value = "bom材料费")
114
     @ApiModelProperty(value = "bom材料费")
114
-    @ExcelProperty("bom材料费")
115
+    @Excel(name = "bom材料费")
115
     private BigDecimal bomCost;
116
     private BigDecimal bomCost;
116
 
117
 
117
     /**
118
     /**
119
      */
120
      */
120
     @TableField("packing_cost")
121
     @TableField("packing_cost")
121
     @ApiModelProperty(value = "包装费")
122
     @ApiModelProperty(value = "包装费")
122
-    @ExcelProperty("包装费")
123
+    @Excel(name = "包装费")
123
     private BigDecimal packingCost;
124
     private BigDecimal packingCost;
124
 
125
 
125
     /**
126
     /**
127
      */
128
      */
128
     @TableField("auxiliary_cost")
129
     @TableField("auxiliary_cost")
129
     @ApiModelProperty(value = "本阶辅料费")
130
     @ApiModelProperty(value = "本阶辅料费")
130
-    @ExcelProperty("本阶辅料费")
131
+    @Excel(name = "本阶辅料费")
131
     private BigDecimal auxiliaryCost;
132
     private BigDecimal auxiliaryCost;
132
 
133
 
133
     /**
134
     /**
135
      */
136
      */
136
     @TableField("labor_cost")
137
     @TableField("labor_cost")
137
     @ApiModelProperty(value = "本阶人工费")
138
     @ApiModelProperty(value = "本阶人工费")
138
-    @ExcelProperty("本阶人工费")
139
+    @Excel(name = "本阶人工费")
139
     private BigDecimal laborCost;
140
     private BigDecimal laborCost;
140
 
141
 
141
     /**
142
     /**
143
      */
144
      */
144
     @TableField("euip_depreciation_cost")
145
     @TableField("euip_depreciation_cost")
145
     @ApiModelProperty(value = "机器折旧费")
146
     @ApiModelProperty(value = "机器折旧费")
146
-    @ExcelProperty("机器折旧费")
147
+    @Excel(name = "机器折旧费")
147
     private BigDecimal euipDepreciationCost;
148
     private BigDecimal euipDepreciationCost;
148
 
149
 
149
     /**
150
     /**
151
      */
152
      */
152
     @TableField("equip_consume_cost")
153
     @TableField("equip_consume_cost")
153
     @ApiModelProperty(value = "机物料消耗费")
154
     @ApiModelProperty(value = "机物料消耗费")
154
-    @ExcelProperty("机物料消耗费")
155
+    @Excel(name = "机物料消耗费")
155
     private BigDecimal equipConsumeCost;
156
     private BigDecimal equipConsumeCost;
156
 
157
 
157
     /**
158
     /**
159
      */
160
      */
160
     @TableField("hydroelectricity_cost")
161
     @TableField("hydroelectricity_cost")
161
     @ApiModelProperty(value = "水电费")
162
     @ApiModelProperty(value = "水电费")
162
-    @ExcelProperty("水电费")
163
+    @Excel(name = "水电费")
163
     private BigDecimal hydroelectricityCost;
164
     private BigDecimal hydroelectricityCost;
164
 
165
 
165
     /**
166
     /**
167
      */
168
      */
168
     @TableField("other_cost")
169
     @TableField("other_cost")
169
     @ApiModelProperty(value = "其他制造费")
170
     @ApiModelProperty(value = "其他制造费")
170
-    @ExcelProperty("其他制造费")
171
+    @Excel(name = "其他制造费")
171
     private BigDecimal otherCost;
172
     private BigDecimal otherCost;
172
 
173
 
173
     /**
174
     /**
175
      */
176
      */
176
     @TableField("trail_cost")
177
     @TableField("trail_cost")
177
     @ApiModelProperty(value = "物流费")
178
     @ApiModelProperty(value = "物流费")
178
-    @ExcelProperty("物流费")
179
+    @Excel(name = "物流费")
179
     private BigDecimal trailCost;
180
     private BigDecimal trailCost;
180
 
181
 
181
     /**
182
     /**
183
      */
184
      */
184
     @TableField("manufacture_cost")
185
     @TableField("manufacture_cost")
185
     @ApiModelProperty(value = "制造成本")
186
     @ApiModelProperty(value = "制造成本")
186
-    @ExcelProperty("制造成本")
187
+    @Excel(name = "制造成本")
187
     private BigDecimal manufactureCost;
188
     private BigDecimal manufactureCost;
188
 
189
 
189
     /**
190
     /**
191
      */
192
      */
192
     @TableField("total_labor_cost")
193
     @TableField("total_labor_cost")
193
     @ApiModelProperty(value = "累计人工费")
194
     @ApiModelProperty(value = "累计人工费")
194
-    @ExcelProperty("累计人工费")
195
+    @Excel(name = "累计人工费")
195
     private BigDecimal totalLaborCost;
196
     private BigDecimal totalLaborCost;
196
 
197
 
197
     /**
198
     /**
199
      */
200
      */
200
     @TableField("total_equip_consume_cost")
201
     @TableField("total_equip_consume_cost")
201
     @ApiModelProperty(value = "累计机器消耗费")
202
     @ApiModelProperty(value = "累计机器消耗费")
202
-    @ExcelProperty("累计机器消耗费")
203
+    @Excel(name = "累计机器消耗费")
203
     private BigDecimal totalEquipConsumeCost;
204
     private BigDecimal totalEquipConsumeCost;
204
 
205
 
205
     /**
206
     /**
207
      */
208
      */
208
     @TableField("total_euip_depreciation_cost")
209
     @TableField("total_euip_depreciation_cost")
209
     @ApiModelProperty(value = "累计机器折旧费")
210
     @ApiModelProperty(value = "累计机器折旧费")
210
-    @ExcelProperty("累计机器折旧费")
211
+    @Excel(name = "累计机器折旧费")
211
     private BigDecimal totalEuipDepreciationCost;
212
     private BigDecimal totalEuipDepreciationCost;
212
 
213
 
213
     /**
214
     /**
215
      */
216
      */
216
     @TableField("total_hydroelectricity_cost")
217
     @TableField("total_hydroelectricity_cost")
217
     @ApiModelProperty(value = "累计水电费")
218
     @ApiModelProperty(value = "累计水电费")
218
-    @ExcelProperty("累计水电费")
219
+    @Excel(name = "累计水电费")
219
     private BigDecimal totalHydroelectricityCost;
220
     private BigDecimal totalHydroelectricityCost;
220
 
221
 
221
     /**
222
     /**
223
      */
224
      */
224
     @TableField("total_other_cost")
225
     @TableField("total_other_cost")
225
     @ApiModelProperty(value = "累计其它费用")
226
     @ApiModelProperty(value = "累计其它费用")
226
-    @ExcelProperty("累计其它费用")
227
+    @Excel(name = "累计其它费用")
227
     private BigDecimal totalOtherCost;
228
     private BigDecimal totalOtherCost;
228
 
229
 
229
     /**
230
     /**
266
      */
267
      */
267
     @TableField("sort")
268
     @TableField("sort")
268
     @ApiModelProperty(value = "序号")
269
     @ApiModelProperty(value = "序号")
269
-    @ExcelProperty("序号")
270
+    @Excel(name = "序号")
270
     private Integer sort;
271
     private Integer sort;
271
 
272
 
272
 }
273
 }