diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdBaseProcessInfoController.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdBaseProcessInfoController.java new file mode 100644 index 0000000..47dbd87 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdBaseProcessInfoController.java @@ -0,0 +1,115 @@ +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.ProdBaseProcessInfoVo; +import org.dromara.mes.domain.bo.ProdBaseProcessInfoBo; +import org.dromara.mes.service.IProdBaseProcessInfoService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 工序信息 + * 前端访问路由地址为:/mes/baseProcessInfo + * + * @author Yinq + * @date 2025-01-06 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/baseProcessInfo") +public class ProdBaseProcessInfoController extends BaseController { + + private final IProdBaseProcessInfoService prodBaseProcessInfoService; + + /** + * 查询工序信息列表 + */ + @SaCheckPermission("mes:baseProcessInfo:list") + @GetMapping("/list") + public TableDataInfo list(ProdBaseProcessInfoBo bo, PageQuery pageQuery) { + return prodBaseProcessInfoService.queryPageList(bo, pageQuery); + } + + /** + * 查询工序信息下拉框列表 + */ + @GetMapping("/getProcessInfoList") + public R> getProcessInfoList(ProdBaseProcessInfoBo bo) { + List list = prodBaseProcessInfoService.queryList(bo); + return R.ok(list); + } + + /** + * 导出工序信息列表 + */ + @SaCheckPermission("mes:baseProcessInfo:export") + @Log(title = "工序信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(ProdBaseProcessInfoBo bo, HttpServletResponse response) { + List list = prodBaseProcessInfoService.queryList(bo); + ExcelUtil.exportExcel(list, "工序信息", ProdBaseProcessInfoVo.class, response); + } + + /** + * 获取工序信息详细信息 + * + * @param processId 主键 + */ + @SaCheckPermission("mes:baseProcessInfo:query") + @GetMapping("/{processId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long processId) { + return R.ok(prodBaseProcessInfoService.queryById(processId)); + } + + /** + * 新增工序信息 + */ + @SaCheckPermission("mes:baseProcessInfo:add") + @Log(title = "工序信息", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody ProdBaseProcessInfoBo bo) { + return toAjax(prodBaseProcessInfoService.insertByBo(bo)); + } + + /** + * 修改工序信息 + */ + @SaCheckPermission("mes:baseProcessInfo:edit") + @Log(title = "工序信息", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody ProdBaseProcessInfoBo bo) { + return toAjax(prodBaseProcessInfoService.updateByBo(bo)); + } + + /** + * 删除工序信息 + * + * @param processIds 主键串 + */ + @SaCheckPermission("mes:baseProcessInfo:remove") + @Log(title = "工序信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{processIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] processIds) { + return toAjax(prodBaseProcessInfoService.deleteWithValidByIds(List.of(processIds), true)); + } +} 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 index 9706f58..9622118 100644 --- 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 @@ -50,7 +50,7 @@ public class ProdBaseProdLineInfoController extends BaseController { * 查询产线信息下拉框列表 */ @GetMapping("/getProdLineList") - public R> getFactoryList(ProdBaseProdLineInfoBo bo) { + public R> getProdLineList(ProdBaseProdLineInfoBo bo) { List list = prodBaseProdLineInfoService.queryList(bo); return R.ok(list); } diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdBaseStationInfoController.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdBaseStationInfoController.java new file mode 100644 index 0000000..ead93e7 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdBaseStationInfoController.java @@ -0,0 +1,117 @@ +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.dromara.mes.domain.bo.ProdBaseWorkshopInfoBo; +import org.dromara.mes.domain.vo.ProdBaseWorkshopInfoVo; +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.ProdBaseStationInfoVo; +import org.dromara.mes.domain.bo.ProdBaseStationInfoBo; +import org.dromara.mes.service.IProdBaseStationInfoService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 工位信息 + * 前端访问路由地址为:/mes/baseStationInfo + * + * @author Yinq + * @date 2025-01-06 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/baseStationInfo") +public class ProdBaseStationInfoController extends BaseController { + + private final IProdBaseStationInfoService prodBaseStationInfoService; + + /** + * 查询工位信息列表 + */ + @SaCheckPermission("mes:baseStationInfo:list") + @GetMapping("/list") + public TableDataInfo list(ProdBaseStationInfoBo bo, PageQuery pageQuery) { + return prodBaseStationInfoService.queryPageList(bo, pageQuery); + } + + /** + * 查询工位信息下拉框列表 + */ + @GetMapping("/getStationInfoList") + public R> getStationInfoList(ProdBaseStationInfoBo bo) { + List list = prodBaseStationInfoService.queryList(bo); + return R.ok(list); + } + + /** + * 导出工位信息列表 + */ + @SaCheckPermission("mes:baseStationInfo:export") + @Log(title = "工位信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(ProdBaseStationInfoBo bo, HttpServletResponse response) { + List list = prodBaseStationInfoService.queryList(bo); + ExcelUtil.exportExcel(list, "工位信息", ProdBaseStationInfoVo.class, response); + } + + /** + * 获取工位信息详细信息 + * + * @param stationId 主键 + */ + @SaCheckPermission("mes:baseStationInfo:query") + @GetMapping("/{stationId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long stationId) { + return R.ok(prodBaseStationInfoService.queryById(stationId)); + } + + /** + * 新增工位信息 + */ + @SaCheckPermission("mes:baseStationInfo:add") + @Log(title = "工位信息", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody ProdBaseStationInfoBo bo) { + return toAjax(prodBaseStationInfoService.insertByBo(bo)); + } + + /** + * 修改工位信息 + */ + @SaCheckPermission("mes:baseStationInfo:edit") + @Log(title = "工位信息", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody ProdBaseStationInfoBo bo) { + return toAjax(prodBaseStationInfoService.updateByBo(bo)); + } + + /** + * 删除工位信息 + * + * @param stationIds 主键串 + */ + @SaCheckPermission("mes:baseStationInfo:remove") + @Log(title = "工位信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{stationIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] stationIds) { + return toAjax(prodBaseStationInfoService.deleteWithValidByIds(List.of(stationIds), 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 a28c519..4fe0500 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,7 +50,7 @@ public class ProdBaseWorkshopInfoController extends BaseController { * 查询车间信息下拉框列表 */ @GetMapping("/getWorkshopList") - public R> getFactoryList(ProdBaseWorkshopInfoBo bo) { + public R> getWorkshopList(ProdBaseWorkshopInfoBo bo) { List list = prodBaseWorkshopInfoService.queryList(bo); return R.ok(list); } diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseProcessInfo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseProcessInfo.java new file mode 100644 index 0000000..01c9eca --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseProcessInfo.java @@ -0,0 +1,66 @@ +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_process_info + * + * @author Yinq + * @date 2025-01-06 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("prod_base_process_info") +public class ProdBaseProcessInfo extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键标识 + */ + @TableId(value = "process_id", type = IdType.AUTO) + private Long processId; + + /** + * 工序编号 + */ + private String processCode; + + /** + * 工序名称 + */ + private String processName; + + /** + * 工序类别(1生产工序 2质检工序) + */ + private String processType; + + /** + * 工序顺序 + */ + private Long processQueue; + + /** + * 单位生产时间(秒);页面显示小时和分钟,就是标准工时,完成一个产品的制造所需的时间 + */ + private Long productionTime; + + /** + * 激活标识(1是 0否) + */ + private String activeFlag; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseStationInfo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseStationInfo.java new file mode 100644 index 0000000..92756a3 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseStationInfo.java @@ -0,0 +1,79 @@ +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_station_info + * + * @author Yinq + * @date 2025-01-06 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("prod_base_station_info") +public class ProdBaseStationInfo extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键标识 + */ + @TableId(value = "station_id", type = IdType.AUTO) + private Long stationId; + + /** + * 工位编号 + */ + private String stationCode; + + /** + * 工位名称 + */ + private String stationName; + + /** + * 工位类型(1生产工位 2质检工位) + */ + private String stationType; + + /** + * 所属工序 + */ + private Long processId; + + /** + * 单位生产时间(秒) + */ + private Long productionTime; + + /** + * AGV编号 + */ + private String agvCode; + + /** + * IP地址 + */ + private String ipAddress; + + /** + * 激活标识(1是 0否) + */ + private String activeFlag; + + /** + * 备注 + */ + private String remark; + + @TableField(exist = false) + private String processName;//字段映射 + + +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdBaseProcessInfoBo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdBaseProcessInfoBo.java new file mode 100644 index 0000000..8e4daea --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdBaseProcessInfoBo.java @@ -0,0 +1,68 @@ +package org.dromara.mes.domain.bo; + +import org.dromara.mes.domain.ProdBaseProcessInfo; +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_process_info + * + * @author Yinq + * @date 2025-01-06 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = ProdBaseProcessInfo.class, reverseConvertGenerate = false) +public class ProdBaseProcessInfoBo extends BaseEntity { + + /** + * 主键标识 + */ + private Long processId; + + /** + * 工序编号 + */ + @NotBlank(message = "工序编号不能为空", groups = {AddGroup.class, EditGroup.class}) + private String processCode; + + /** + * 工序名称 + */ + @NotBlank(message = "工序名称不能为空", groups = {AddGroup.class, EditGroup.class}) + private String processName; + + /** + * 工序类别 + */ + @NotBlank(message = "工序类别不能为空", groups = {AddGroup.class, EditGroup.class}) + private String processType; + + /** + * 工序顺序 + */ + private Long processQueue; + + /** + * 单位生产时间(秒);页面显示小时和分钟,就是标准工时,完成一个产品的制造所需的时间 + */ + private Long productionTime; + + /** + * 激活标识(1是 0否) + */ + @NotBlank(message = "激活标识", 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/bo/ProdBaseStationInfoBo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdBaseStationInfoBo.java new file mode 100644 index 0000000..b3a5942 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdBaseStationInfoBo.java @@ -0,0 +1,78 @@ +package org.dromara.mes.domain.bo; + +import org.dromara.mes.domain.ProdBaseStationInfo; +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_station_info + * + * @author Yinq + * @date 2025-01-06 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = ProdBaseStationInfo.class, reverseConvertGenerate = false) +public class ProdBaseStationInfoBo extends BaseEntity { + + /** + * 主键标识 + */ + private Long stationId; + + /** + * 工位编号 + */ + @NotBlank(message = "工位编号不能为空", groups = {AddGroup.class, EditGroup.class}) + private String stationCode; + + /** + * 工位名称 + */ + @NotBlank(message = "工位名称不能为空", groups = {AddGroup.class, EditGroup.class}) + private String stationName; + + /** + * 工位类型 + */ + @NotBlank(message = "工位类型不能为空", groups = {AddGroup.class, EditGroup.class}) + private String stationType; + + /** + * 所属工序 + */ + @NotNull(message = "所属工序不能为空", groups = {AddGroup.class, EditGroup.class}) + private Long processId; + + /** + * 单位生产时间(秒) + */ + private Long productionTime; + + /** + * AGV编号 + */ + private String agvCode; + + /** + * IP地址 + */ + private String ipAddress; + + /** + * 激活标识(1是 0否) + */ + private String activeFlag; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdBaseProcessInfoVo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdBaseProcessInfoVo.java new file mode 100644 index 0000000..638cacc --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdBaseProcessInfoVo.java @@ -0,0 +1,119 @@ +package org.dromara.mes.domain.vo; + +import org.dromara.mes.domain.ProdBaseProcessInfo; +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_process_info + * + * @author Yinq + * @date 2025-01-06 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = ProdBaseProcessInfo.class) +public class ProdBaseProcessInfoVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键标识 + */ + @ExcelProperty(value = "主键标识") + private Long processId; + + /** + * 租户编号 + */ + @ExcelProperty(value = "租户编号") + private String tenantId; + + /** + * 工序编号 + */ + @ExcelProperty(value = "工序编号") + private String processCode; + + /** + * 工序名称 + */ + @ExcelProperty(value = "工序名称") + private String processName; + + /** + * 工序类别(1生产工序 2质检工序) + */ + @ExcelProperty(value = "工序类别", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "process_type") + private String processType; + + /** + * 工序顺序 + */ + @ExcelProperty(value = "工序顺序") + private Long processQueue; + + /** + * 单位生产时间(秒);页面显示小时和分钟,就是标准工时,完成一个产品的制造所需的时间 + */ + @ExcelProperty(value = "单位生产时间", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "秒=") + private Long productionTime; + + /** + * 激活标识(1是 0否) + */ + @ExcelProperty(value = "激活标识(1是 0否)", 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/ProdBaseStationInfoVo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdBaseStationInfoVo.java new file mode 100644 index 0000000..3f37b31 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdBaseStationInfoVo.java @@ -0,0 +1,135 @@ +package org.dromara.mes.domain.vo; + +import org.dromara.mes.domain.ProdBaseStationInfo; +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_station_info + * + * @author Yinq + * @date 2025-01-06 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = ProdBaseStationInfo.class) +public class ProdBaseStationInfoVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键标识 + */ + @ExcelProperty(value = "主键标识") + private Long stationId; + + /** + * 租户编号 + */ + @ExcelProperty(value = "租户编号") + private String tenantId; + + /** + * 工位编号 + */ + @ExcelProperty(value = "工位编号") + private String stationCode; + + /** + * 工位名称 + */ + @ExcelProperty(value = "工位名称") + private String stationName; + + /** + * 工位类型(1生产工位 2质检工位) + */ + @ExcelProperty(value = "工位类型(1生产工位 2质检工位)", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "station_type") + private String stationType; + + /** + * 所属工序 + */ + @ExcelProperty(value = "所属工序") + private Long processId; + + /** + * 所属工序名称 + */ + @ExcelProperty(value = "所属工序名称") + private String processName; + + /** + * 单位生产时间(秒) + */ + @ExcelProperty(value = "单位生产时间(秒)", converter = ExcelDictConvert.class) + private Long productionTime; + + /** + * AGV编号 + */ + @ExcelProperty(value = "AGV编号") + private String agvCode; + + /** + * IP地址 + */ + @ExcelProperty(value = "IP地址") + private String ipAddress; + + /** + * 激活标识(1是 0否) + */ + @ExcelProperty(value = "激活标识(1是 0否)", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "station_type") + 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/mapper/ProdBaseProcessInfoMapper.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/ProdBaseProcessInfoMapper.java new file mode 100644 index 0000000..266f79b --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/ProdBaseProcessInfoMapper.java @@ -0,0 +1,15 @@ +package org.dromara.mes.mapper; + +import org.dromara.mes.domain.ProdBaseProcessInfo; +import org.dromara.mes.domain.vo.ProdBaseProcessInfoVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 工序信息Mapper接口 + * + * @author Yinq + * @date 2025-01-06 + */ +public interface ProdBaseProcessInfoMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/ProdBaseStationInfoMapper.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/ProdBaseStationInfoMapper.java new file mode 100644 index 0000000..6023a96 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/ProdBaseStationInfoMapper.java @@ -0,0 +1,15 @@ +package org.dromara.mes.mapper; + +import org.dromara.mes.domain.ProdBaseStationInfo; +import org.dromara.mes.domain.vo.ProdBaseStationInfoVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 工位信息Mapper接口 + * + * @author Yinq + * @date 2025-01-06 + */ +public interface ProdBaseStationInfoMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IProdBaseProcessInfoService.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IProdBaseProcessInfoService.java new file mode 100644 index 0000000..ff84298 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IProdBaseProcessInfoService.java @@ -0,0 +1,68 @@ +package org.dromara.mes.service; + +import org.dromara.mes.domain.vo.ProdBaseProcessInfoVo; +import org.dromara.mes.domain.bo.ProdBaseProcessInfoBo; +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 IProdBaseProcessInfoService { + + /** + * 查询工序信息 + * + * @param processId 主键 + * @return 工序信息 + */ + ProdBaseProcessInfoVo queryById(Long processId); + + /** + * 分页查询工序信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 工序信息分页列表 + */ + TableDataInfo queryPageList(ProdBaseProcessInfoBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的工序信息列表 + * + * @param bo 查询条件 + * @return 工序信息列表 + */ + List queryList(ProdBaseProcessInfoBo bo); + + /** + * 新增工序信息 + * + * @param bo 工序信息 + * @return 是否新增成功 + */ + Boolean insertByBo(ProdBaseProcessInfoBo bo); + + /** + * 修改工序信息 + * + * @param bo 工序信息 + * @return 是否修改成功 + */ + Boolean updateByBo(ProdBaseProcessInfoBo bo); + + /** + * 校验并批量删除工序信息信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IProdBaseStationInfoService.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IProdBaseStationInfoService.java new file mode 100644 index 0000000..18a2648 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IProdBaseStationInfoService.java @@ -0,0 +1,68 @@ +package org.dromara.mes.service; + +import org.dromara.mes.domain.vo.ProdBaseStationInfoVo; +import org.dromara.mes.domain.bo.ProdBaseStationInfoBo; +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 IProdBaseStationInfoService { + + /** + * 查询工位信息 + * + * @param stationId 主键 + * @return 工位信息 + */ + ProdBaseStationInfoVo queryById(Long stationId); + + /** + * 分页查询工位信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 工位信息分页列表 + */ + TableDataInfo queryPageList(ProdBaseStationInfoBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的工位信息列表 + * + * @param bo 查询条件 + * @return 工位信息列表 + */ + List queryList(ProdBaseStationInfoBo bo); + + /** + * 新增工位信息 + * + * @param bo 工位信息 + * @return 是否新增成功 + */ + Boolean insertByBo(ProdBaseStationInfoBo bo); + + /** + * 修改工位信息 + * + * @param bo 工位信息 + * @return 是否修改成功 + */ + Boolean updateByBo(ProdBaseStationInfoBo bo); + + /** + * 校验并批量删除工位信息信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdBaseProcessInfoServiceImpl.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdBaseProcessInfoServiceImpl.java new file mode 100644 index 0000000..d231564 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdBaseProcessInfoServiceImpl.java @@ -0,0 +1,137 @@ +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 lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.dromara.mes.domain.bo.ProdBaseProcessInfoBo; +import org.dromara.mes.domain.vo.ProdBaseProcessInfoVo; +import org.dromara.mes.domain.ProdBaseProcessInfo; +import org.dromara.mes.mapper.ProdBaseProcessInfoMapper; +import org.dromara.mes.service.IProdBaseProcessInfoService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 工序信息Service业务层处理 + * + * @author Yinq + * @date 2025-01-06 + */ +@RequiredArgsConstructor +@Service +public class ProdBaseProcessInfoServiceImpl implements IProdBaseProcessInfoService { + + private final ProdBaseProcessInfoMapper baseMapper; + + /** + * 查询工序信息 + * + * @param processId 主键 + * @return 工序信息 + */ + @Override + public ProdBaseProcessInfoVo queryById(Long processId){ + return baseMapper.selectVoById(processId); + } + + /** + * 分页查询工序信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 工序信息分页列表 + */ + @Override + public TableDataInfo queryPageList(ProdBaseProcessInfoBo bo, PageQuery pageQuery) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的工序信息列表 + * + * @param bo 查询条件 + * @return 工序信息列表 + */ + @Override + public List queryList(ProdBaseProcessInfoBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(ProdBaseProcessInfoBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(ProdBaseProcessInfo.class) + .selectAll(ProdBaseProcessInfo.class) + .eq(bo.getProcessId() != null, ProdBaseProcessInfo::getProcessId, bo.getProcessId()) + .eq(StringUtils.isNotBlank(bo.getProcessCode()), ProdBaseProcessInfo::getProcessCode, bo.getProcessCode()) + .like(StringUtils.isNotBlank(bo.getProcessName()), ProdBaseProcessInfo::getProcessName, bo.getProcessName()) + .eq(StringUtils.isNotBlank(bo.getProcessType()), ProdBaseProcessInfo::getProcessType, bo.getProcessType()) + .eq(bo.getProcessQueue() != null, ProdBaseProcessInfo::getProcessQueue, bo.getProcessQueue()) + .eq(bo.getProductionTime() != null, ProdBaseProcessInfo::getProductionTime, bo.getProductionTime()) + .eq(StringUtils.isNotBlank(bo.getActiveFlag()), ProdBaseProcessInfo::getActiveFlag, bo.getActiveFlag()) + .orderByAsc(ProdBaseProcessInfo::getProcessQueue); + return lqw; + } + + /** + * 新增工序信息 + * + * @param bo 工序信息 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(ProdBaseProcessInfoBo bo) { + ProdBaseProcessInfo add = MapstructUtils.convert(bo, ProdBaseProcessInfo.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setProcessId(add.getProcessId()); + } + return flag; + } + + /** + * 修改工序信息 + * + * @param bo 工序信息 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(ProdBaseProcessInfoBo bo) { + ProdBaseProcessInfo update = MapstructUtils.convert(bo, ProdBaseProcessInfo.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(ProdBaseProcessInfo entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除工序信息信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection 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/ProdBaseStationInfoServiceImpl.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdBaseStationInfoServiceImpl.java new file mode 100644 index 0000000..5e173e3 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdBaseStationInfoServiceImpl.java @@ -0,0 +1,142 @@ +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.ProdBaseProcessInfo; +import org.springframework.stereotype.Service; +import org.dromara.mes.domain.bo.ProdBaseStationInfoBo; +import org.dromara.mes.domain.vo.ProdBaseStationInfoVo; +import org.dromara.mes.domain.ProdBaseStationInfo; +import org.dromara.mes.mapper.ProdBaseStationInfoMapper; +import org.dromara.mes.service.IProdBaseStationInfoService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 工位信息Service业务层处理 + * + * @author Yinq + * @date 2025-01-06 + */ +@RequiredArgsConstructor +@Service +public class ProdBaseStationInfoServiceImpl implements IProdBaseStationInfoService { + + private final ProdBaseStationInfoMapper baseMapper; + + /** + * 查询工位信息 + * + * @param stationId 主键 + * @return 工位信息 + */ + @Override + public ProdBaseStationInfoVo queryById(Long stationId) { + return baseMapper.selectVoById(stationId); + } + + /** + * 分页查询工位信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 工位信息分页列表 + */ + @Override + public TableDataInfo queryPageList(ProdBaseStationInfoBo bo, PageQuery pageQuery) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的工位信息列表 + * + * @param bo 查询条件 + * @return 工位信息列表 + */ + @Override + public List queryList(ProdBaseStationInfoBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(ProdBaseStationInfoBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(ProdBaseStationInfo.class) + .selectAll(ProdBaseStationInfo.class) + .select(ProdBaseProcessInfo::getProcessName) + .leftJoin(ProdBaseProcessInfo.class, ProdBaseProcessInfo::getProcessId, ProdBaseStationInfo::getProcessId) + .eq(bo.getStationId() != null, ProdBaseStationInfo::getStationId, bo.getStationId()) + .eq(StringUtils.isNotBlank(bo.getStationCode()), ProdBaseStationInfo::getStationCode, bo.getStationCode()) + .like(StringUtils.isNotBlank(bo.getStationName()), ProdBaseStationInfo::getStationName, bo.getStationName()) + .eq(StringUtils.isNotBlank(bo.getStationType()), ProdBaseStationInfo::getStationType, bo.getStationType()) + .eq(bo.getProcessId() != null, ProdBaseStationInfo::getProcessId, bo.getProcessId()) + .like(StringUtils.isNotBlank(bo.getAgvCode()), ProdBaseStationInfo::getAgvCode, bo.getAgvCode()) + .like(StringUtils.isNotBlank(bo.getIpAddress()), ProdBaseStationInfo::getIpAddress, bo.getIpAddress()) + .eq(StringUtils.isNotBlank(bo.getActiveFlag()), ProdBaseStationInfo::getActiveFlag, bo.getActiveFlag()) + .orderByDesc(ProdBaseStationInfo::getCreateTime); + return lqw; + } + + /** + * 新增工位信息 + * + * @param bo 工位信息 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(ProdBaseStationInfoBo bo) { + ProdBaseStationInfo add = MapstructUtils.convert(bo, ProdBaseStationInfo.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setStationId(add.getStationId()); + } + return flag; + } + + /** + * 修改工位信息 + * + * @param bo 工位信息 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(ProdBaseStationInfoBo bo) { + ProdBaseStationInfo update = MapstructUtils.convert(bo, ProdBaseStationInfo.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(ProdBaseStationInfo entity) { + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除工位信息信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if (isValid) { + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdBaseProcessInfoMapper.xml b/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdBaseProcessInfoMapper.xml new file mode 100644 index 0000000..18d5793 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdBaseProcessInfoMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdBaseStationInfoMapper.xml b/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdBaseStationInfoMapper.xml new file mode 100644 index 0000000..3da3459 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdBaseStationInfoMapper.xml @@ -0,0 +1,7 @@ + + + + +