diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdBaseProdLineInfoController.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdBaseProdLineInfoController.java
new file mode 100644
index 00000000..9706f58d
--- /dev/null
+++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdBaseProdLineInfoController.java
@@ -0,0 +1,116 @@
+package org.dromara.mes.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.mes.domain.vo.ProdBaseProdLineInfoVo;
+import org.dromara.mes.domain.bo.ProdBaseProdLineInfoBo;
+import org.dromara.mes.service.IProdBaseProdLineInfoService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 产线信息
+ * 前端访问路由地址为:/mes/baseProdLineInfo
+ *
+ * @author Yinq
+ * @date 2025-01-06
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/baseProdLineInfo")
+public class ProdBaseProdLineInfoController extends BaseController {
+
+    private final IProdBaseProdLineInfoService prodBaseProdLineInfoService;
+
+    /**
+     * 查询产线信息列表
+     */
+    @SaCheckPermission("mes:baseProdLineInfo:list")
+    @GetMapping("/list")
+    public TableDataInfo<ProdBaseProdLineInfoVo> list(ProdBaseProdLineInfoBo bo, PageQuery pageQuery) {
+        return prodBaseProdLineInfoService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 查询产线信息下拉框列表
+     */
+    @GetMapping("/getProdLineList")
+    public R<List<ProdBaseProdLineInfoVo>> getFactoryList(ProdBaseProdLineInfoBo bo) {
+        List<ProdBaseProdLineInfoVo> list = prodBaseProdLineInfoService.queryList(bo);
+        return R.ok(list);
+    }
+
+
+    /**
+     * 导出产线信息列表
+     */
+    @SaCheckPermission("mes:baseProdLineInfo:export")
+    @Log(title = "产线信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(ProdBaseProdLineInfoBo bo, HttpServletResponse response) {
+        List<ProdBaseProdLineInfoVo> list = prodBaseProdLineInfoService.queryList(bo);
+        ExcelUtil.exportExcel(list, "产线信息", ProdBaseProdLineInfoVo.class, response);
+    }
+
+    /**
+     * 获取产线信息详细信息
+     *
+     * @param prodLineId 主键
+     */
+    @SaCheckPermission("mes:baseProdLineInfo:query")
+    @GetMapping("/{prodLineId}")
+    public R<ProdBaseProdLineInfoVo> getInfo(@NotNull(message = "主键不能为空")
+                                             @PathVariable Long prodLineId) {
+        return R.ok(prodBaseProdLineInfoService.queryById(prodLineId));
+    }
+
+    /**
+     * 新增产线信息
+     */
+    @SaCheckPermission("mes:baseProdLineInfo:add")
+    @Log(title = "产线信息", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody ProdBaseProdLineInfoBo bo) {
+        return toAjax(prodBaseProdLineInfoService.insertByBo(bo));
+    }
+
+    /**
+     * 修改产线信息
+     */
+    @SaCheckPermission("mes:baseProdLineInfo:edit")
+    @Log(title = "产线信息", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ProdBaseProdLineInfoBo bo) {
+        return toAjax(prodBaseProdLineInfoService.updateByBo(bo));
+    }
+
+    /**
+     * 删除产线信息
+     *
+     * @param prodLineIds 主键串
+     */
+    @SaCheckPermission("mes:baseProdLineInfo:remove")
+    @Log(title = "产线信息", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{prodLineIds}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] prodLineIds) {
+        return toAjax(prodBaseProdLineInfoService.deleteWithValidByIds(List.of(prodLineIds), true));
+    }
+}
diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdBaseWorkshopInfoController.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdBaseWorkshopInfoController.java
index 92f15f05..a28c5197 100644
--- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdBaseWorkshopInfoController.java
+++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdBaseWorkshopInfoController.java
@@ -50,8 +50,9 @@ public class ProdBaseWorkshopInfoController extends BaseController {
      * 查询车间信息下拉框列表
      */
     @GetMapping("/getWorkshopList")
-    public List<ProdBaseWorkshopInfoVo> getFactoryList(ProdBaseWorkshopInfoBo bo) {
-        return prodBaseWorkshopInfoService.queryList(bo);
+    public R<List<ProdBaseWorkshopInfoVo>> getFactoryList(ProdBaseWorkshopInfoBo bo) {
+        List<ProdBaseWorkshopInfoVo> list = prodBaseWorkshopInfoService.queryList(bo);
+        return R.ok(list);
     }
 
     /**
diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseProdLineInfo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseProdLineInfo.java
new file mode 100644
index 00000000..7f02b100
--- /dev/null
+++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseProdLineInfo.java
@@ -0,0 +1,63 @@
+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_prod_line_info
+ *
+ * @author Yinq
+ * @date 2025-01-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("prod_base_prod_line_info")
+public class ProdBaseProdLineInfo extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 产线ID
+     */
+    @TableId(value = "prod_line_id", type = IdType.AUTO)
+    private Long prodLineId;
+
+    /**
+     * 产线编号
+     */
+    private String prodLineCode;
+
+    /**
+     * 产线名称
+     */
+    private String prodLineName;
+
+    /**
+     * 产线类型
+     */
+    private String prodLineType;
+
+    /**
+     * 所属车间
+     */
+    private Long workshopId;
+
+    /**
+     * 激活标识（1是 0否）
+     */
+    private String activeFlag;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    @TableField(exist = false)
+    private String workshopName;//字段映射
+
+}
diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdBaseProdLineInfoBo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdBaseProdLineInfoBo.java
new file mode 100644
index 00000000..c160675c
--- /dev/null
+++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdBaseProdLineInfoBo.java
@@ -0,0 +1,63 @@
+package org.dromara.mes.domain.bo;
+
+import org.dromara.mes.domain.ProdBaseProdLineInfo;
+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_prod_line_info
+ *
+ * @author Yinq
+ * @date 2025-01-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = ProdBaseProdLineInfo.class, reverseConvertGenerate = false)
+public class ProdBaseProdLineInfoBo extends BaseEntity {
+
+    /**
+     * 产线ID
+     */
+    private Long prodLineId;
+
+    /**
+     * 产线编号
+     */
+    @NotBlank(message = "产线编号不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String prodLineCode;
+
+    /**
+     * 产线名称
+     */
+    @NotBlank(message = "产线名称不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String prodLineName;
+
+    /**
+     * 产线类型
+     */
+    @NotBlank(message = "产线类型不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String prodLineType;
+
+    /**
+     * 所属车间
+     */
+    @NotNull(message = "所属车间不能为空", groups = {AddGroup.class, EditGroup.class})
+    private Long workshopId;
+
+    /**
+     * 激活标识（1是 0否）
+     */
+    private String activeFlag;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}
diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdBaseProdLineInfoVo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdBaseProdLineInfoVo.java
new file mode 100644
index 00000000..3a268eff
--- /dev/null
+++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdBaseProdLineInfoVo.java
@@ -0,0 +1,118 @@
+package org.dromara.mes.domain.vo;
+
+import org.dromara.mes.domain.ProdBaseProdLineInfo;
+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_prod_line_info
+ *
+ * @author Yinq
+ * @date 2025-01-06
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = ProdBaseProdLineInfo.class)
+public class ProdBaseProdLineInfoVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 产线ID
+     */
+    @ExcelProperty(value = "产线ID")
+    private Long prodLineId;
+
+    /**
+     * 租户编号
+     */
+    @ExcelProperty(value = "租户编号")
+    private String tenantId;
+
+    /**
+     * 产线编号
+     */
+    @ExcelProperty(value = "产线编号")
+    private String prodLineCode;
+
+    /**
+     * 产线名称
+     */
+    @ExcelProperty(value = "产线名称")
+    private String prodLineName;
+
+    /**
+     * 产线类型
+     */
+    @ExcelProperty(value = "产线类型", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "prod_line_type")
+    private String prodLineType;
+
+    /**
+     * 所属车间
+     */
+    @ExcelProperty(value = "所属车间")
+    private Long workshopId;
+
+    /**
+     * 所属车间名称
+     */
+    @ExcelProperty(value = "所属车间名称")
+    private String workshopName;
+
+    /**
+     * 激活标识（1是 0否）
+     */
+    @ExcelProperty(value = "激活标识", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "active_flag")
+    private String activeFlag;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+    /**
+     * 创建部门
+     */
+    @ExcelProperty(value = "创建部门")
+    private Long createDept;
+
+    /**
+     * 创建人
+     */
+    @ExcelProperty(value = "创建人")
+    private Long createBy;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "创建时间")
+    private Date createTime;
+
+    /**
+     * 更新人
+     */
+    @ExcelProperty(value = "更新人")
+    private Long updateBy;
+
+    /**
+     * 更新时间
+     */
+    @ExcelProperty(value = "更新时间")
+    private Date updateTime;
+
+
+}
diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdBaseWorkshopInfoVo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdBaseWorkshopInfoVo.java
index 0bba328f..db706f8c 100644
--- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdBaseWorkshopInfoVo.java
+++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdBaseWorkshopInfoVo.java
@@ -58,6 +58,12 @@ public class ProdBaseWorkshopInfoVo implements Serializable {
     @ExcelProperty(value = "所属工厂ID")
     private Long factoryId;
 
+    /**
+     * 所属工厂名称
+     */
+    @ExcelProperty(value = "所属工厂名称")
+    private String factoryName;
+
     /**
      * 激活标识(1是 0否)
      */
@@ -100,10 +106,4 @@ public class ProdBaseWorkshopInfoVo implements Serializable {
     @ExcelProperty(value = "更新时间")
     private Date updateTime;
 
-    /**
-     * 所属工厂名称
-     */
-    @ExcelProperty(value = "所属工厂名称")
-    private String factoryName;
-
 }
diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/ProdBaseProdLineInfoMapper.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/ProdBaseProdLineInfoMapper.java
new file mode 100644
index 00000000..81431db0
--- /dev/null
+++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/ProdBaseProdLineInfoMapper.java
@@ -0,0 +1,15 @@
+package org.dromara.mes.mapper;
+
+import org.dromara.mes.domain.ProdBaseProdLineInfo;
+import org.dromara.mes.domain.vo.ProdBaseProdLineInfoVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 产线信息Mapper接口
+ *
+ * @author Yinq
+ * @date 2025-01-06
+ */
+public interface ProdBaseProdLineInfoMapper extends BaseMapperPlus<ProdBaseProdLineInfo, ProdBaseProdLineInfoVo> {
+
+}
diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IProdBaseProdLineInfoService.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IProdBaseProdLineInfoService.java
new file mode 100644
index 00000000..c39a6d84
--- /dev/null
+++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IProdBaseProdLineInfoService.java
@@ -0,0 +1,69 @@
+package org.dromara.mes.service;
+
+import org.dromara.mes.domain.ProdBaseProdLineInfo;
+import org.dromara.mes.domain.vo.ProdBaseProdLineInfoVo;
+import org.dromara.mes.domain.bo.ProdBaseProdLineInfoBo;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 产线信息Service接口
+ *
+ * @author Yinq
+ * @date 2025-01-06
+ */
+public interface IProdBaseProdLineInfoService {
+
+    /**
+     * 查询产线信息
+     *
+     * @param prodLineId 主键
+     * @return 产线信息
+     */
+    ProdBaseProdLineInfoVo queryById(Long prodLineId);
+
+    /**
+     * 分页查询产线信息列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 产线信息分页列表
+     */
+    TableDataInfo<ProdBaseProdLineInfoVo> queryPageList(ProdBaseProdLineInfoBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的产线信息列表
+     *
+     * @param bo 查询条件
+     * @return 产线信息列表
+     */
+    List<ProdBaseProdLineInfoVo> queryList(ProdBaseProdLineInfoBo bo);
+
+    /**
+     * 新增产线信息
+     *
+     * @param bo 产线信息
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(ProdBaseProdLineInfoBo bo);
+
+    /**
+     * 修改产线信息
+     *
+     * @param bo 产线信息
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(ProdBaseProdLineInfoBo bo);
+
+    /**
+     * 校验并批量删除产线信息信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}
diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdBaseFactoryInfoServiceImpl.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdBaseFactoryInfoServiceImpl.java
index 47114050..73f17fbd 100644
--- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdBaseFactoryInfoServiceImpl.java
+++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdBaseFactoryInfoServiceImpl.java
@@ -78,7 +78,7 @@ public class ProdBaseFactoryInfoServiceImpl implements IProdBaseFactoryInfoServi
         lqw.eq(StringUtils.isNotBlank(bo.getTimeZone()), ProdBaseFactoryInfo::getTimeZone, bo.getTimeZone());
         lqw.eq(StringUtils.isNotBlank(bo.getFactoryStatus()), ProdBaseFactoryInfo::getFactoryStatus, bo.getFactoryStatus());
         lqw.eq(StringUtils.isNotBlank(bo.getRemark()), ProdBaseFactoryInfo::getRemark, bo.getRemark());
-        lqw.orderByDesc(ProdBaseFactoryInfo::getCreateTime);
+        lqw.orderByAsc(ProdBaseFactoryInfo::getCreateTime);
         return lqw;
     }
 
diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdBaseProdLineInfoServiceImpl.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdBaseProdLineInfoServiceImpl.java
new file mode 100644
index 00000000..e03bc026
--- /dev/null
+++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdBaseProdLineInfoServiceImpl.java
@@ -0,0 +1,140 @@
+package org.dromara.mes.service.impl;
+
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.toolkit.JoinWrappers;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import org.dromara.mes.domain.ProdBaseWorkshopInfo;
+import org.springframework.stereotype.Service;
+import org.dromara.mes.domain.bo.ProdBaseProdLineInfoBo;
+import org.dromara.mes.domain.vo.ProdBaseProdLineInfoVo;
+import org.dromara.mes.domain.ProdBaseProdLineInfo;
+import org.dromara.mes.mapper.ProdBaseProdLineInfoMapper;
+import org.dromara.mes.service.IProdBaseProdLineInfoService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 产线信息Service业务层处理
+ *
+ * @author Yinq
+ * @date 2025-01-06
+ */
+@RequiredArgsConstructor
+@Service
+public class ProdBaseProdLineInfoServiceImpl implements IProdBaseProdLineInfoService {
+
+    private final ProdBaseProdLineInfoMapper baseMapper;
+
+    /**
+     * 查询产线信息
+     *
+     * @param prodLineId 主键
+     * @return 产线信息
+     */
+    @Override
+    public ProdBaseProdLineInfoVo queryById(Long prodLineId){
+        return baseMapper.selectVoById(prodLineId);
+    }
+
+    /**
+     * 分页查询产线信息列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 产线信息分页列表
+     */
+    @Override
+    public TableDataInfo<ProdBaseProdLineInfoVo> queryPageList(ProdBaseProdLineInfoBo bo, PageQuery pageQuery) {
+        MPJLambdaWrapper<ProdBaseProdLineInfo> lqw = buildQueryWrapper(bo);
+        Page<ProdBaseProdLineInfoVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的产线信息列表
+     *
+     * @param bo 查询条件
+     * @return 产线信息列表
+     */
+    @Override
+    public List<ProdBaseProdLineInfoVo> queryList(ProdBaseProdLineInfoBo bo) {
+        MPJLambdaWrapper<ProdBaseProdLineInfo> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private MPJLambdaWrapper<ProdBaseProdLineInfo> buildQueryWrapper(ProdBaseProdLineInfoBo bo) {
+        Map<String, Object> params = bo.getParams();
+        MPJLambdaWrapper<ProdBaseProdLineInfo> lqw = JoinWrappers.lambda(ProdBaseProdLineInfo.class)
+            .selectAll(ProdBaseProdLineInfo.class)
+            .select(ProdBaseWorkshopInfo::getWorkshopName)
+            .leftJoin(ProdBaseWorkshopInfo.class, ProdBaseWorkshopInfo::getWorkshopId, ProdBaseProdLineInfo::getWorkshopId)
+            .eq(bo.getProdLineId() != null, ProdBaseProdLineInfo::getProdLineId, bo.getProdLineId())
+            .eq(StringUtils.isNotBlank(bo.getProdLineCode()), ProdBaseProdLineInfo::getProdLineCode, bo.getProdLineCode())
+            .like(StringUtils.isNotBlank(bo.getProdLineName()), ProdBaseProdLineInfo::getProdLineName, bo.getProdLineName())
+            .eq(StringUtils.isNotBlank(bo.getProdLineType()), ProdBaseProdLineInfo::getProdLineType, bo.getProdLineType())
+            .eq(bo.getWorkshopId() != null, ProdBaseProdLineInfo::getWorkshopId, bo.getWorkshopId())
+            .eq(StringUtils.isNotBlank(bo.getActiveFlag()), ProdBaseProdLineInfo::getActiveFlag, bo.getActiveFlag())
+            .orderByAsc(ProdBaseProdLineInfo::getCreateTime);
+        return lqw;
+    }
+
+    /**
+     * 新增产线信息
+     *
+     * @param bo 产线信息
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(ProdBaseProdLineInfoBo bo) {
+        ProdBaseProdLineInfo add = MapstructUtils.convert(bo, ProdBaseProdLineInfo.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setProdLineId(add.getProdLineId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改产线信息
+     *
+     * @param bo 产线信息
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(ProdBaseProdLineInfoBo bo) {
+        ProdBaseProdLineInfo update = MapstructUtils.convert(bo, ProdBaseProdLineInfo.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(ProdBaseProdLineInfo entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除产线信息信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}
diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdBaseWorkshopInfoServiceImpl.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdBaseWorkshopInfoServiceImpl.java
index e3df6051..73c96f66 100644
--- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdBaseWorkshopInfoServiceImpl.java
+++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdBaseWorkshopInfoServiceImpl.java
@@ -79,7 +79,7 @@ public class ProdBaseWorkshopInfoServiceImpl implements IProdBaseWorkshopInfoSer
             .like(StringUtils.isNotBlank(bo.getWorkshopName()), ProdBaseWorkshopInfo::getWorkshopName, bo.getWorkshopName())
             .eq(bo.getFactoryId() != null, ProdBaseWorkshopInfo::getFactoryId, bo.getFactoryId())
             .eq(StringUtils.isNotBlank(bo.getActiveFlag()), ProdBaseWorkshopInfo::getActiveFlag, bo.getActiveFlag())
-            .orderByDesc(ProdBaseWorkshopInfo::getCreateTime);
+            .orderByAsc(ProdBaseWorkshopInfo::getCreateTime);
         return lqw;
     }
 
diff --git a/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdBaseProdLineInfoMapper.xml b/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdBaseProdLineInfoMapper.xml
new file mode 100644
index 00000000..a828e7fa
--- /dev/null
+++ b/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdBaseProdLineInfoMapper.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.mes.mapper.ProdBaseProdLineInfoMapper">
+
+</mapper>