diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseRoute.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseRoute.java index 1027c2c..b8e7a1b 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseRoute.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseRoute.java @@ -4,7 +4,7 @@ import org.dromara.common.tenant.core.TenantEntity; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import lombok.EqualsAndHashCode; - +import java.util.Date; import java.io.Serial; import java.util.List; @@ -39,7 +39,7 @@ public class ProdBaseRoute extends TenantEntity { private String routeDesc; /** - * 激活标识(1是 0否) + * 状态（1待审核 2审核通过 3审核不通过 4发布 5作废） */ private String activeFlag; @@ -54,6 +54,51 @@ public class ProdBaseRoute extends TenantEntity { @TableLogic private String delFlag; + /** + * 工艺路线版本 + */ + private String routeVersion; + + /** + * 生产类型（1正式 2试制 3返修） + */ + private String productionType; + + /** + * 路线类型（1生产 2装配） + */ + private String routeType; + + /** + * 审核原因 + */ + private String auditReason; + + /** + * 审核人 + */ + private Long approveBy; + + /** + * 审核时间 + */ + private Date approveTime; + + /** + * 是否需要首件检验（0否 1是） + */ + private String needFirstInspect; + + /** + * 是否打印流转卡（0继承 1是 2否） + */ + private String printFlowCard; + + /** + * 批次量（0=不拆分） + */ + private Long batchSize; + @TableField(exist = false) List prodBaseRouteProcess;//映射字段 } diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseRouteMaterial.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseRouteMaterial.java new file mode 100644 index 0000000..a026ee0 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseRouteMaterial.java @@ -0,0 +1,50 @@ +package org.dromara.mes.domain; + +import org.dromara.common.tenant.core.TenantEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 工艺路线关联物料对象 prod_base_route_material + * + * @author Yinq + * @date 2025-06-04 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("prod_base_route_material") +public class ProdBaseRouteMaterial extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 关联物料ID + */ + private Long routeMaterialId; + + /** + * 工艺路线ID + */ + private Long routeId; + + /** + * 物料ID + */ + private Long materialId; + + /** + * 激活标识(1是 0否) + */ + private String activeFlag; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdBaseRouteBo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdBaseRouteBo.java index 49e91e6..fe076a7 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdBaseRouteBo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdBaseRouteBo.java @@ -9,6 +9,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import jakarta.validation.constraints.*; +import java.util.Date; import java.util.List; /** @@ -49,6 +50,51 @@ public class ProdBaseRouteBo extends BaseEntity { */ private String remark; + /** + * 工艺路线版本 + */ + private String routeVersion; + + /** + * 生产类型（1正式 2试制 3返修） + */ + private String productionType; + + /** + * 路线类型（1生产 2装配） + */ + private String routeType; + + /** + * 审核原因 + */ + private String auditReason; + + /** + * 审核人 + */ + private Long approveBy; + + /** + * 审核时间 + */ + private Date approveTime; + + /** + * 是否需要首件检验（0否 1是） + */ + private String needFirstInspect; + + /** + * 是否打印流转卡（0继承 1是 2否） + */ + private String printFlowCard; + + /** + * 批次量（0=不拆分） + */ + private Long batchSize; + private List routeProcessBoList; } diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdBaseRouteMaterialBo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdBaseRouteMaterialBo.java new file mode 100644 index 0000000..92e7b33 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdBaseRouteMaterialBo.java @@ -0,0 +1,51 @@ +package org.dromara.mes.domain.bo; + +import org.dromara.mes.domain.ProdBaseRouteMaterial; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; + +/** + * 工艺路线关联物料业务对象 prod_base_route_material + * + * @author Yinq + * @date 2025-06-04 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = ProdBaseRouteMaterial.class, reverseConvertGenerate = false) +public class ProdBaseRouteMaterialBo extends BaseEntity { + + /** + * 关联物料ID + */ + @NotNull(message = "关联物料ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long routeMaterialId; + + /** + * 工艺路线ID + */ + private Long routeId; + + /** + * 物料ID + */ + private Long materialId; + + /** + * 激活标识(1是 0否) + */ + @NotBlank(message = "激活标识(1是 0否)不能为空", groups = { AddGroup.class, EditGroup.class }) + private String activeFlag; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdBaseRouteMaterialVo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdBaseRouteMaterialVo.java new file mode 100644 index 0000000..5d37b06 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdBaseRouteMaterialVo.java @@ -0,0 +1,63 @@ +package org.dromara.mes.domain.vo; + +import org.dromara.mes.domain.ProdBaseRouteMaterial; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 工艺路线关联物料视图对象 prod_base_route_material + * + * @author Yinq + * @date 2025-06-04 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = ProdBaseRouteMaterial.class) +public class ProdBaseRouteMaterialVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 关联物料ID + */ + @ExcelProperty(value = "关联物料ID") + private Long routeMaterialId; + + /** + * 工艺路线ID + */ + @ExcelProperty(value = "工艺路线ID") + private Long routeId; + + /** + * 物料ID + */ + @ExcelProperty(value = "物料ID") + private Long materialId; + + /** + * 激活标识(1是 0否) + */ + @ExcelProperty(value = "激活标识(1是 0否)", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "active_flag") + private String activeFlag; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdBaseRouteVo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdBaseRouteVo.java index b8ed28b..73197e1 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdBaseRouteVo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdBaseRouteVo.java @@ -66,6 +66,64 @@ public class ProdBaseRouteVo implements Serializable { @ExcelProperty(value = "备注") private String remark; + /** + * 工艺路线版本 + */ + @ExcelProperty(value = "工艺路线版本") + private String routeVersion; + + /** + * 生产类型（1正式 2试制 3返修） + */ + @ExcelProperty(value = "生产类型", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "mes_process_production_type") + private String productionType; + + /** + * 路线类型（1生产 2装配） + */ + @ExcelProperty(value = "路线类型", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "mes_route_type") + private String routeType; + + /** + * 审核原因 + */ + @ExcelProperty(value = "审核原因") + private String auditReason; + + /** + * 审核人 + */ + @ExcelProperty(value = "审核人") + private Long approveBy; + + /** + * 审核时间 + */ + @ExcelProperty(value = "审核时间") + private Date approveTime; + + /** + * 是否需要首件检验（0否 1是） + */ + @ExcelProperty(value = "是否需要首件检验", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "mes_need_first_inspect") + private String needFirstInspect; + + /** + * 是否打印流转卡（0继承 1是 2否） + */ + @ExcelProperty(value = "是否打印流转卡", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "mes_print_flow_card") + private String printFlowCard; + + /** + * 批次量（0=不拆分） + */ + @ExcelProperty(value = "批次量") + private Long batchSize; + /** * 创建部门 */ diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/ProdBaseRouteMaterialMapper.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/ProdBaseRouteMaterialMapper.java new file mode 100644 index 0000000..981cc48 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/ProdBaseRouteMaterialMapper.java @@ -0,0 +1,15 @@ +package org.dromara.mes.mapper; + +import org.dromara.mes.domain.ProdBaseRouteMaterial; +import org.dromara.mes.domain.vo.ProdBaseRouteMaterialVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 工艺路线关联物料Mapper接口 + * + * @author Yinq + * @date 2025-06-04 + */ +public interface ProdBaseRouteMaterialMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdBaseRouteServiceImpl.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdBaseRouteServiceImpl.java index 530dec0..5217c40 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdBaseRouteServiceImpl.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdBaseRouteServiceImpl.java @@ -87,13 +87,12 @@ public class ProdBaseRouteServiceImpl implements IProdBaseRouteService { private MPJLambdaWrapper buildQueryWrapper(ProdBaseRouteBo bo) { Map params = bo.getParams(); MPJLambdaWrapper lqw = JoinWrappers.lambda(ProdBaseRoute.class) - .selectAll(ProdBaseRoute.class) .eq(bo.getRouteId() != null, ProdBaseRoute::getRouteId, bo.getRouteId()) .like(StringUtils.isNotBlank(bo.getRouteName()), ProdBaseRoute::getRouteName, bo.getRouteName()) .eq(StringUtils.isNotBlank(bo.getRouteDesc()), ProdBaseRoute::getRouteDesc, bo.getRouteDesc()) .eq(StringUtils.isNotBlank(bo.getActiveFlag()), ProdBaseRoute::getActiveFlag, bo.getActiveFlag()) - .orderByDesc(ProdBaseRoute::getCreateTime); + .orderByAsc(ProdBaseRoute::getCreateTime); return lqw; } diff --git a/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdBaseRouteMaterialMapper.xml b/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdBaseRouteMaterialMapper.xml new file mode 100644 index 0000000..5cfb441 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdBaseRouteMaterialMapper.xml @@ -0,0 +1,7 @@ + + + + +