diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/procedure/vo/ProcedurePageReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/procedure/vo/ProcedurePageReqVO.java index c36194db..4b9180be 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/procedure/vo/ProcedurePageReqVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/procedure/vo/ProcedurePageReqVO.java @@ -1,10 +1,13 @@ package com.chanko.yunxi.mes.module.heli.controller.admin.procedure.vo; -import lombok.*; -import java.util.*; -import io.swagger.v3.oas.annotations.media.Schema; import com.chanko.yunxi.mes.framework.common.pojo.PageParam; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; import org.springframework.format.annotation.DateTimeFormat; + +import java.math.BigDecimal; import java.time.LocalDateTime; import static com.chanko.yunxi.mes.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @@ -53,4 +56,13 @@ public class ProcedurePageReqVO extends PageParam { @Schema(description = "车间ID", example = "13738") private Long wid; -} \ No newline at end of file + @Schema(description = "工序类型", example = "1") + private String procedureType; + + @Schema(description = "额定工时1") + private BigDecimal standard1Time; + + @Schema(description = "额定工时2") + private BigDecimal standard2Time; + +} diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/procedure/vo/ProcedureRespVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/procedure/vo/ProcedureRespVO.java index 0fc25fcc..68b85673 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/procedure/vo/ProcedureRespVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/procedure/vo/ProcedureRespVO.java @@ -1,14 +1,14 @@ package com.chanko.yunxi.mes.module.heli.controller.admin.procedure.vo; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; -import java.util.*; -import org.springframework.format.annotation.DateTimeFormat; -import java.time.LocalDateTime; -import com.alibaba.excel.annotation.*; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; import com.chanko.yunxi.mes.framework.excel.core.annotations.DictFormat; import com.chanko.yunxi.mes.framework.excel.core.convert.DictConvert; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.math.BigDecimal; +import java.time.LocalDateTime; @Schema(description = "管理后台 - 工序 Response VO") @Data @@ -48,4 +48,17 @@ public class ProcedureRespVO { @ExcelProperty("车间ID") private Long wid; -} \ No newline at end of file + @Schema(description = "工序类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @ExcelProperty(value = "工序类型", converter = DictConvert.class) + @DictFormat("heli_procedure_type") // TODO 代码优化:建议设置到对应的 DictTypeConstants 枚举类中 + private String procedureType; + + @Schema(description = "额定工时1") + @ExcelProperty("额定工时1") + private BigDecimal standard1Time; + + @Schema(description = "额定工时2") + @ExcelProperty("额定工时2") + private BigDecimal standard2Time; + +} diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/procedure/vo/ProcedureSaveReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/procedure/vo/ProcedureSaveReqVO.java index fc08bf57..47f7a13b 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/procedure/vo/ProcedureSaveReqVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/procedure/vo/ProcedureSaveReqVO.java @@ -1,10 +1,11 @@ package com.chanko.yunxi.mes.module.heli.controller.admin.procedure.vo; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; -import javax.validation.constraints.*; -import java.util.*; +import lombok.Data; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.math.BigDecimal; @Schema(description = "管理后台 - 工序新增/修改 Request VO") @Data @@ -33,4 +34,14 @@ public class ProcedureSaveReqVO { @Schema(description = "车间ID", example = "13738") private Long wid; + @Schema(description = "工序类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @NotEmpty(message = "工序类型不能为空") + private String procedureType; + + @Schema(description = "额定工时1") + private BigDecimal standard1Time; + + @Schema(description = "额定工时2") + private BigDecimal standard2Time; + } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/procedure/ProcedureDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/procedure/ProcedureDO.java index 5ac13d95..33b1c7d2 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/procedure/ProcedureDO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/procedure/ProcedureDO.java @@ -1,11 +1,12 @@ package com.chanko.yunxi.mes.module.heli.dal.dataobject.procedure; -import lombok.*; -import java.util.*; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.KeySequence; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import com.chanko.yunxi.mes.framework.mybatis.core.dataobject.BaseDO; +import lombok.*; + +import java.math.BigDecimal; /** * 工序 DO @@ -55,5 +56,19 @@ public class ProcedureDO extends BaseDO { * 车间ID */ private Long wid; + /** + * 工序类型 + * + * 枚举 {@link TODO heli_procedure_type 对应的类} + */ + private String procedureType; + /** + * 额定工时1 + */ + private BigDecimal standard1Time; + /** + * 额定工时2 + */ + private BigDecimal standard2Time; -} \ No newline at end of file +} diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/procedure/ProcedureMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/procedure/ProcedureMapper.java index f8fea29b..8d2881f8 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/procedure/ProcedureMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/procedure/ProcedureMapper.java @@ -30,7 +30,10 @@ public interface ProcedureMapper extends BaseMapperX { .eqIfPresent(ProcedureDO::getDeleted, reqVO.getDeleted()) .eqIfPresent(ProcedureDO::getIsReport, reqVO.getIsReport()) .eqIfPresent(ProcedureDO::getWid, reqVO.getWid()) + .eqIfPresent(ProcedureDO::getProcedureType, reqVO.getProcedureType()) + .eqIfPresent(ProcedureDO::getStandard1Time, reqVO.getStandard1Time()) + .eqIfPresent(ProcedureDO::getStandard2Time, reqVO.getStandard2Time()) .orderByDesc(ProcedureDO::getId)); } -} \ No newline at end of file +} diff --git a/mes-ui/mes-ui-admin-vue3/src/api/heli/procedure/index.ts b/mes-ui/mes-ui-admin-vue3/src/api/heli/procedure/index.ts index 8ce28471..24f6a0cf 100644 --- a/mes-ui/mes-ui-admin-vue3/src/api/heli/procedure/index.ts +++ b/mes-ui/mes-ui-admin-vue3/src/api/heli/procedure/index.ts @@ -8,6 +8,9 @@ export interface ProcedureVO { status: number isreport: number wid: number + procedureType: string + standard1Time: number + standard2Time: number } // 查询工序分页 diff --git a/mes-ui/mes-ui-admin-vue3/src/utils/dict.ts b/mes-ui/mes-ui-admin-vue3/src/utils/dict.ts index d76a6c36..16764302 100644 --- a/mes-ui/mes-ui-admin-vue3/src/utils/dict.ts +++ b/mes-ui/mes-ui-admin-vue3/src/utils/dict.ts @@ -217,5 +217,6 @@ export enum DICT_TYPE { HELI_MATERIAL_ORIGINAL = 'heli_material_original', // 物料主要来源 HELI_COMMON_IS_OR_NOT = 'heli_common_is_or_not', // 是否数字类型 + HELI_PROCEDURE_TYPE = 'heli_procedure_type' // 工序类型 } diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/classes/ClassesForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/classes/ClassesForm.vue index 7e5ed914..4d77957e 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/classes/ClassesForm.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/classes/ClassesForm.vue @@ -53,7 +53,7 @@ - + diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/composition/CompositionForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/composition/CompositionForm.vue index fa6f0f5f..38e06101 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/composition/CompositionForm.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/composition/CompositionForm.vue @@ -29,7 +29,7 @@ - + diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/customer/CustomerForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/customer/CustomerForm.vue index 05ba63f9..3ff3c38b 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/customer/CustomerForm.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/customer/CustomerForm.vue @@ -43,7 +43,7 @@ - + diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/employee/UserForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/employee/UserForm.vue index 25e55d57..f825f1ce 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/employee/UserForm.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/employee/UserForm.vue @@ -86,7 +86,7 @@ - + diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/checkFrom.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/checkFrom.vue index d3773ba8..b7f13a85 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/checkFrom.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/checkFrom.vue @@ -56,7 +56,7 @@ - + diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/warehouseFrom.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/warehouseFrom.vue index 25ddd270..f36c2633 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/warehouseFrom.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/warehouseFrom.vue @@ -82,7 +82,7 @@ - + diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/material/MaterialForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/material/MaterialForm.vue index 6afb84a6..061ed112 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/material/MaterialForm.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/material/MaterialForm.vue @@ -81,7 +81,7 @@ - + diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/post/PostForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/post/PostForm.vue index 29ecfe22..f93b190d 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/post/PostForm.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/post/PostForm.vue @@ -28,7 +28,7 @@ - +