From ef686c0db1791469281f651e39b3c43971b92291 Mon Sep 17 00:00:00 2001 From: wangqiong <1322446236@qq.com> Date: Mon, 22 Jul 2024 11:28:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9pom=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=E4=B8=8E=E5=B9=B3=E5=8F=B0=E4=BE=9D=E8=B5=96=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 69 +++++++++++++++---- qomo-kn-cost-manage-start/pom.xml | 51 +++++++++++++- qomo-kn-cost-manage/pom.xml | 53 +++++++------- .../CostStandardDetailController.java | 11 --- .../manage/entity/CostStandardDetail.java | 61 ++++++++-------- 5 files changed, 159 insertions(+), 86 deletions(-) diff --git a/pom.xml b/pom.xml index 239a588..7f9a66e 100644 --- a/pom.xml +++ b/pom.xml @@ -1,12 +1,17 @@ - + + 4.0.0 com.zzsmart.qomo qomo-kn-forecast ${revision} pom - QOMO FORECAST - + QOMO Cost Manage + + qomo-kn-cost-manage-start + qomo-kn-cost-manage + 武汉中制智造 @@ -24,13 +29,8 @@ 2.0.0-SNAPSHOT 2.0.0-SNAPSHOT + 2.0.0-SNAPSHOT - - - qomo-kn-cost-manage-start - qomo-kn-cost-manage - - zzzz @@ -99,13 +99,52 @@ ${revision} - commons-io - commons-io - 2.11.0 + com.zzsmart.qomo + qomo-data-model + ${dmp.version} + + + com.zzsmart.qomo + qomo-assets-management + ${dmp.version} + + + + com.zzsmart.qomo + qomo-data-integration + ${dmp.version} + + + + com.zzsmart.qomo + qomo-data-metadata + ${dmp.version} + + + + com.zzsmart.qomo + qomo-work-flow + ${dmp.version} + + + + com.zzsmart.qomo + qomo-data-warehouse + ${dmp.version} + + + com.zzsmart.qomo + qomo-data-selfReport + ${dmp.version} + + + + + + - @@ -180,4 +219,4 @@ - + \ No newline at end of file diff --git a/qomo-kn-cost-manage-start/pom.xml b/qomo-kn-cost-manage-start/pom.xml index 6818928..ccb8b34 100644 --- a/qomo-kn-cost-manage-start/pom.xml +++ b/qomo-kn-cost-manage-start/pom.xml @@ -2,13 +2,12 @@ + 4.0.0 com.zzsmart.qomo qomo-kn-forecast ${revision} - 4.0.0 - qomo-kn-cost-manage-start @@ -52,4 +51,52 @@ + + + dmp + + + true + + + dmp + + + + com.zzsmart.qomo + qomo-data-model + + + + com.zzsmart.qomo + qomo-assets-management + + + + com.zzsmart.qomo + qomo-data-integration + + + + com.zzsmart.qomo + qomo-data-metadata + + + + com.zzsmart.qomo + qomo-work-flow + + + + com.zzsmart.qomo + qomo-data-warehouse + + + com.zzsmart.qomo + qomo-data-selfReport + + + + + \ No newline at end of file diff --git a/qomo-kn-cost-manage/pom.xml b/qomo-kn-cost-manage/pom.xml index 47dba37..1e4276b 100644 --- a/qomo-kn-cost-manage/pom.xml +++ b/qomo-kn-cost-manage/pom.xml @@ -2,51 +2,38 @@ + 4.0.0 com.zzsmart.qomo qomo-kn-forecast ${revision} - 4.0.0 - qomo-kn-cost-manage - - - 8 - 8 - UTF-8 - - org.qomo.boot qomo-system-biz - 2.0.1-SNAPSHOT + ${revision} - org.springframework.boot - spring-boot-test - test + org.projectlombok + lombok + provided - junit - junit - test + com.google.auto.service + auto-service + provided - com.baomidou - mybatis-plus-generator - 3.5.1 + com.zzsmart.qomo + qomo-data-integration - com.alibaba - easyexcel - 4.0.1 - - - commons-io - commons-io - 2.11.0 + org.projectlombok + lombok + RELEASE + compile org.apache.poi @@ -58,6 +45,16 @@ poi-ooxml 5.2.3 + + + + + + + + com.alibaba + easyexcel + 4.0.1 + - \ No newline at end of file diff --git a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/CostStandardDetailController.java b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/CostStandardDetailController.java index 1ab818d..2b7586e 100644 --- a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/CostStandardDetailController.java +++ b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/CostStandardDetailController.java @@ -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; /** *

diff --git a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/entity/CostStandardDetail.java b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/entity/CostStandardDetail.java index d41ac67..7318f6f 100644 --- a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/entity/CostStandardDetail.java +++ b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/entity/CostStandardDetail.java @@ -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; - /** *

* 标准成本明细表 *

* - * @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; }