From 673ef304d3f87064c8687bb8a0e251c06d1f89c4 Mon Sep 17 00:00:00 2001 From: youjianchi Date: Mon, 1 Apr 2024 20:25:50 +0800 Subject: [PATCH] =?UTF-8?q?[add]:=E7=94=9F=E4=BA=A7=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=9F=BA=E7=A1=80=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/system/domain/SysMakeorderDept.java | 201 ++++++++++++++++++ .../system/mapper/SysMakeorderDeptMapper.java | 77 +++++++ .../service/ISysMakeorderDeptService.java | 75 +++++++ .../impl/SysMakeorderDeptServiceImpl.java | 126 +++++++++++ .../mapper/system/SysMakeorderDeptMapper.xml | 134 ++++++++++++ 5 files changed, 613 insertions(+) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysMakeorderDept.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysMakeorderDeptMapper.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysMakeorderDeptService.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeorderDeptServiceImpl.java create mode 100644 ruoyi-admin/src/main/resources/mapper/system/SysMakeorderDeptMapper.xml diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysMakeorderDept.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysMakeorderDept.java new file mode 100644 index 00000000..1fa2d0c8 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysMakeorderDept.java @@ -0,0 +1,201 @@ +package com.ruoyi.system.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; + +/** + * 生产订单部门对象 sys_makeorder_dept + * + * @author ruoyi + * @date 2024-04-01 + */ +public class SysMakeorderDept extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键ID */ + private Long id; + + /** 删除标志（0代表存在 1代表删除） */ + private String delFlag; + + /** 生产订单号 */ + @Excel(name = "生产订单号") + private String makeNo; + + /** 料号 */ + @Excel(name = "料号") + private String materialNo; + + /** 部门id */ + @Excel(name = "部门id") + private Long deptId; + + /** 部门名称 */ + @Excel(name = "部门名称") + private String deptName; + + /** 计划完成开始时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "计划完成开始时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date planFinishStartDate; + + /** 计划完成结束时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "计划完成结束时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date planFinishEndDate; + + /** 计划完成天数 */ + @Excel(name = "计划完成天数") + private Long planFinishDays; + + /** 部门主管确认状态 0-待确认 1-已确认 */ + @Excel(name = "部门主管确认状态 0-待确认 1-已确认") + private String deptLeaderConfirmStatus; + + /** 实际完成开始时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "实际完成开始时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date actualFinishStartTime; + + /** 实际完成结束时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "实际完成结束时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date actualFinishEndTime; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setDelFlag(String delFlag) + { + this.delFlag = delFlag; + } + + public String getDelFlag() + { + return delFlag; + } + public void setMakeNo(String makeNo) + { + this.makeNo = makeNo; + } + + public String getMakeNo() + { + return makeNo; + } + public void setMaterialNo(String materialNo) + { + this.materialNo = materialNo; + } + + public String getMaterialNo() + { + return materialNo; + } + public void setDeptId(Long deptId) + { + this.deptId = deptId; + } + + public Long getDeptId() + { + return deptId; + } + public void setDeptName(String deptName) + { + this.deptName = deptName; + } + + public String getDeptName() + { + return deptName; + } + public void setPlanFinishStartDate(Date planFinishStartDate) + { + this.planFinishStartDate = planFinishStartDate; + } + + public Date getPlanFinishStartDate() + { + return planFinishStartDate; + } + public void setPlanFinishEndDate(Date planFinishEndDate) + { + this.planFinishEndDate = planFinishEndDate; + } + + public Date getPlanFinishEndDate() + { + return planFinishEndDate; + } + public void setPlanFinishDays(Long planFinishDays) + { + this.planFinishDays = planFinishDays; + } + + public Long getPlanFinishDays() + { + return planFinishDays; + } + public void setDeptLeaderConfirmStatus(String deptLeaderConfirmStatus) + { + this.deptLeaderConfirmStatus = deptLeaderConfirmStatus; + } + + public String getDeptLeaderConfirmStatus() + { + return deptLeaderConfirmStatus; + } + public void setActualFinishStartTime(Date actualFinishStartTime) + { + this.actualFinishStartTime = actualFinishStartTime; + } + + public Date getActualFinishStartTime() + { + return actualFinishStartTime; + } + public void setActualFinishEndTime(Date actualFinishEndTime) + { + this.actualFinishEndTime = actualFinishEndTime; + } + + public Date getActualFinishEndTime() + { + return actualFinishEndTime; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("delFlag", getDelFlag()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .append("makeNo", getMakeNo()) + .append("materialNo", getMaterialNo()) + .append("deptId", getDeptId()) + .append("deptName", getDeptName()) + .append("planFinishStartDate", getPlanFinishStartDate()) + .append("planFinishEndDate", getPlanFinishEndDate()) + .append("planFinishDays", getPlanFinishDays()) + .append("deptLeaderConfirmStatus", getDeptLeaderConfirmStatus()) + .append("actualFinishStartTime", getActualFinishStartTime()) + .append("actualFinishEndTime", getActualFinishEndTime()) + .toString(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysMakeorderDeptMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysMakeorderDeptMapper.java new file mode 100644 index 00000000..bf2b53b8 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysMakeorderDeptMapper.java @@ -0,0 +1,77 @@ +package com.ruoyi.system.mapper; + +import java.util.List; +import com.ruoyi.system.domain.SysMakeorderDept; + +/** + * 生产订单部门Mapper接口 + * + * @author ruoyi + * @date 2024-04-01 + */ +public interface SysMakeorderDeptMapper +{ + /** + * 查询生产订单部门 + * + * @param id 生产订单部门ID + * @return 生产订单部门 + */ + public SysMakeorderDept selectSysMakeorderDeptById(Long id); + + /** + * 查询生产订单部门列表 + * + * @param sysMakeorderDept 生产订单部门 + * @return 生产订单部门集合 + */ + public List selectSysMakeorderDeptList(SysMakeorderDept sysMakeorderDept); + + /** + * 新增生产订单部门 + * + * @param sysMakeorderDept 生产订单部门 + * @return 结果 + */ + public int insertSysMakeorderDept(SysMakeorderDept sysMakeorderDept); + + /** + * 修改生产订单部门 + * + * @param sysMakeorderDept 生产订单部门 + * @return 结果 + */ + public int updateSysMakeorderDept(SysMakeorderDept sysMakeorderDept); + + /** + * 删除生产订单部门 + * + * @param id 生产订单部门ID + * @return 结果 + */ + public int deleteSysMakeorderDeptById(Long id); + + /** + * 批量删除生产订单部门 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteSysMakeorderDeptByIds(String[] ids); + + /** + * 作废生产订单部门 + * + * @param id 生产订单部门ID + * @return 结果 + */ + public int cancelSysMakeorderDeptById(Long id); + + /** + * 恢复生产订单部门 + * + * @param id 生产订单部门ID + * @return 结果 + */ + public int restoreSysMakeorderDeptById(Long id); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysMakeorderDeptService.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysMakeorderDeptService.java new file mode 100644 index 00000000..ca8298c4 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysMakeorderDeptService.java @@ -0,0 +1,75 @@ +package com.ruoyi.system.service; + +import java.util.List; +import com.ruoyi.system.domain.SysMakeorderDept; + +/** + * 生产订单部门Service接口 + * + * @author ruoyi + * @date 2024-04-01 + */ +public interface ISysMakeorderDeptService +{ + /** + * 查询生产订单部门 + * + * @param id 生产订单部门ID + * @return 生产订单部门 + */ + public SysMakeorderDept selectSysMakeorderDeptById(Long id); + + /** + * 查询生产订单部门列表 + * + * @param sysMakeorderDept 生产订单部门 + * @return 生产订单部门集合 + */ + public List selectSysMakeorderDeptList(SysMakeorderDept sysMakeorderDept); + + /** + * 新增生产订单部门 + * + * @param sysMakeorderDept 生产订单部门 + * @return 结果 + */ + public int insertSysMakeorderDept(SysMakeorderDept sysMakeorderDept); + + /** + * 修改生产订单部门 + * + * @param sysMakeorderDept 生产订单部门 + * @return 结果 + */ + public int updateSysMakeorderDept(SysMakeorderDept sysMakeorderDept); + + /** + * 批量删除生产订单部门 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteSysMakeorderDeptByIds(String ids); + + /** + * 删除生产订单部门信息 + * + * @param id 生产订单部门ID + * @return 结果 + */ + public int deleteSysMakeorderDeptById(Long id); + + /** + * 作废生产订单部门 + * @param id 生产订单部门ID + * @return + */ + int cancelSysMakeorderDeptById(Long id); + + /** + * 恢复生产订单部门 + * @param id 生产订单部门ID + * @return + */ + int restoreSysMakeorderDeptById(Long id); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeorderDeptServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeorderDeptServiceImpl.java new file mode 100644 index 00000000..1582ca49 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeorderDeptServiceImpl.java @@ -0,0 +1,126 @@ +package com.ruoyi.system.service.impl; + +import java.util.List; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.ShiroUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.system.mapper.SysMakeorderDeptMapper; +import com.ruoyi.system.domain.SysMakeorderDept; +import com.ruoyi.system.service.ISysMakeorderDeptService; +import com.ruoyi.common.core.text.Convert; + +/** + * 生产订单部门Service业务层处理 + * + * @author ruoyi + * @date 2024-04-01 + */ +@Service +public class SysMakeorderDeptServiceImpl implements ISysMakeorderDeptService +{ + @Autowired + private SysMakeorderDeptMapper sysMakeorderDeptMapper; + + /** + * 查询生产订单部门 + * + * @param id 生产订单部门ID + * @return 生产订单部门 + */ + @Override + public SysMakeorderDept selectSysMakeorderDeptById(Long id) + { + return sysMakeorderDeptMapper.selectSysMakeorderDeptById(id); + } + + /** + * 查询生产订单部门列表 + * + * @param sysMakeorderDept 生产订单部门 + * @return 生产订单部门 + */ + @Override + public List selectSysMakeorderDeptList(SysMakeorderDept sysMakeorderDept) + { + return sysMakeorderDeptMapper.selectSysMakeorderDeptList(sysMakeorderDept); + } + + /** + * 新增生产订单部门 + * + * @param sysMakeorderDept 生产订单部门 + * @return 结果 + */ + @Override + public int insertSysMakeorderDept(SysMakeorderDept sysMakeorderDept) + { + String loginName = ShiroUtils.getLoginName(); + sysMakeorderDept.setCreateBy(loginName); + sysMakeorderDept.setCreateTime(DateUtils.getNowDate()); + return sysMakeorderDeptMapper.insertSysMakeorderDept(sysMakeorderDept); + } + + /** + * 修改生产订单部门 + * + * @param sysMakeorderDept 生产订单部门 + * @return 结果 + */ + @Override + public int updateSysMakeorderDept(SysMakeorderDept sysMakeorderDept) + { + String loginName = ShiroUtils.getLoginName(); + sysMakeorderDept.setUpdateBy(loginName); + sysMakeorderDept.setUpdateTime(DateUtils.getNowDate()); + return sysMakeorderDeptMapper.updateSysMakeorderDept(sysMakeorderDept); + } + + /** + * 删除生产订单部门对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteSysMakeorderDeptByIds(String ids) + { + return sysMakeorderDeptMapper.deleteSysMakeorderDeptByIds(Convert.toStrArray(ids)); + } + + /** + * 删除生产订单部门信息 + * + * @param id 生产订单部门ID + * @return 结果 + */ + @Override + public int deleteSysMakeorderDeptById(Long id) + { + return sysMakeorderDeptMapper.deleteSysMakeorderDeptById(id); + } + + /** + * 作废生产订单部门 + * + * @param id 生产订单部门ID + * @return 结果 + */ + @Override + public int cancelSysMakeorderDeptById(Long id) + { + return sysMakeorderDeptMapper.cancelSysMakeorderDeptById(id); + } + + /** + * 恢复生产订单部门信息 + * + * @param id 生产订单部门ID + * @return 结果 + */ + @Override + public int restoreSysMakeorderDeptById(Long id) + { + return sysMakeorderDeptMapper.restoreSysMakeorderDeptById(id); + } +} diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysMakeorderDeptMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysMakeorderDeptMapper.xml new file mode 100644 index 00000000..3c532d0e --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/system/SysMakeorderDeptMapper.xml @@ -0,0 +1,134 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + select id, del_flag, create_by, create_time, update_by, update_time, remark, makeNo, material_no, dept_id, dept_name, plan_finish_start_date, plan_finish_end_date, plan_finish_days, dept_leader_confirm_status, actual_finish_start_time, actual_finish_end_time from sys_makeorder_dept + + + + + + + + insert into sys_makeorder_dept + + del_flag, + create_by, + create_time, + update_by, + update_time, + remark, + makeNo, + material_no, + dept_id, + dept_name, + plan_finish_start_date, + plan_finish_end_date, + plan_finish_days, + dept_leader_confirm_status, + actual_finish_start_time, + actual_finish_end_time, + + + #{delFlag}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{remark}, + #{makeNo}, + #{materialNo}, + #{deptId}, + #{deptName}, + #{planFinishStartDate}, + #{planFinishEndDate}, + #{planFinishDays}, + #{deptLeaderConfirmStatus}, + #{actualFinishStartTime}, + #{actualFinishEndTime}, + + + + + update sys_makeorder_dept + + del_flag = #{delFlag}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + remark = #{remark}, + makeNo = #{makeNo}, + material_no = #{materialNo}, + dept_id = #{deptId}, + dept_name = #{deptName}, + plan_finish_start_date = #{planFinishStartDate}, + plan_finish_end_date = #{planFinishEndDate}, + plan_finish_days = #{planFinishDays}, + dept_leader_confirm_status = #{deptLeaderConfirmStatus}, + actual_finish_start_time = #{actualFinishStartTime}, + actual_finish_end_time = #{actualFinishEndTime}, + + where id = #{id} + + + + delete from sys_makeorder_dept where id = #{id} + + + + delete from sys_makeorder_dept where id in + + #{id} + + + + + update sys_makeorder_dept set del_flag = '1' where id = #{id} + + + + update sys_makeorder_dept set del_flag = '0' where id = #{id} + + + \ No newline at end of file