kn-cost/cost-backend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
wangqiong
2024-07-22 11:28:28 +08:00
parent a96d28c993
commit ef686c0db1
5 changed files with 159 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pom.xml
+54 -15
View File
@@ -1,12 +1,17 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.zzsmart.qomo</groupId>
<artifactId>qomo-kn-forecast</artifactId>
<version>${revision}</version>
<packaging>pom</packaging>
<name>QOMO FORECAST</name>
<name>QOMO Cost Manage</name>
<modules>
<module>qomo-kn-cost-manage-start</module>
<module>qomo-kn-cost-manage</module>
</modules>
<developers>
<developer>
<name>武汉中制智造</name>
@@ -24,13 +29,8 @@
<properties>
<revision>2.0.0-SNAPSHOT</revision>
<adp.version>2.0.0-SNAPSHOT</adp.version>
<dmp.version>2.0.0-SNAPSHOT</dmp.version>
</properties>
<modules>
<module>qomo-kn-cost-manage-start</module>
<module>qomo-kn-cost-manage</module>
</modules>
<repositories>
<repository>
<id>zzzz</id>
@@ -99,13 +99,52 @@
<version>${revision}</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.11.0</version>
<groupId>com.zzsmart.qomo</groupId>
<artifactId>qomo-data-model</artifactId>
<version>${dmp.version}</version>
</dependency>
<dependency>
<groupId>com.zzsmart.qomo</groupId>
<artifactId>qomo-assets-management</artifactId>
<version>${dmp.version}</version>
</dependency>
<dependency>
<groupId>com.zzsmart.qomo</groupId>
<artifactId>qomo-data-integration</artifactId>
<version>${dmp.version}</version>
</dependency>
<dependency>
<groupId>com.zzsmart.qomo</groupId>
<artifactId>qomo-data-metadata</artifactId>
<version>${dmp.version}</version>
</dependency>
<dependency>
<groupId>com.zzsmart.qomo</groupId>
<artifactId>qomo-work-flow</artifactId>
<version>${dmp.version}</version>
</dependency>
<dependency>
<groupId>com.zzsmart.qomo</groupId>
<artifactId>qomo-data-warehouse</artifactId>
<version>${dmp.version}</version>
</dependency>
<dependency>
<groupId>com.zzsmart.qomo</groupId>
<artifactId>qomo-data-selfReport</artifactId>
<version>${dmp.version}</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>commons-io</groupId>-->
<!-- <artifactId>commons-io</artifactId>-->
<!-- <version>2.11.0</version>-->
<!-- </dependency>-->
</dependencies>
</dependencyManagement>
<!-- 环境 -->
<profiles>
<!-- 开发 -->
@@ -180,4 +219,4 @@
</profile>
<!-- SpringCloud运行环境 -->
</profiles>
</project>
</project>
qomo-kn-cost-manage-start/pom.xml
+49 -2
View File
@@ -2,13 +2,12 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.zzsmart.qomo</groupId>
<artifactId>qomo-kn-forecast</artifactId>
<version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>qomo-kn-cost-manage-start</artifactId>
<properties>
@@ -52,4 +51,52 @@
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>dmp</id>
<activation>
<!--默认激活配置-->
<activeByDefault>true</activeByDefault>
</activation>
<properties>
<profile.name>dmp</profile.name>
</properties>
<dependencies>
<dependency>
<groupId>com.zzsmart.qomo</groupId>
<artifactId>qomo-data-model</artifactId>
</dependency>
<dependency>
<groupId>com.zzsmart.qomo</groupId>
<artifactId>qomo-assets-management</artifactId>
</dependency>
<dependency>
<groupId>com.zzsmart.qomo</groupId>
<artifactId>qomo-data-integration</artifactId>
</dependency>
<dependency>
<groupId>com.zzsmart.qomo</groupId>
<artifactId>qomo-data-metadata</artifactId>
</dependency>
<dependency>
<groupId>com.zzsmart.qomo</groupId>
<artifactId>qomo-work-flow</artifactId>
</dependency>
<dependency>
<groupId>com.zzsmart.qomo</groupId>
<artifactId>qomo-data-warehouse</artifactId>
</dependency>
<dependency>
<groupId>com.zzsmart.qomo</groupId>
<artifactId>qomo-data-selfReport</artifactId>
</dependency>
</dependencies>
</profile>
</profiles>
</project>
qomo-kn-cost-manage/pom.xml
+25 -28
View File
@@ -2,51 +2,38 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.zzsmart.qomo</groupId>
<artifactId>qomo-kn-forecast</artifactId>
<version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>qomo-kn-cost-manage</artifactId>
<properties>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
<dependency>
<groupId>org.qomo.boot</groupId>
<artifactId>qomo-system-biz</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-test</artifactId>
<scope>test</scope>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
<groupId>com.google.auto.service</groupId>
<artifactId>auto-service</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-generator</artifactId>
<version>3.5.1</version>
<groupId>com.zzsmart.qomo</groupId>
<artifactId>qomo-data-integration</artifactId>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>easyexcel</artifactId>
<version>4.0.1</version> <!-- 请检查并使用最新稳定版本 -->
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.11.0</version>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
@@ -58,6 +45,16 @@
<artifactId>poi-ooxml</artifactId>
<version>5.2.3</version>
</dependency>
<!--自己添加的依赖-->
<!-- <dependency>-->
<!-- <groupId>commons-io</groupId>-->
<!-- <artifactId>commons-io</artifactId>-->
<!-- <version>2.11.0</version>-->
<!-- </dependency>-->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>easyexcel</artifactId>
<version>4.0.1</version> <!-- 请检查并使用最新稳定版本 -->
</dependency>
</dependencies>
</project>
qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/CostStandardDetailController.java
-11
View File
@@ -1,12 +1,9 @@
package com.zzsmart.qomo.kn.cost.manage.controller;
import com.alibaba.excel.EasyExcel;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.google.gson.JsonObject;
import com.zzsmart.qomo.kn.cost.manage.entity.CostStandardDetail;
import com.zzsmart.qomo.kn.cost.manage.service.CostStandardDetailService;
import com.zzsmart.qomo.kn.cost.manage.vo.CostStandardDetailSearch;
@@ -16,20 +13,12 @@ import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.lang.reflect.Field;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import static com.zzsmart.qomo.kn.cost.manage.util.EasyExcelUtil.getExcelPropertyAnnotatedFields;
import static com.zzsmart.qomo.kn.cost.manage.util.EasyExcelUtil.getIncludeFields;
/**
* <p>
qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/entity/CostStandardDetail.java
+31 -30
View File
@@ -1,24 +1,25 @@
package com.zzsmart.qomo.kn.cost.manage.entity;
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecgframework.poi.excel.annotation.Excel;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModelProperty;
import lombok.*;
import lombok.experimental.Accessors;
/**
* <p>
* 标准成本明细表
* </p>
*
* @author
* @author
* @since 2024-06-20
*/
@Data
@@ -40,7 +41,7 @@ public class CostStandardDetail implements Serializable {
*/
@TableField("material_number")
@ApiModelProperty(value = "物料号,关联kn_new_sap_mara表matnr字段")
@ExcelProperty("物料号")
@Excel(name = "物料号")
private String materialNumber;
/**
@@ -48,7 +49,7 @@ public class CostStandardDetail implements Serializable {
*/
@TableField("material_name")
@ApiModelProperty(value = "物料名称")
@ExcelProperty("物料名称")
@Excel(name = "物料名称")
private String materialName;
/**
@@ -56,7 +57,7 @@ public class CostStandardDetail implements Serializable {
*/
@TableField("parent_material_number")
@ApiModelProperty(value = "父类物料号")
@ExcelProperty("父类物料号")
@Excel(name = "父类物料号")
private String parentMaterialNumber;
/**
@@ -71,7 +72,7 @@ public class CostStandardDetail implements Serializable {
*/
@TableField("level")
@ApiModelProperty(value = "层级")
@ExcelProperty("层级")
@Excel(name = "层级")
private Integer level;
/**
@@ -79,7 +80,7 @@ public class CostStandardDetail implements Serializable {
*/
@TableField("figure_number")
@ApiModelProperty(value = "图号")
@ExcelProperty("图号")
@Excel(name = "图号")
private String figureNumber;
/**
@@ -87,7 +88,7 @@ public class CostStandardDetail implements Serializable {
*/
@TableField("dosage")
@ApiModelProperty(value = "用量")
@ExcelProperty("用量")
@Excel(name = "用量")
private Double dosage;
/**
@@ -95,7 +96,7 @@ public class CostStandardDetail implements Serializable {
*/
@TableField("unit")
@ApiModelProperty(value = "单位")
@ExcelProperty("单位")
@Excel(name = "单位")
private String unit;
/**
@@ -103,7 +104,7 @@ public class CostStandardDetail implements Serializable {
*/
@TableField("specification")
@ApiModelProperty(value = "规格")
@ExcelProperty("规格")
@Excel(name = "规格")
private String specification;
/**
@@ -111,7 +112,7 @@ public class CostStandardDetail implements Serializable {
*/
@TableField("bom_cost")
@ApiModelProperty(value = "bom材料费")
@ExcelProperty("bom材料费")
@Excel(name = "bom材料费")
private BigDecimal bomCost;
/**
@@ -119,7 +120,7 @@ public class CostStandardDetail implements Serializable {
*/
@TableField("packing_cost")
@ApiModelProperty(value = "包装费")
@ExcelProperty("包装费")
@Excel(name = "包装费")
private BigDecimal packingCost;
/**
@@ -127,7 +128,7 @@ public class CostStandardDetail implements Serializable {
*/
@TableField("auxiliary_cost")
@ApiModelProperty(value = "本阶辅料费")
@ExcelProperty("本阶辅料费")
@Excel(name = "本阶辅料费")
private BigDecimal auxiliaryCost;
/**
@@ -135,7 +136,7 @@ public class CostStandardDetail implements Serializable {
*/
@TableField("labor_cost")
@ApiModelProperty(value = "本阶人工费")
@ExcelProperty("本阶人工费")
@Excel(name = "本阶人工费")
private BigDecimal laborCost;
/**
@@ -143,7 +144,7 @@ public class CostStandardDetail implements Serializable {
*/
@TableField("euip_depreciation_cost")
@ApiModelProperty(value = "机器折旧费")
@ExcelProperty("机器折旧费")
@Excel(name = "机器折旧费")
private BigDecimal euipDepreciationCost;
/**
@@ -151,7 +152,7 @@ public class CostStandardDetail implements Serializable {
*/
@TableField("equip_consume_cost")
@ApiModelProperty(value = "机物料消耗费")
@ExcelProperty("机物料消耗费")
@Excel(name = "机物料消耗费")
private BigDecimal equipConsumeCost;
/**
@@ -159,7 +160,7 @@ public class CostStandardDetail implements Serializable {
*/
@TableField("hydroelectricity_cost")
@ApiModelProperty(value = "水电费")
@ExcelProperty("水电费")
@Excel(name = "水电费")
private BigDecimal hydroelectricityCost;
/**
@@ -167,7 +168,7 @@ public class CostStandardDetail implements Serializable {
*/
@TableField("other_cost")
@ApiModelProperty(value = "其他制造费")
@ExcelProperty("其他制造费")
@Excel(name = "其他制造费")
private BigDecimal otherCost;
/**
@@ -175,7 +176,7 @@ public class CostStandardDetail implements Serializable {
*/
@TableField("trail_cost")
@ApiModelProperty(value = "物流费")
@ExcelProperty("物流费")
@Excel(name = "物流费")
private BigDecimal trailCost;
/**
@@ -183,7 +184,7 @@ public class CostStandardDetail implements Serializable {
*/
@TableField("manufacture_cost")
@ApiModelProperty(value = "制造成本")
@ExcelProperty("制造成本")
@Excel(name = "制造成本")
private BigDecimal manufactureCost;
/**
@@ -191,7 +192,7 @@ public class CostStandardDetail implements Serializable {
*/
@TableField("total_labor_cost")
@ApiModelProperty(value = "累计人工费")
@ExcelProperty("累计人工费")
@Excel(name = "累计人工费")
private BigDecimal totalLaborCost;
/**
@@ -199,7 +200,7 @@ public class CostStandardDetail implements Serializable {
*/
@TableField("total_equip_consume_cost")
@ApiModelProperty(value = "累计机器消耗费")
@ExcelProperty("累计机器消耗费")
@Excel(name = "累计机器消耗费")
private BigDecimal totalEquipConsumeCost;
/**
@@ -207,7 +208,7 @@ public class CostStandardDetail implements Serializable {
*/
@TableField("total_euip_depreciation_cost")
@ApiModelProperty(value = "累计机器折旧费")
@ExcelProperty("累计机器折旧费")
@Excel(name = "累计机器折旧费")
private BigDecimal totalEuipDepreciationCost;
/**
@@ -215,7 +216,7 @@ public class CostStandardDetail implements Serializable {
*/
@TableField("total_hydroelectricity_cost")
@ApiModelProperty(value = "累计水电费")
@ExcelProperty("累计水电费")
@Excel(name = "累计水电费")
private BigDecimal totalHydroelectricityCost;
/**
@@ -223,7 +224,7 @@ public class CostStandardDetail implements Serializable {
*/
@TableField("total_other_cost")
@ApiModelProperty(value = "累计其它费用")
@ExcelProperty("累计其它费用")
@Excel(name = "累计其它费用")
private BigDecimal totalOtherCost;
/**
@@ -266,7 +267,7 @@ public class CostStandardDetail implements Serializable {
*/
@TableField("sort")
@ApiModelProperty(value = "序号")
@ExcelProperty("序号")
@Excel(name = "序号")
private Integer sort;
}