From 10f2f75a3ae165943747764dd5534a28078cd72f Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Wed, 6 May 2026 11:40:29 +0800 Subject: [PATCH] =?UTF-8?q?feat(mill):=20=E6=B7=BB=E5=8A=A0=E8=BD=A7?= =?UTF-8?q?=E7=BA=BF=E7=94=9F=E4=BA=A7=E5=AE=9E=E7=BB=A9=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 创建轧线生产实绩实体类 MillProductionActual，包含成品卷号、来料卷号、厚度、宽度等字段 - 实现轧线生产实绩服务接口 IMillProductionActualService，提供增删改查操作方法 - 开发轧线生产实绩控制器 MillProductionActualController，支持列表查询、新增、修改、删除等功能 - 设计轧线生产实绩数据访问层 MillProductionActualMapper，完成数据库CRUD操作 - 配置MyBatis映射文件 MillProductionActualMapper.xml，实现SQL语句与实体类映射 - 添加轧线生产停机和系统日志的服务接口定义 - 实现权限控制注解，支持导出Excel功能 --- .../MillProductionActualController.java | 104 +++ .../MillProductionStopController.java | 104 +++ .../controller/MillSystemLogController.java | 104 +++ .../mill/domain/MillProductionActual.java | 602 ++++++++++++++++++ .../ruoyi/mill/domain/MillProductionStop.java | 226 +++++++ .../com/ruoyi/mill/domain/MillSystemLog.java | 165 +++++ .../mapper/MillProductionActualMapper.java | 61 ++ .../mill/mapper/MillProductionStopMapper.java | 61 ++ .../mill/mapper/MillSystemLogMapper.java | 61 ++ .../service/IMillProductionActualService.java | 61 ++ .../service/IMillProductionStopService.java | 61 ++ .../mill/service/IMillSystemLogService.java | 61 ++ .../impl/MillProductionActualServiceImpl.java | 96 +++ .../impl/MillProductionStopServiceImpl.java | 96 +++ .../impl/MillSystemLogServiceImpl.java | 96 +++ .../mill/MillProductionActualMapper.xml | 255 ++++++++ .../mapper/mill/MillProductionStopMapper.xml | 130 ++++ .../mapper/mill/MillSystemLogMapper.xml | 110 ++++ 18 files changed, 2454 insertions(+) create mode 100644 ruoyi-mill/src/main/java/com/ruoyi/mill/controller/MillProductionActualController.java create mode 100644 ruoyi-mill/src/main/java/com/ruoyi/mill/controller/MillProductionStopController.java create mode 100644 ruoyi-mill/src/main/java/com/ruoyi/mill/controller/MillSystemLogController.java create mode 100644 ruoyi-mill/src/main/java/com/ruoyi/mill/domain/MillProductionActual.java create mode 100644 ruoyi-mill/src/main/java/com/ruoyi/mill/domain/MillProductionStop.java create mode 100644 ruoyi-mill/src/main/java/com/ruoyi/mill/domain/MillSystemLog.java create mode 100644 ruoyi-mill/src/main/java/com/ruoyi/mill/mapper/MillProductionActualMapper.java create mode 100644 ruoyi-mill/src/main/java/com/ruoyi/mill/mapper/MillProductionStopMapper.java create mode 100644 ruoyi-mill/src/main/java/com/ruoyi/mill/mapper/MillSystemLogMapper.java create mode 100644 ruoyi-mill/src/main/java/com/ruoyi/mill/service/IMillProductionActualService.java create mode 100644 ruoyi-mill/src/main/java/com/ruoyi/mill/service/IMillProductionStopService.java create mode 100644 ruoyi-mill/src/main/java/com/ruoyi/mill/service/IMillSystemLogService.java create mode 100644 ruoyi-mill/src/main/java/com/ruoyi/mill/service/impl/MillProductionActualServiceImpl.java create mode 100644 ruoyi-mill/src/main/java/com/ruoyi/mill/service/impl/MillProductionStopServiceImpl.java create mode 100644 ruoyi-mill/src/main/java/com/ruoyi/mill/service/impl/MillSystemLogServiceImpl.java create mode 100644 ruoyi-mill/src/main/resources/mapper/mill/MillProductionActualMapper.xml create mode 100644 ruoyi-mill/src/main/resources/mapper/mill/MillProductionStopMapper.xml create mode 100644 ruoyi-mill/src/main/resources/mapper/mill/MillSystemLogMapper.xml diff --git a/ruoyi-mill/src/main/java/com/ruoyi/mill/controller/MillProductionActualController.java b/ruoyi-mill/src/main/java/com/ruoyi/mill/controller/MillProductionActualController.java new file mode 100644 index 00000000..1439687a --- /dev/null +++ b/ruoyi-mill/src/main/java/com/ruoyi/mill/controller/MillProductionActualController.java @@ -0,0 +1,104 @@ +package com.ruoyi.mill.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.mill.domain.MillProductionActual; +import com.ruoyi.mill.service.IMillProductionActualService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 轧线生产实绩Controller + * + * @author ruoyi + * @date 2026-05-06 + */ +@RestController +@RequestMapping("/mill/actual") +public class MillProductionActualController extends BaseController +{ + @Autowired + private IMillProductionActualService millProductionActualService; + + /** + * 查询轧线生产实绩列表 + */ + @PreAuthorize("@ss.hasPermi('mill:actual:list')") + @GetMapping("/list") + public TableDataInfo list(MillProductionActual millProductionActual) + { + startPage(); + List list = millProductionActualService.selectMillProductionActualList(millProductionActual); + return getDataTable(list); + } + + /** + * 导出轧线生产实绩列表 + */ + @PreAuthorize("@ss.hasPermi('mill:actual:export')") + @Log(title = "轧线生产实绩", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, MillProductionActual millProductionActual) + { + List list = millProductionActualService.selectMillProductionActualList(millProductionActual); + ExcelUtil util = new ExcelUtil(MillProductionActual.class); + util.exportExcel(response, list, "轧线生产实绩数据"); + } + + /** + * 获取轧线生产实绩详细信息 + */ + @PreAuthorize("@ss.hasPermi('mill:actual:query')") + @GetMapping(value = "/{actualId}") + public AjaxResult getInfo(@PathVariable("actualId") Long actualId) + { + return success(millProductionActualService.selectMillProductionActualByActualId(actualId)); + } + + /** + * 新增轧线生产实绩 + */ + @PreAuthorize("@ss.hasPermi('mill:actual:add')") + @Log(title = "轧线生产实绩", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody MillProductionActual millProductionActual) + { + return toAjax(millProductionActualService.insertMillProductionActual(millProductionActual)); + } + + /** + * 修改轧线生产实绩 + */ + @PreAuthorize("@ss.hasPermi('mill:actual:edit')") + @Log(title = "轧线生产实绩", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody MillProductionActual millProductionActual) + { + return toAjax(millProductionActualService.updateMillProductionActual(millProductionActual)); + } + + /** + * 删除轧线生产实绩 + */ + @PreAuthorize("@ss.hasPermi('mill:actual:remove')") + @Log(title = "轧线生产实绩", businessType = BusinessType.DELETE) + @DeleteMapping("/{actualIds}") + public AjaxResult remove(@PathVariable Long[] actualIds) + { + return toAjax(millProductionActualService.deleteMillProductionActualByActualIds(actualIds)); + } +} diff --git a/ruoyi-mill/src/main/java/com/ruoyi/mill/controller/MillProductionStopController.java b/ruoyi-mill/src/main/java/com/ruoyi/mill/controller/MillProductionStopController.java new file mode 100644 index 00000000..2467a1d0 --- /dev/null +++ b/ruoyi-mill/src/main/java/com/ruoyi/mill/controller/MillProductionStopController.java @@ -0,0 +1,104 @@ +package com.ruoyi.mill.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.mill.domain.MillProductionStop; +import com.ruoyi.mill.service.IMillProductionStopService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 轧线生产停机Controller + * + * @author ruoyi + * @date 2026-05-06 + */ +@RestController +@RequestMapping("/mill/stop") +public class MillProductionStopController extends BaseController +{ + @Autowired + private IMillProductionStopService millProductionStopService; + + /** + * 查询轧线生产停机列表 + */ + @PreAuthorize("@ss.hasPermi('mill:stop:list')") + @GetMapping("/list") + public TableDataInfo list(MillProductionStop millProductionStop) + { + startPage(); + List list = millProductionStopService.selectMillProductionStopList(millProductionStop); + return getDataTable(list); + } + + /** + * 导出轧线生产停机列表 + */ + @PreAuthorize("@ss.hasPermi('mill:stop:export')") + @Log(title = "轧线生产停机", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, MillProductionStop millProductionStop) + { + List list = millProductionStopService.selectMillProductionStopList(millProductionStop); + ExcelUtil util = new ExcelUtil(MillProductionStop.class); + util.exportExcel(response, list, "轧线生产停机数据"); + } + + /** + * 获取轧线生产停机详细信息 + */ + @PreAuthorize("@ss.hasPermi('mill:stop:query')") + @GetMapping(value = "/{stopId}") + public AjaxResult getInfo(@PathVariable("stopId") Long stopId) + { + return success(millProductionStopService.selectMillProductionStopByStopId(stopId)); + } + + /** + * 新增轧线生产停机 + */ + @PreAuthorize("@ss.hasPermi('mill:stop:add')") + @Log(title = "轧线生产停机", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody MillProductionStop millProductionStop) + { + return toAjax(millProductionStopService.insertMillProductionStop(millProductionStop)); + } + + /** + * 修改轧线生产停机 + */ + @PreAuthorize("@ss.hasPermi('mill:stop:edit')") + @Log(title = "轧线生产停机", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody MillProductionStop millProductionStop) + { + return toAjax(millProductionStopService.updateMillProductionStop(millProductionStop)); + } + + /** + * 删除轧线生产停机 + */ + @PreAuthorize("@ss.hasPermi('mill:stop:remove')") + @Log(title = "轧线生产停机", businessType = BusinessType.DELETE) + @DeleteMapping("/{stopIds}") + public AjaxResult remove(@PathVariable Long[] stopIds) + { + return toAjax(millProductionStopService.deleteMillProductionStopByStopIds(stopIds)); + } +} diff --git a/ruoyi-mill/src/main/java/com/ruoyi/mill/controller/MillSystemLogController.java b/ruoyi-mill/src/main/java/com/ruoyi/mill/controller/MillSystemLogController.java new file mode 100644 index 00000000..bc44ee8c --- /dev/null +++ b/ruoyi-mill/src/main/java/com/ruoyi/mill/controller/MillSystemLogController.java @@ -0,0 +1,104 @@ +package com.ruoyi.mill.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.mill.domain.MillSystemLog; +import com.ruoyi.mill.service.IMillSystemLogService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 轧线系统日志Controller + * + * @author ruoyi + * @date 2026-05-06 + */ +@RestController +@RequestMapping("/mill/log") +public class MillSystemLogController extends BaseController +{ + @Autowired + private IMillSystemLogService millSystemLogService; + + /** + * 查询轧线系统日志列表 + */ + @PreAuthorize("@ss.hasPermi('mill:log:list')") + @GetMapping("/list") + public TableDataInfo list(MillSystemLog millSystemLog) + { + startPage(); + List list = millSystemLogService.selectMillSystemLogList(millSystemLog); + return getDataTable(list); + } + + /** + * 导出轧线系统日志列表 + */ + @PreAuthorize("@ss.hasPermi('mill:log:export')") + @Log(title = "轧线系统日志", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, MillSystemLog millSystemLog) + { + List list = millSystemLogService.selectMillSystemLogList(millSystemLog); + ExcelUtil util = new ExcelUtil(MillSystemLog.class); + util.exportExcel(response, list, "轧线系统日志数据"); + } + + /** + * 获取轧线系统日志详细信息 + */ + @PreAuthorize("@ss.hasPermi('mill:log:query')") + @GetMapping(value = "/{logId}") + public AjaxResult getInfo(@PathVariable("logId") Long logId) + { + return success(millSystemLogService.selectMillSystemLogByLogId(logId)); + } + + /** + * 新增轧线系统日志 + */ + @PreAuthorize("@ss.hasPermi('mill:log:add')") + @Log(title = "轧线系统日志", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody MillSystemLog millSystemLog) + { + return toAjax(millSystemLogService.insertMillSystemLog(millSystemLog)); + } + + /** + * 修改轧线系统日志 + */ + @PreAuthorize("@ss.hasPermi('mill:log:edit')") + @Log(title = "轧线系统日志", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody MillSystemLog millSystemLog) + { + return toAjax(millSystemLogService.updateMillSystemLog(millSystemLog)); + } + + /** + * 删除轧线系统日志 + */ + @PreAuthorize("@ss.hasPermi('mill:log:remove')") + @Log(title = "轧线系统日志", businessType = BusinessType.DELETE) + @DeleteMapping("/{logIds}") + public AjaxResult remove(@PathVariable Long[] logIds) + { + return toAjax(millSystemLogService.deleteMillSystemLogByLogIds(logIds)); + } +} diff --git a/ruoyi-mill/src/main/java/com/ruoyi/mill/domain/MillProductionActual.java b/ruoyi-mill/src/main/java/com/ruoyi/mill/domain/MillProductionActual.java new file mode 100644 index 00000000..bb88c0b6 --- /dev/null +++ b/ruoyi-mill/src/main/java/com/ruoyi/mill/domain/MillProductionActual.java @@ -0,0 +1,602 @@ +package com.ruoyi.mill.domain; + +import java.math.BigDecimal; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 轧线生产实绩对象 mill_production_actual + * + * @author ruoyi + * @date 2026-05-06 + */ +public class MillProductionActual extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键id */ + private Long actualId; + + /** 成品卷号 */ + @Excel(name = "成品卷号") + private String exitMatId; + + /** 来料卷号 */ + @Excel(name = "来料卷号") + private String entryMatId; + + /** 分切数 */ + @Excel(name = "分切数") + private Long subId; + + /** 开始位置 */ + @Excel(name = "开始位置") + private Long startPosition; + + /** 结束位置 */ + @Excel(name = "结束位置") + private Long endPosition; + + /** 计划id */ + @Excel(name = "计划id") + private Long planId; + + /** 计划号 */ + @Excel(name = "计划号") + private String planNo; + + /** 产品类型 */ + @Excel(name = "产品类型") + private String prodCode; + + /** 班号 */ + @Excel(name = "班号") + private String groupNo; + + /** 组号 */ + @Excel(name = "组号") + private String shiftNo; + + /** 状态 */ + @Excel(name = "状态") + private String status; + + /** 钢种 */ + @Excel(name = "钢种") + private String steelGrade; + + /** 来料厚度 */ + @Excel(name = "来料厚度") + private Long entryThick; + + /** 来料宽度 */ + @Excel(name = "来料宽度") + private Long entryWidth; + + /** 来料长度 */ + @Excel(name = "来料长度") + private Long entryLength; + + /** 来料重量 */ + @Excel(name = "来料重量") + private Long entryWeight; + + /** 上表面镀锌量 */ + @Excel(name = "上表面镀锌量") + private Long weightTop; + + /** 下表面镀锌量 */ + @Excel(name = "下表面镀锌量") + private Long weightBottom; + + /** 成品长度 */ + @Excel(name = "成品长度") + private Long exitLength; + + /** 成品带涂料重量 */ + @Excel(name = "成品带涂料重量") + private Long exitNetWeight; + + /** 理论重量 */ + @Excel(name = "理论重量") + private Long theoryWeight; + + /** 实际重量 */ + @Excel(name = "实际重量") + private Long actualWeight; + + /** 成品外径 */ + @Excel(name = "成品外径") + private Long exitOuterDiameter; + + /** 成品厚度 */ + @Excel(name = "成品厚度") + private Long exitThickness; + + /** 成品宽度 */ + @Excel(name = "成品宽度") + private Long exitWidth; + + /** 客户 */ + @Excel(name = "客户") + private String customer; + + /** 上线时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "上线时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date onlineTime; + + /** 开始时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date startTime; + + /** 结束时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date endTime; + + /** 机组号 */ + @Excel(name = "机组号") + private String unitCode; + + /** 工序号 */ + @Excel(name = "工序号") + private String processCode; + + /** 是否尾卷 0-否 1-是 */ + @Excel(name = "是否尾卷 0-否 1-是") + private Integer lastFlag; + + /** 是否分卷 0-否 1-是 */ + @Excel(name = "是否分卷 0-否 1-是") + private Integer separateFlag; + + /** 计划来源 L3-L3计划 MANUAL-人工 */ + @Excel(name = "计划来源 L3-L3计划 MANUAL-人工") + private String planOrigin; + + /** 锌层厚度(g/m²) */ + @Excel(name = "锌层厚度(g/m²)") + private BigDecimal zincCoatingThickness; + + /** 入场钢卷号 */ + @Excel(name = "入场钢卷号") + private String enterCoilNo; + + /** 删除标志 0-存在 2-删除 */ + private String delFlag; + + public void setActualId(Long actualId) + { + this.actualId = actualId; + } + + public Long getActualId() + { + return actualId; + } + + public void setExitMatId(String exitMatId) + { + this.exitMatId = exitMatId; + } + + public String getExitMatId() + { + return exitMatId; + } + + public void setEntryMatId(String entryMatId) + { + this.entryMatId = entryMatId; + } + + public String getEntryMatId() + { + return entryMatId; + } + + public void setSubId(Long subId) + { + this.subId = subId; + } + + public Long getSubId() + { + return subId; + } + + public void setStartPosition(Long startPosition) + { + this.startPosition = startPosition; + } + + public Long getStartPosition() + { + return startPosition; + } + + public void setEndPosition(Long endPosition) + { + this.endPosition = endPosition; + } + + public Long getEndPosition() + { + return endPosition; + } + + public void setPlanId(Long planId) + { + this.planId = planId; + } + + public Long getPlanId() + { + return planId; + } + + public void setPlanNo(String planNo) + { + this.planNo = planNo; + } + + public String getPlanNo() + { + return planNo; + } + + public void setProdCode(String prodCode) + { + this.prodCode = prodCode; + } + + public String getProdCode() + { + return prodCode; + } + + public void setGroupNo(String groupNo) + { + this.groupNo = groupNo; + } + + public String getGroupNo() + { + return groupNo; + } + + public void setShiftNo(String shiftNo) + { + this.shiftNo = shiftNo; + } + + public String getShiftNo() + { + return shiftNo; + } + + public void setStatus(String status) + { + this.status = status; + } + + public String getStatus() + { + return status; + } + + public void setSteelGrade(String steelGrade) + { + this.steelGrade = steelGrade; + } + + public String getSteelGrade() + { + return steelGrade; + } + + public void setEntryThick(Long entryThick) + { + this.entryThick = entryThick; + } + + public Long getEntryThick() + { + return entryThick; + } + + public void setEntryWidth(Long entryWidth) + { + this.entryWidth = entryWidth; + } + + public Long getEntryWidth() + { + return entryWidth; + } + + public void setEntryLength(Long entryLength) + { + this.entryLength = entryLength; + } + + public Long getEntryLength() + { + return entryLength; + } + + public void setEntryWeight(Long entryWeight) + { + this.entryWeight = entryWeight; + } + + public Long getEntryWeight() + { + return entryWeight; + } + + public void setWeightTop(Long weightTop) + { + this.weightTop = weightTop; + } + + public Long getWeightTop() + { + return weightTop; + } + + public void setWeightBottom(Long weightBottom) + { + this.weightBottom = weightBottom; + } + + public Long getWeightBottom() + { + return weightBottom; + } + + public void setExitLength(Long exitLength) + { + this.exitLength = exitLength; + } + + public Long getExitLength() + { + return exitLength; + } + + public void setExitNetWeight(Long exitNetWeight) + { + this.exitNetWeight = exitNetWeight; + } + + public Long getExitNetWeight() + { + return exitNetWeight; + } + + public void setTheoryWeight(Long theoryWeight) + { + this.theoryWeight = theoryWeight; + } + + public Long getTheoryWeight() + { + return theoryWeight; + } + + public void setActualWeight(Long actualWeight) + { + this.actualWeight = actualWeight; + } + + public Long getActualWeight() + { + return actualWeight; + } + + public void setExitOuterDiameter(Long exitOuterDiameter) + { + this.exitOuterDiameter = exitOuterDiameter; + } + + public Long getExitOuterDiameter() + { + return exitOuterDiameter; + } + + public void setExitThickness(Long exitThickness) + { + this.exitThickness = exitThickness; + } + + public Long getExitThickness() + { + return exitThickness; + } + + public void setExitWidth(Long exitWidth) + { + this.exitWidth = exitWidth; + } + + public Long getExitWidth() + { + return exitWidth; + } + + public void setCustomer(String customer) + { + this.customer = customer; + } + + public String getCustomer() + { + return customer; + } + + public void setOnlineTime(Date onlineTime) + { + this.onlineTime = onlineTime; + } + + public Date getOnlineTime() + { + return onlineTime; + } + + public void setStartTime(Date startTime) + { + this.startTime = startTime; + } + + public Date getStartTime() + { + return startTime; + } + + public void setEndTime(Date endTime) + { + this.endTime = endTime; + } + + public Date getEndTime() + { + return endTime; + } + + public void setUnitCode(String unitCode) + { + this.unitCode = unitCode; + } + + public String getUnitCode() + { + return unitCode; + } + + public void setProcessCode(String processCode) + { + this.processCode = processCode; + } + + public String getProcessCode() + { + return processCode; + } + + public void setLastFlag(Integer lastFlag) + { + this.lastFlag = lastFlag; + } + + public Integer getLastFlag() + { + return lastFlag; + } + + public void setSeparateFlag(Integer separateFlag) + { + this.separateFlag = separateFlag; + } + + public Integer getSeparateFlag() + { + return separateFlag; + } + + public void setPlanOrigin(String planOrigin) + { + this.planOrigin = planOrigin; + } + + public String getPlanOrigin() + { + return planOrigin; + } + + public void setZincCoatingThickness(BigDecimal zincCoatingThickness) + { + this.zincCoatingThickness = zincCoatingThickness; + } + + public BigDecimal getZincCoatingThickness() + { + return zincCoatingThickness; + } + + public void setEnterCoilNo(String enterCoilNo) + { + this.enterCoilNo = enterCoilNo; + } + + public String getEnterCoilNo() + { + return enterCoilNo; + } + + public void setDelFlag(String delFlag) + { + this.delFlag = delFlag; + } + + public String getDelFlag() + { + return delFlag; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("actualId", getActualId()) + .append("exitMatId", getExitMatId()) + .append("entryMatId", getEntryMatId()) + .append("subId", getSubId()) + .append("startPosition", getStartPosition()) + .append("endPosition", getEndPosition()) + .append("planId", getPlanId()) + .append("planNo", getPlanNo()) + .append("prodCode", getProdCode()) + .append("groupNo", getGroupNo()) + .append("shiftNo", getShiftNo()) + .append("status", getStatus()) + .append("steelGrade", getSteelGrade()) + .append("entryThick", getEntryThick()) + .append("entryWidth", getEntryWidth()) + .append("entryLength", getEntryLength()) + .append("entryWeight", getEntryWeight()) + .append("weightTop", getWeightTop()) + .append("weightBottom", getWeightBottom()) + .append("exitLength", getExitLength()) + .append("exitNetWeight", getExitNetWeight()) + .append("theoryWeight", getTheoryWeight()) + .append("actualWeight", getActualWeight()) + .append("exitOuterDiameter", getExitOuterDiameter()) + .append("exitThickness", getExitThickness()) + .append("exitWidth", getExitWidth()) + .append("customer", getCustomer()) + .append("onlineTime", getOnlineTime()) + .append("startTime", getStartTime()) + .append("endTime", getEndTime()) + .append("unitCode", getUnitCode()) + .append("processCode", getProcessCode()) + .append("lastFlag", getLastFlag()) + .append("separateFlag", getSeparateFlag()) + .append("planOrigin", getPlanOrigin()) + .append("zincCoatingThickness", getZincCoatingThickness()) + .append("enterCoilNo", getEnterCoilNo()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .append("delFlag", getDelFlag()) + .toString(); + } +} diff --git a/ruoyi-mill/src/main/java/com/ruoyi/mill/domain/MillProductionStop.java b/ruoyi-mill/src/main/java/com/ruoyi/mill/domain/MillProductionStop.java new file mode 100644 index 00000000..222dac38 --- /dev/null +++ b/ruoyi-mill/src/main/java/com/ruoyi/mill/domain/MillProductionStop.java @@ -0,0 +1,226 @@ +package com.ruoyi.mill.domain; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 轧线生产停机对象 mill_production_stop + * + * @author ruoyi + * @date 2026-05-06 + */ +public class MillProductionStop extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键ID */ + private Long stopId; + + /** 钢卷号 */ + @Excel(name = "钢卷号") + private String coilId; + + /** 班次 */ + @Excel(name = "班次") + private String shift; + + /** 班组 */ + @Excel(name = "班组") + private String crew; + + /** 区域 */ + @Excel(name = "区域") + private String area; + + /** 机组 */ + @Excel(name = "机组") + private String unit; + + /** 设置人 */ + @Excel(name = "设置人") + private String setOn; + + /** 停机开始时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "停机开始时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date startDate; + + /** 停机结束时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "停机结束时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date endDate; + + /** 停机时长 */ + @Excel(name = "停机时长") + private Long duration; + + /** 录入时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "录入时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date insDate; + + /** 停机类型 */ + @Excel(name = "停机类型") + private String stopType; + + /** 删除标志 0-存在 2-删除 */ + private String delFlag; + + public void setStopId(Long stopId) + { + this.stopId = stopId; + } + + public Long getStopId() + { + return stopId; + } + + public void setCoilId(String coilId) + { + this.coilId = coilId; + } + + public String getCoilId() + { + return coilId; + } + + public void setShift(String shift) + { + this.shift = shift; + } + + public String getShift() + { + return shift; + } + + public void setCrew(String crew) + { + this.crew = crew; + } + + public String getCrew() + { + return crew; + } + + public void setArea(String area) + { + this.area = area; + } + + public String getArea() + { + return area; + } + + public void setUnit(String unit) + { + this.unit = unit; + } + + public String getUnit() + { + return unit; + } + + public void setSetOn(String setOn) + { + this.setOn = setOn; + } + + public String getSetOn() + { + return setOn; + } + + public void setStartDate(Date startDate) + { + this.startDate = startDate; + } + + public Date getStartDate() + { + return startDate; + } + + public void setEndDate(Date endDate) + { + this.endDate = endDate; + } + + public Date getEndDate() + { + return endDate; + } + + public void setDuration(Long duration) + { + this.duration = duration; + } + + public Long getDuration() + { + return duration; + } + + public void setInsDate(Date insDate) + { + this.insDate = insDate; + } + + public Date getInsDate() + { + return insDate; + } + + public void setStopType(String stopType) + { + this.stopType = stopType; + } + + public String getStopType() + { + return stopType; + } + + public void setDelFlag(String delFlag) + { + this.delFlag = delFlag; + } + + public String getDelFlag() + { + return delFlag; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("stopId", getStopId()) + .append("coilId", getCoilId()) + .append("shift", getShift()) + .append("crew", getCrew()) + .append("area", getArea()) + .append("unit", getUnit()) + .append("setOn", getSetOn()) + .append("startDate", getStartDate()) + .append("endDate", getEndDate()) + .append("duration", getDuration()) + .append("insDate", getInsDate()) + .append("stopType", getStopType()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .append("delFlag", getDelFlag()) + .toString(); + } +} diff --git a/ruoyi-mill/src/main/java/com/ruoyi/mill/domain/MillSystemLog.java b/ruoyi-mill/src/main/java/com/ruoyi/mill/domain/MillSystemLog.java new file mode 100644 index 00000000..5f8f0adb --- /dev/null +++ b/ruoyi-mill/src/main/java/com/ruoyi/mill/domain/MillSystemLog.java @@ -0,0 +1,165 @@ +package com.ruoyi.mill.domain; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 轧线系统日志对象 mill_system_log + * + * @author ruoyi + * @date 2026-05-06 + */ +public class MillSystemLog extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键ID */ + private Long logId; + + /** 原始序列号 */ + @Excel(name = "原始序列号") + private Long seqid; + + /** 日志时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "日志时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date timestamp; + + /** 模块名称 */ + @Excel(name = "模块名称") + private String module; + + /** 日志类型 */ + @Excel(name = "日志类型") + private String logType; + + /** 日志内容 */ + @Excel(name = "日志内容") + private String logText; + + /** 日志状态 */ + @Excel(name = "日志状态") + private Long status; + + /** 确认时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "确认时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date confirmTime; + + /** 删除标志 0-存在 2-删除 */ + private String delFlag; + + public void setLogId(Long logId) + { + this.logId = logId; + } + + public Long getLogId() + { + return logId; + } + + public void setSeqid(Long seqid) + { + this.seqid = seqid; + } + + public Long getSeqid() + { + return seqid; + } + + public void setTimestamp(Date timestamp) + { + this.timestamp = timestamp; + } + + public Date getTimestamp() + { + return timestamp; + } + + public void setModule(String module) + { + this.module = module; + } + + public String getModule() + { + return module; + } + + public void setLogType(String logType) + { + this.logType = logType; + } + + public String getLogType() + { + return logType; + } + + public void setLogText(String logText) + { + this.logText = logText; + } + + public String getLogText() + { + return logText; + } + + public void setStatus(Long status) + { + this.status = status; + } + + public Long getStatus() + { + return status; + } + + public void setConfirmTime(Date confirmTime) + { + this.confirmTime = confirmTime; + } + + public Date getConfirmTime() + { + return confirmTime; + } + + public void setDelFlag(String delFlag) + { + this.delFlag = delFlag; + } + + public String getDelFlag() + { + return delFlag; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("logId", getLogId()) + .append("seqid", getSeqid()) + .append("timestamp", getTimestamp()) + .append("module", getModule()) + .append("logType", getLogType()) + .append("logText", getLogText()) + .append("status", getStatus()) + .append("confirmTime", getConfirmTime()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .append("delFlag", getDelFlag()) + .toString(); + } +} diff --git a/ruoyi-mill/src/main/java/com/ruoyi/mill/mapper/MillProductionActualMapper.java b/ruoyi-mill/src/main/java/com/ruoyi/mill/mapper/MillProductionActualMapper.java new file mode 100644 index 00000000..aee3aff1 --- /dev/null +++ b/ruoyi-mill/src/main/java/com/ruoyi/mill/mapper/MillProductionActualMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.mill.mapper; + +import java.util.List; +import com.ruoyi.mill.domain.MillProductionActual; + +/** + * 轧线生产实绩Mapper接口 + * + * @author ruoyi + * @date 2026-05-06 + */ +public interface MillProductionActualMapper +{ + /** + * 查询轧线生产实绩 + * + * @param actualId 轧线生产实绩主键 + * @return 轧线生产实绩 + */ + public MillProductionActual selectMillProductionActualByActualId(Long actualId); + + /** + * 查询轧线生产实绩列表 + * + * @param millProductionActual 轧线生产实绩 + * @return 轧线生产实绩集合 + */ + public List selectMillProductionActualList(MillProductionActual millProductionActual); + + /** + * 新增轧线生产实绩 + * + * @param millProductionActual 轧线生产实绩 + * @return 结果 + */ + public int insertMillProductionActual(MillProductionActual millProductionActual); + + /** + * 修改轧线生产实绩 + * + * @param millProductionActual 轧线生产实绩 + * @return 结果 + */ + public int updateMillProductionActual(MillProductionActual millProductionActual); + + /** + * 删除轧线生产实绩 + * + * @param actualId 轧线生产实绩主键 + * @return 结果 + */ + public int deleteMillProductionActualByActualId(Long actualId); + + /** + * 批量删除轧线生产实绩 + * + * @param actualIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteMillProductionActualByActualIds(Long[] actualIds); +} diff --git a/ruoyi-mill/src/main/java/com/ruoyi/mill/mapper/MillProductionStopMapper.java b/ruoyi-mill/src/main/java/com/ruoyi/mill/mapper/MillProductionStopMapper.java new file mode 100644 index 00000000..b16c118f --- /dev/null +++ b/ruoyi-mill/src/main/java/com/ruoyi/mill/mapper/MillProductionStopMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.mill.mapper; + +import java.util.List; +import com.ruoyi.mill.domain.MillProductionStop; + +/** + * 轧线生产停机Mapper接口 + * + * @author ruoyi + * @date 2026-05-06 + */ +public interface MillProductionStopMapper +{ + /** + * 查询轧线生产停机 + * + * @param stopId 轧线生产停机主键 + * @return 轧线生产停机 + */ + public MillProductionStop selectMillProductionStopByStopId(Long stopId); + + /** + * 查询轧线生产停机列表 + * + * @param millProductionStop 轧线生产停机 + * @return 轧线生产停机集合 + */ + public List selectMillProductionStopList(MillProductionStop millProductionStop); + + /** + * 新增轧线生产停机 + * + * @param millProductionStop 轧线生产停机 + * @return 结果 + */ + public int insertMillProductionStop(MillProductionStop millProductionStop); + + /** + * 修改轧线生产停机 + * + * @param millProductionStop 轧线生产停机 + * @return 结果 + */ + public int updateMillProductionStop(MillProductionStop millProductionStop); + + /** + * 删除轧线生产停机 + * + * @param stopId 轧线生产停机主键 + * @return 结果 + */ + public int deleteMillProductionStopByStopId(Long stopId); + + /** + * 批量删除轧线生产停机 + * + * @param stopIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteMillProductionStopByStopIds(Long[] stopIds); +} diff --git a/ruoyi-mill/src/main/java/com/ruoyi/mill/mapper/MillSystemLogMapper.java b/ruoyi-mill/src/main/java/com/ruoyi/mill/mapper/MillSystemLogMapper.java new file mode 100644 index 00000000..d15bfa62 --- /dev/null +++ b/ruoyi-mill/src/main/java/com/ruoyi/mill/mapper/MillSystemLogMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.mill.mapper; + +import java.util.List; +import com.ruoyi.mill.domain.MillSystemLog; + +/** + * 轧线系统日志Mapper接口 + * + * @author ruoyi + * @date 2026-05-06 + */ +public interface MillSystemLogMapper +{ + /** + * 查询轧线系统日志 + * + * @param logId 轧线系统日志主键 + * @return 轧线系统日志 + */ + public MillSystemLog selectMillSystemLogByLogId(Long logId); + + /** + * 查询轧线系统日志列表 + * + * @param millSystemLog 轧线系统日志 + * @return 轧线系统日志集合 + */ + public List selectMillSystemLogList(MillSystemLog millSystemLog); + + /** + * 新增轧线系统日志 + * + * @param millSystemLog 轧线系统日志 + * @return 结果 + */ + public int insertMillSystemLog(MillSystemLog millSystemLog); + + /** + * 修改轧线系统日志 + * + * @param millSystemLog 轧线系统日志 + * @return 结果 + */ + public int updateMillSystemLog(MillSystemLog millSystemLog); + + /** + * 删除轧线系统日志 + * + * @param logId 轧线系统日志主键 + * @return 结果 + */ + public int deleteMillSystemLogByLogId(Long logId); + + /** + * 批量删除轧线系统日志 + * + * @param logIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteMillSystemLogByLogIds(Long[] logIds); +} diff --git a/ruoyi-mill/src/main/java/com/ruoyi/mill/service/IMillProductionActualService.java b/ruoyi-mill/src/main/java/com/ruoyi/mill/service/IMillProductionActualService.java new file mode 100644 index 00000000..91053a91 --- /dev/null +++ b/ruoyi-mill/src/main/java/com/ruoyi/mill/service/IMillProductionActualService.java @@ -0,0 +1,61 @@ +package com.ruoyi.mill.service; + +import java.util.List; +import com.ruoyi.mill.domain.MillProductionActual; + +/** + * 轧线生产实绩Service接口 + * + * @author ruoyi + * @date 2026-05-06 + */ +public interface IMillProductionActualService +{ + /** + * 查询轧线生产实绩 + * + * @param actualId 轧线生产实绩主键 + * @return 轧线生产实绩 + */ + public MillProductionActual selectMillProductionActualByActualId(Long actualId); + + /** + * 查询轧线生产实绩列表 + * + * @param millProductionActual 轧线生产实绩 + * @return 轧线生产实绩集合 + */ + public List selectMillProductionActualList(MillProductionActual millProductionActual); + + /** + * 新增轧线生产实绩 + * + * @param millProductionActual 轧线生产实绩 + * @return 结果 + */ + public int insertMillProductionActual(MillProductionActual millProductionActual); + + /** + * 修改轧线生产实绩 + * + * @param millProductionActual 轧线生产实绩 + * @return 结果 + */ + public int updateMillProductionActual(MillProductionActual millProductionActual); + + /** + * 批量删除轧线生产实绩 + * + * @param actualIds 需要删除的轧线生产实绩主键集合 + * @return 结果 + */ + public int deleteMillProductionActualByActualIds(Long[] actualIds); + + /** + * 删除轧线生产实绩信息 + * + * @param actualId 轧线生产实绩主键 + * @return 结果 + */ + public int deleteMillProductionActualByActualId(Long actualId); +} diff --git a/ruoyi-mill/src/main/java/com/ruoyi/mill/service/IMillProductionStopService.java b/ruoyi-mill/src/main/java/com/ruoyi/mill/service/IMillProductionStopService.java new file mode 100644 index 00000000..ca613667 --- /dev/null +++ b/ruoyi-mill/src/main/java/com/ruoyi/mill/service/IMillProductionStopService.java @@ -0,0 +1,61 @@ +package com.ruoyi.mill.service; + +import java.util.List; +import com.ruoyi.mill.domain.MillProductionStop; + +/** + * 轧线生产停机Service接口 + * + * @author ruoyi + * @date 2026-05-06 + */ +public interface IMillProductionStopService +{ + /** + * 查询轧线生产停机 + * + * @param stopId 轧线生产停机主键 + * @return 轧线生产停机 + */ + public MillProductionStop selectMillProductionStopByStopId(Long stopId); + + /** + * 查询轧线生产停机列表 + * + * @param millProductionStop 轧线生产停机 + * @return 轧线生产停机集合 + */ + public List selectMillProductionStopList(MillProductionStop millProductionStop); + + /** + * 新增轧线生产停机 + * + * @param millProductionStop 轧线生产停机 + * @return 结果 + */ + public int insertMillProductionStop(MillProductionStop millProductionStop); + + /** + * 修改轧线生产停机 + * + * @param millProductionStop 轧线生产停机 + * @return 结果 + */ + public int updateMillProductionStop(MillProductionStop millProductionStop); + + /** + * 批量删除轧线生产停机 + * + * @param stopIds 需要删除的轧线生产停机主键集合 + * @return 结果 + */ + public int deleteMillProductionStopByStopIds(Long[] stopIds); + + /** + * 删除轧线生产停机信息 + * + * @param stopId 轧线生产停机主键 + * @return 结果 + */ + public int deleteMillProductionStopByStopId(Long stopId); +} diff --git a/ruoyi-mill/src/main/java/com/ruoyi/mill/service/IMillSystemLogService.java b/ruoyi-mill/src/main/java/com/ruoyi/mill/service/IMillSystemLogService.java new file mode 100644 index 00000000..590a25df --- /dev/null +++ b/ruoyi-mill/src/main/java/com/ruoyi/mill/service/IMillSystemLogService.java @@ -0,0 +1,61 @@ +package com.ruoyi.mill.service; + +import java.util.List; +import com.ruoyi.mill.domain.MillSystemLog; + +/** + * 轧线系统日志Service接口 + * + * @author ruoyi + * @date 2026-05-06 + */ +public interface IMillSystemLogService +{ + /** + * 查询轧线系统日志 + * + * @param logId 轧线系统日志主键 + * @return 轧线系统日志 + */ + public MillSystemLog selectMillSystemLogByLogId(Long logId); + + /** + * 查询轧线系统日志列表 + * + * @param millSystemLog 轧线系统日志 + * @return 轧线系统日志集合 + */ + public List selectMillSystemLogList(MillSystemLog millSystemLog); + + /** + * 新增轧线系统日志 + * + * @param millSystemLog 轧线系统日志 + * @return 结果 + */ + public int insertMillSystemLog(MillSystemLog millSystemLog); + + /** + * 修改轧线系统日志 + * + * @param millSystemLog 轧线系统日志 + * @return 结果 + */ + public int updateMillSystemLog(MillSystemLog millSystemLog); + + /** + * 批量删除轧线系统日志 + * + * @param logIds 需要删除的轧线系统日志主键集合 + * @return 结果 + */ + public int deleteMillSystemLogByLogIds(Long[] logIds); + + /** + * 删除轧线系统日志信息 + * + * @param logId 轧线系统日志主键 + * @return 结果 + */ + public int deleteMillSystemLogByLogId(Long logId); +} diff --git a/ruoyi-mill/src/main/java/com/ruoyi/mill/service/impl/MillProductionActualServiceImpl.java b/ruoyi-mill/src/main/java/com/ruoyi/mill/service/impl/MillProductionActualServiceImpl.java new file mode 100644 index 00000000..d0db3116 --- /dev/null +++ b/ruoyi-mill/src/main/java/com/ruoyi/mill/service/impl/MillProductionActualServiceImpl.java @@ -0,0 +1,96 @@ +package com.ruoyi.mill.service.impl; + +import java.util.List; +import com.ruoyi.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.mill.mapper.MillProductionActualMapper; +import com.ruoyi.mill.domain.MillProductionActual; +import com.ruoyi.mill.service.IMillProductionActualService; + +/** + * 轧线生产实绩Service业务层处理 + * + * @author ruoyi + * @date 2026-05-06 + */ +@Service +public class MillProductionActualServiceImpl implements IMillProductionActualService +{ + @Autowired + private MillProductionActualMapper millProductionActualMapper; + + /** + * 查询轧线生产实绩 + * + * @param actualId 轧线生产实绩主键 + * @return 轧线生产实绩 + */ + @Override + public MillProductionActual selectMillProductionActualByActualId(Long actualId) + { + return millProductionActualMapper.selectMillProductionActualByActualId(actualId); + } + + /** + * 查询轧线生产实绩列表 + * + * @param millProductionActual 轧线生产实绩 + * @return 轧线生产实绩 + */ + @Override + public List selectMillProductionActualList(MillProductionActual millProductionActual) + { + return millProductionActualMapper.selectMillProductionActualList(millProductionActual); + } + + /** + * 新增轧线生产实绩 + * + * @param millProductionActual 轧线生产实绩 + * @return 结果 + */ + @Override + public int insertMillProductionActual(MillProductionActual millProductionActual) + { + millProductionActual.setCreateTime(DateUtils.getNowDate()); + return millProductionActualMapper.insertMillProductionActual(millProductionActual); + } + + /** + * 修改轧线生产实绩 + * + * @param millProductionActual 轧线生产实绩 + * @return 结果 + */ + @Override + public int updateMillProductionActual(MillProductionActual millProductionActual) + { + millProductionActual.setUpdateTime(DateUtils.getNowDate()); + return millProductionActualMapper.updateMillProductionActual(millProductionActual); + } + + /** + * 批量删除轧线生产实绩 + * + * @param actualIds 需要删除的轧线生产实绩主键 + * @return 结果 + */ + @Override + public int deleteMillProductionActualByActualIds(Long[] actualIds) + { + return millProductionActualMapper.deleteMillProductionActualByActualIds(actualIds); + } + + /** + * 删除轧线生产实绩信息 + * + * @param actualId 轧线生产实绩主键 + * @return 结果 + */ + @Override + public int deleteMillProductionActualByActualId(Long actualId) + { + return millProductionActualMapper.deleteMillProductionActualByActualId(actualId); + } +} diff --git a/ruoyi-mill/src/main/java/com/ruoyi/mill/service/impl/MillProductionStopServiceImpl.java b/ruoyi-mill/src/main/java/com/ruoyi/mill/service/impl/MillProductionStopServiceImpl.java new file mode 100644 index 00000000..2797e1c4 --- /dev/null +++ b/ruoyi-mill/src/main/java/com/ruoyi/mill/service/impl/MillProductionStopServiceImpl.java @@ -0,0 +1,96 @@ +package com.ruoyi.mill.service.impl; + +import java.util.List; +import com.ruoyi.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.mill.mapper.MillProductionStopMapper; +import com.ruoyi.mill.domain.MillProductionStop; +import com.ruoyi.mill.service.IMillProductionStopService; + +/** + * 轧线生产停机Service业务层处理 + * + * @author ruoyi + * @date 2026-05-06 + */ +@Service +public class MillProductionStopServiceImpl implements IMillProductionStopService +{ + @Autowired + private MillProductionStopMapper millProductionStopMapper; + + /** + * 查询轧线生产停机 + * + * @param stopId 轧线生产停机主键 + * @return 轧线生产停机 + */ + @Override + public MillProductionStop selectMillProductionStopByStopId(Long stopId) + { + return millProductionStopMapper.selectMillProductionStopByStopId(stopId); + } + + /** + * 查询轧线生产停机列表 + * + * @param millProductionStop 轧线生产停机 + * @return 轧线生产停机 + */ + @Override + public List selectMillProductionStopList(MillProductionStop millProductionStop) + { + return millProductionStopMapper.selectMillProductionStopList(millProductionStop); + } + + /** + * 新增轧线生产停机 + * + * @param millProductionStop 轧线生产停机 + * @return 结果 + */ + @Override + public int insertMillProductionStop(MillProductionStop millProductionStop) + { + millProductionStop.setCreateTime(DateUtils.getNowDate()); + return millProductionStopMapper.insertMillProductionStop(millProductionStop); + } + + /** + * 修改轧线生产停机 + * + * @param millProductionStop 轧线生产停机 + * @return 结果 + */ + @Override + public int updateMillProductionStop(MillProductionStop millProductionStop) + { + millProductionStop.setUpdateTime(DateUtils.getNowDate()); + return millProductionStopMapper.updateMillProductionStop(millProductionStop); + } + + /** + * 批量删除轧线生产停机 + * + * @param stopIds 需要删除的轧线生产停机主键 + * @return 结果 + */ + @Override + public int deleteMillProductionStopByStopIds(Long[] stopIds) + { + return millProductionStopMapper.deleteMillProductionStopByStopIds(stopIds); + } + + /** + * 删除轧线生产停机信息 + * + * @param stopId 轧线生产停机主键 + * @return 结果 + */ + @Override + public int deleteMillProductionStopByStopId(Long stopId) + { + return millProductionStopMapper.deleteMillProductionStopByStopId(stopId); + } +} diff --git a/ruoyi-mill/src/main/java/com/ruoyi/mill/service/impl/MillSystemLogServiceImpl.java b/ruoyi-mill/src/main/java/com/ruoyi/mill/service/impl/MillSystemLogServiceImpl.java new file mode 100644 index 00000000..ebe3fd09 --- /dev/null +++ b/ruoyi-mill/src/main/java/com/ruoyi/mill/service/impl/MillSystemLogServiceImpl.java @@ -0,0 +1,96 @@ +package com.ruoyi.mill.service.impl; + +import java.util.List; +import com.ruoyi.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.mill.mapper.MillSystemLogMapper; +import com.ruoyi.mill.domain.MillSystemLog; +import com.ruoyi.mill.service.IMillSystemLogService; + +/** + * 轧线系统日志Service业务层处理 + * + * @author ruoyi + * @date 2026-05-06 + */ +@Service +public class MillSystemLogServiceImpl implements IMillSystemLogService +{ + @Autowired + private MillSystemLogMapper millSystemLogMapper; + + /** + * 查询轧线系统日志 + * + * @param logId 轧线系统日志主键 + * @return 轧线系统日志 + */ + @Override + public MillSystemLog selectMillSystemLogByLogId(Long logId) + { + return millSystemLogMapper.selectMillSystemLogByLogId(logId); + } + + /** + * 查询轧线系统日志列表 + * + * @param millSystemLog 轧线系统日志 + * @return 轧线系统日志 + */ + @Override + public List selectMillSystemLogList(MillSystemLog millSystemLog) + { + return millSystemLogMapper.selectMillSystemLogList(millSystemLog); + } + + /** + * 新增轧线系统日志 + * + * @param millSystemLog 轧线系统日志 + * @return 结果 + */ + @Override + public int insertMillSystemLog(MillSystemLog millSystemLog) + { + millSystemLog.setCreateTime(DateUtils.getNowDate()); + return millSystemLogMapper.insertMillSystemLog(millSystemLog); + } + + /** + * 修改轧线系统日志 + * + * @param millSystemLog 轧线系统日志 + * @return 结果 + */ + @Override + public int updateMillSystemLog(MillSystemLog millSystemLog) + { + millSystemLog.setUpdateTime(DateUtils.getNowDate()); + return millSystemLogMapper.updateMillSystemLog(millSystemLog); + } + + /** + * 批量删除轧线系统日志 + * + * @param logIds 需要删除的轧线系统日志主键 + * @return 结果 + */ + @Override + public int deleteMillSystemLogByLogIds(Long[] logIds) + { + return millSystemLogMapper.deleteMillSystemLogByLogIds(logIds); + } + + /** + * 删除轧线系统日志信息 + * + * @param logId 轧线系统日志主键 + * @return 结果 + */ + @Override + public int deleteMillSystemLogByLogId(Long logId) + { + return millSystemLogMapper.deleteMillSystemLogByLogId(logId); + } +} diff --git a/ruoyi-mill/src/main/resources/mapper/mill/MillProductionActualMapper.xml b/ruoyi-mill/src/main/resources/mapper/mill/MillProductionActualMapper.xml new file mode 100644 index 00000000..84c33c94 --- /dev/null +++ b/ruoyi-mill/src/main/resources/mapper/mill/MillProductionActualMapper.xml @@ -0,0 +1,255 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select actual_id, exit_mat_id, entry_mat_id, sub_id, start_position, end_position, plan_id, plan_no, prod_code, group_no, shift_no, status, steel_grade, entry_thick, entry_width, entry_length, entry_weight, weight_top, weight_bottom, exit_length, exit_net_weight, theory_weight, actual_weight, exit_outer_diameter, exit_thickness, exit_width, customer, online_time, start_time, end_time, unit_code, process_code, last_flag, separate_flag, plan_origin, zinc_coating_thickness, enter_coil_no, create_by, create_time, update_by, update_time, remark, del_flag from mill_production_actual + + + + + + + + insert into mill_production_actual + + exit_mat_id, + entry_mat_id, + sub_id, + start_position, + end_position, + plan_id, + plan_no, + prod_code, + group_no, + shift_no, + status, + steel_grade, + entry_thick, + entry_width, + entry_length, + entry_weight, + weight_top, + weight_bottom, + exit_length, + exit_net_weight, + theory_weight, + actual_weight, + exit_outer_diameter, + exit_thickness, + exit_width, + customer, + online_time, + start_time, + end_time, + unit_code, + process_code, + last_flag, + separate_flag, + plan_origin, + zinc_coating_thickness, + enter_coil_no, + create_by, + create_time, + update_by, + update_time, + remark, + del_flag, + + + #{exitMatId}, + #{entryMatId}, + #{subId}, + #{startPosition}, + #{endPosition}, + #{planId}, + #{planNo}, + #{prodCode}, + #{groupNo}, + #{shiftNo}, + #{status}, + #{steelGrade}, + #{entryThick}, + #{entryWidth}, + #{entryLength}, + #{entryWeight}, + #{weightTop}, + #{weightBottom}, + #{exitLength}, + #{exitNetWeight}, + #{theoryWeight}, + #{actualWeight}, + #{exitOuterDiameter}, + #{exitThickness}, + #{exitWidth}, + #{customer}, + #{onlineTime}, + #{startTime}, + #{endTime}, + #{unitCode}, + #{processCode}, + #{lastFlag}, + #{separateFlag}, + #{planOrigin}, + #{zincCoatingThickness}, + #{enterCoilNo}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{remark}, + #{delFlag}, + + + + + update mill_production_actual + + exit_mat_id = #{exitMatId}, + entry_mat_id = #{entryMatId}, + sub_id = #{subId}, + start_position = #{startPosition}, + end_position = #{endPosition}, + plan_id = #{planId}, + plan_no = #{planNo}, + prod_code = #{prodCode}, + group_no = #{groupNo}, + shift_no = #{shiftNo}, + status = #{status}, + steel_grade = #{steelGrade}, + entry_thick = #{entryThick}, + entry_width = #{entryWidth}, + entry_length = #{entryLength}, + entry_weight = #{entryWeight}, + weight_top = #{weightTop}, + weight_bottom = #{weightBottom}, + exit_length = #{exitLength}, + exit_net_weight = #{exitNetWeight}, + theory_weight = #{theoryWeight}, + actual_weight = #{actualWeight}, + exit_outer_diameter = #{exitOuterDiameter}, + exit_thickness = #{exitThickness}, + exit_width = #{exitWidth}, + customer = #{customer}, + online_time = #{onlineTime}, + start_time = #{startTime}, + end_time = #{endTime}, + unit_code = #{unitCode}, + process_code = #{processCode}, + last_flag = #{lastFlag}, + separate_flag = #{separateFlag}, + plan_origin = #{planOrigin}, + zinc_coating_thickness = #{zincCoatingThickness}, + enter_coil_no = #{enterCoilNo}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + remark = #{remark}, + del_flag = #{delFlag}, + + where actual_id = #{actualId} + + + + delete from mill_production_actual where actual_id = #{actualId} + + + + delete from mill_production_actual where actual_id in + + #{actualId} + + + diff --git a/ruoyi-mill/src/main/resources/mapper/mill/MillProductionStopMapper.xml b/ruoyi-mill/src/main/resources/mapper/mill/MillProductionStopMapper.xml new file mode 100644 index 00000000..c8e0ffea --- /dev/null +++ b/ruoyi-mill/src/main/resources/mapper/mill/MillProductionStopMapper.xml @@ -0,0 +1,130 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + select stop_id, coil_id, shift, crew, area, unit, set_on, start_date, end_date, duration, ins_date, stop_type, create_by, create_time, update_by, update_time, remark, del_flag from mill_production_stop + + + + + + + + insert into mill_production_stop + + coil_id, + shift, + crew, + area, + unit, + set_on, + start_date, + end_date, + duration, + ins_date, + stop_type, + create_by, + create_time, + update_by, + update_time, + remark, + del_flag, + + + #{coilId}, + #{shift}, + #{crew}, + #{area}, + #{unit}, + #{setOn}, + #{startDate}, + #{endDate}, + #{duration}, + #{insDate}, + #{stopType}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{remark}, + #{delFlag}, + + + + + update mill_production_stop + + coil_id = #{coilId}, + shift = #{shift}, + crew = #{crew}, + area = #{area}, + unit = #{unit}, + set_on = #{setOn}, + start_date = #{startDate}, + end_date = #{endDate}, + duration = #{duration}, + ins_date = #{insDate}, + stop_type = #{stopType}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + remark = #{remark}, + del_flag = #{delFlag}, + + where stop_id = #{stopId} + + + + delete from mill_production_stop where stop_id = #{stopId} + + + + delete from mill_production_stop where stop_id in + + #{stopId} + + + diff --git a/ruoyi-mill/src/main/resources/mapper/mill/MillSystemLogMapper.xml b/ruoyi-mill/src/main/resources/mapper/mill/MillSystemLogMapper.xml new file mode 100644 index 00000000..9ed11008 --- /dev/null +++ b/ruoyi-mill/src/main/resources/mapper/mill/MillSystemLogMapper.xml @@ -0,0 +1,110 @@ + + + + + + + + + + + + + + + + + + + + + + + select log_id, seqid, timestamp, module, log_type, log_text, status, confirm_time, create_by, create_time, update_by, update_time, remark, del_flag from mill_system_log + + + + + + + + insert into mill_system_log + + seqid, + timestamp, + module, + log_type, + log_text, + status, + confirm_time, + create_by, + create_time, + update_by, + update_time, + remark, + del_flag, + + + #{seqid}, + #{timestamp}, + #{module}, + #{logType}, + #{logText}, + #{status}, + #{confirmTime}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{remark}, + #{delFlag}, + + + + + update mill_system_log + + seqid = #{seqid}, + timestamp = #{timestamp}, + module = #{module}, + log_type = #{logType}, + log_text = #{logText}, + status = #{status}, + confirm_time = #{confirmTime}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + remark = #{remark}, + del_flag = #{delFlag}, + + where log_id = #{logId} + + + + delete from mill_system_log where log_id = #{logId} + + + + delete from mill_system_log where log_id in + + #{logId} + + +