From 4e83b606fa3b9b48da2b3f7681850e108e920fdf Mon Sep 17 00:00:00 2001 From: liuhanqing Date: Thu, 22 May 2025 17:57:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=20=E5=AD=90=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=20=E5=90=8E=E5=8F=B0=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mydojob/controller/MydoJobController.java | 104 +++++ .../com/ruoyi/job/mydojob/domain/MydoJob.java | 384 ++++++++++++++++ .../job/mydojob/mapper/MydoJobMapper.java | 61 +++ .../job/mydojob/service/IMydoJobService.java | 61 +++ .../service/impl/MydoJobServiceImpl.java | 95 ++++ .../controller/MydoJobDetailController.java | 104 +++++ .../mydojobdetail/domain/MydoJobDetail.java | 413 ++++++++++++++++++ .../mapper/MydoJobDetailMapper.java | 61 +++ .../service/IMydoJobDetailService.java | 61 +++ .../impl/MydoJobDetailServiceImpl.java | 93 ++++ .../mapper/job/MydoJobDetailMapper.xml | 179 ++++++++ .../resources/mapper/job/MydoJobMapper.xml | 173 ++++++++ 12 files changed, 1789 insertions(+) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/controller/MydoJobController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/domain/MydoJob.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/mapper/MydoJobMapper.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/IMydoJobService.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/controller/MydoJobDetailController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/domain/MydoJobDetail.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/mapper/MydoJobDetailMapper.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/service/IMydoJobDetailService.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/service/impl/MydoJobDetailServiceImpl.java create mode 100644 ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/controller/MydoJobController.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/controller/MydoJobController.java new file mode 100644 index 0000000..fee40dc --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/controller/MydoJobController.java @@ -0,0 +1,104 @@ +package com.ruoyi.job.mydojob.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.job.mydojob.domain.MydoJob; +import com.ruoyi.job.mydojob.service.IMydoJobService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 任务表Controller + * + * @author ruoyi + * @date 2025-05-22 + */ +@RestController +@RequestMapping("/job/mydoJob") +public class MydoJobController extends BaseController +{ + @Autowired + private IMydoJobService mydoJobService; + + /** + * 查询任务表列表 + */ + @PreAuthorize("@ss.hasPermi('job:mydoJob:list')") + @GetMapping("/list") + public TableDataInfo list(MydoJob mydoJob) + { + startPage(); + List list = mydoJobService.selectMydoJobList(mydoJob); + return getDataTable(list); + } + + /** + * 导出任务表列表 + */ + @PreAuthorize("@ss.hasPermi('job:mydoJob:export')") + @Log(title = "任务表", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, MydoJob mydoJob) + { + List list = mydoJobService.selectMydoJobList(mydoJob); + ExcelUtil util = new ExcelUtil(MydoJob.class); + util.exportExcel(response, list, "任务表数据"); + } + + /** + * 获取任务表详细信息 + */ + @PreAuthorize("@ss.hasPermi('job:mydoJob:query')") + @GetMapping(value = "/{jobId}") + public AjaxResult getInfo(@PathVariable("jobId") String jobId) + { + return success(mydoJobService.selectMydoJobByJobId(jobId)); + } + + /** + * 新增任务表 + */ + @PreAuthorize("@ss.hasPermi('job:mydoJob:add')") + @Log(title = "任务表", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody MydoJob mydoJob) + { + return toAjax(mydoJobService.insertMydoJob(mydoJob)); + } + + /** + * 修改任务表 + */ + @PreAuthorize("@ss.hasPermi('job:mydoJob:edit')") + @Log(title = "任务表", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody MydoJob mydoJob) + { + return toAjax(mydoJobService.updateMydoJob(mydoJob)); + } + + /** + * 删除任务表 + */ + @PreAuthorize("@ss.hasPermi('job:mydoJob:remove')") + @Log(title = "任务表", businessType = BusinessType.DELETE) + @DeleteMapping("/{jobIds}") + public AjaxResult remove(@PathVariable String[] jobIds) + { + return toAjax(mydoJobService.deleteMydoJobByJobIds(jobIds)); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/domain/MydoJob.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/domain/MydoJob.java new file mode 100644 index 0000000..5711fbb --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/domain/MydoJob.java @@ -0,0 +1,384 @@ +package com.ruoyi.job.mydojob.domain; + +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; + +/** + * 任务表对象 mydo_job + * + * @author ruoyi + * @date 2025-05-22 + */ +public class MydoJob extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 任务ID */ + @Excel(name = "任务ID") + private String jobId; + + /** 任务状态 */ + @Excel(name = "任务状态") + private String status; + + /** 上线类型 */ + @Excel(name = "上线类型") + private String onLineType; + + /** 任务号 */ + @Excel(name = "任务号") + private String taskNo; + + /** 供应商ID */ + @Excel(name = "供应商ID") + private String supplierId; + + /** 客户ID */ + @Excel(name = "客户ID") + private String customerId; + + /** 部门ID */ + @Excel(name = "部门ID") + private String departmentId; + + /** 托盘码 */ + @Excel(name = "托盘码") + private String trayCode; + + /** 巷道ID */ + @Excel(name = "巷道ID") + private String roadwayId; + + /** 货位ID */ + @Excel(name = "货位ID") + private String cargoSpaceId; + + /** 目标巷道ID */ + @Excel(name = "目标巷道ID") + private String targetRoadwayId; + + /** 目标货位ID */ + @Excel(name = "目标货位ID") + private String targetCargoSpaceId; + + /** 产线ID */ + @Excel(name = "产线ID") + private String lineId; + + /** 车间ID */ + @Excel(name = "车间ID") + private String workshopId; + + /** 优先级 */ + @Excel(name = "优先级") + private Long priority; + + /** 执行阶段 */ + @Excel(name = "执行阶段") + private String executionPhase; + + /** 任务类型 */ + @Excel(name = "任务类型") + private String inOrOut; + + /** 开始时间 */ + @Excel(name = "开始时间") + private String startTime; + + /** 结束时间 */ + @Excel(name = "结束时间") + private String finishTime; + + /** 入口ID */ + @Excel(name = "入口ID") + private String entranceId; + + /** 出口ID */ + @Excel(name = "出口ID") + private String exitId; + + /** 班组ID */ + @Excel(name = "班组ID") + private String classId; + + /** 仓库ID */ + @Excel(name = "仓库ID") + private String warehouseId; + + /** 重分标记 */ + @Excel(name = "重分标记") + private String faultFlag; + + public void setJobId(String jobId) + { + this.jobId = jobId; + } + + public String getJobId() + { + return jobId; + } + + public void setStatus(String status) + { + this.status = status; + } + + public String getStatus() + { + return status; + } + + public void setOnLineType(String onLineType) + { + this.onLineType = onLineType; + } + + public String getOnLineType() + { + return onLineType; + } + + public void setTaskNo(String taskNo) + { + this.taskNo = taskNo; + } + + public String getTaskNo() + { + return taskNo; + } + + public void setSupplierId(String supplierId) + { + this.supplierId = supplierId; + } + + public String getSupplierId() + { + return supplierId; + } + + public void setCustomerId(String customerId) + { + this.customerId = customerId; + } + + public String getCustomerId() + { + return customerId; + } + + public void setDepartmentId(String departmentId) + { + this.departmentId = departmentId; + } + + public String getDepartmentId() + { + return departmentId; + } + + public void setTrayCode(String trayCode) + { + this.trayCode = trayCode; + } + + public String getTrayCode() + { + return trayCode; + } + + public void setRoadwayId(String roadwayId) + { + this.roadwayId = roadwayId; + } + + public String getRoadwayId() + { + return roadwayId; + } + + public void setCargoSpaceId(String cargoSpaceId) + { + this.cargoSpaceId = cargoSpaceId; + } + + public String getCargoSpaceId() + { + return cargoSpaceId; + } + + public void setTargetRoadwayId(String targetRoadwayId) + { + this.targetRoadwayId = targetRoadwayId; + } + + public String getTargetRoadwayId() + { + return targetRoadwayId; + } + + public void setTargetCargoSpaceId(String targetCargoSpaceId) + { + this.targetCargoSpaceId = targetCargoSpaceId; + } + + public String getTargetCargoSpaceId() + { + return targetCargoSpaceId; + } + + public void setLineId(String lineId) + { + this.lineId = lineId; + } + + public String getLineId() + { + return lineId; + } + + public void setWorkshopId(String workshopId) + { + this.workshopId = workshopId; + } + + public String getWorkshopId() + { + return workshopId; + } + + public void setPriority(Long priority) + { + this.priority = priority; + } + + public Long getPriority() + { + return priority; + } + + public void setExecutionPhase(String executionPhase) + { + this.executionPhase = executionPhase; + } + + public String getExecutionPhase() + { + return executionPhase; + } + + public void setInOrOut(String inOrOut) + { + this.inOrOut = inOrOut; + } + + public String getInOrOut() + { + return inOrOut; + } + + public void setStartTime(String startTime) + { + this.startTime = startTime; + } + + public String getStartTime() + { + return startTime; + } + + public void setFinishTime(String finishTime) + { + this.finishTime = finishTime; + } + + public String getFinishTime() + { + return finishTime; + } + + public void setEntranceId(String entranceId) + { + this.entranceId = entranceId; + } + + public String getEntranceId() + { + return entranceId; + } + + public void setExitId(String exitId) + { + this.exitId = exitId; + } + + public String getExitId() + { + return exitId; + } + + public void setClassId(String classId) + { + this.classId = classId; + } + + public String getClassId() + { + return classId; + } + + public void setWarehouseId(String warehouseId) + { + this.warehouseId = warehouseId; + } + + public String getWarehouseId() + { + return warehouseId; + } + + public void setFaultFlag(String faultFlag) + { + this.faultFlag = faultFlag; + } + + public String getFaultFlag() + { + return faultFlag; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("jobId", getJobId()) + .append("status", getStatus()) + .append("onLineType", getOnLineType()) + .append("taskNo", getTaskNo()) + .append("supplierId", getSupplierId()) + .append("customerId", getCustomerId()) + .append("departmentId", getDepartmentId()) + .append("trayCode", getTrayCode()) + .append("roadwayId", getRoadwayId()) + .append("cargoSpaceId", getCargoSpaceId()) + .append("targetRoadwayId", getTargetRoadwayId()) + .append("targetCargoSpaceId", getTargetCargoSpaceId()) + .append("lineId", getLineId()) + .append("workshopId", getWorkshopId()) + .append("priority", getPriority()) + .append("executionPhase", getExecutionPhase()) + .append("inOrOut", getInOrOut()) + .append("createTime", getCreateTime()) + .append("startTime", getStartTime()) + .append("finishTime", getFinishTime()) + .append("entranceId", getEntranceId()) + .append("exitId", getExitId()) + .append("classId", getClassId()) + .append("warehouseId", getWarehouseId()) + .append("faultFlag", getFaultFlag()) + .toString(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/mapper/MydoJobMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/mapper/MydoJobMapper.java new file mode 100644 index 0000000..9f895d7 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/mapper/MydoJobMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.job.mydojob.mapper; + +import java.util.List; +import com.ruoyi.job.mydojob.domain.MydoJob; + +/** + * 任务表Mapper接口 + * + * @author ruoyi + * @date 2025-05-22 + */ +public interface MydoJobMapper +{ + /** + * 查询任务表 + * + * @param jobId 任务表主键 + * @return 任务表 + */ + public MydoJob selectMydoJobByJobId(String jobId); + + /** + * 查询任务表列表 + * + * @param mydoJob 任务表 + * @return 任务表集合 + */ + public List selectMydoJobList(MydoJob mydoJob); + + /** + * 新增任务表 + * + * @param mydoJob 任务表 + * @return 结果 + */ + public int insertMydoJob(MydoJob mydoJob); + + /** + * 修改任务表 + * + * @param mydoJob 任务表 + * @return 结果 + */ + public int updateMydoJob(MydoJob mydoJob); + + /** + * 删除任务表 + * + * @param jobId 任务表主键 + * @return 结果 + */ + public int deleteMydoJobByJobId(String jobId); + + /** + * 批量删除任务表 + * + * @param jobIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteMydoJobByJobIds(String[] jobIds); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/IMydoJobService.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/IMydoJobService.java new file mode 100644 index 0000000..ffd3173 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/IMydoJobService.java @@ -0,0 +1,61 @@ +package com.ruoyi.job.mydojob.service; + +import java.util.List; +import com.ruoyi.job.mydojob.domain.MydoJob; + +/** + * 任务表Service接口 + * + * @author ruoyi + * @date 2025-05-22 + */ +public interface IMydoJobService +{ + /** + * 查询任务表 + * + * @param jobId 任务表主键 + * @return 任务表 + */ + public MydoJob selectMydoJobByJobId(String jobId); + + /** + * 查询任务表列表 + * + * @param mydoJob 任务表 + * @return 任务表集合 + */ + public List selectMydoJobList(MydoJob mydoJob); + + /** + * 新增任务表 + * + * @param mydoJob 任务表 + * @return 结果 + */ + public int insertMydoJob(MydoJob mydoJob); + + /** + * 修改任务表 + * + * @param mydoJob 任务表 + * @return 结果 + */ + public int updateMydoJob(MydoJob mydoJob); + + /** + * 批量删除任务表 + * + * @param jobIds 需要删除的任务表主键集合 + * @return 结果 + */ + public int deleteMydoJobByJobIds(String[] jobIds); + + /** + * 删除任务表信息 + * + * @param jobId 任务表主键 + * @return 结果 + */ + public int deleteMydoJobByJobId(String jobId); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java new file mode 100644 index 0000000..3e160df --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java @@ -0,0 +1,95 @@ +package com.ruoyi.job.mydojob.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.job.mydojob.mapper.MydoJobMapper; +import com.ruoyi.job.mydojob.domain.MydoJob; +import com.ruoyi.job.mydojob.service.IMydoJobService; + +/** + * 任务表Service业务层处理 + * + * @author ruoyi + * @date 2025-05-22 + */ +@Service +public class MydoJobServiceImpl implements IMydoJobService +{ + @Autowired + private MydoJobMapper mydoJobMapper; + + /** + * 查询任务表 + * + * @param jobId 任务表主键 + * @return 任务表 + */ + @Override + public MydoJob selectMydoJobByJobId(String jobId) + { + return mydoJobMapper.selectMydoJobByJobId(jobId); + } + + /** + * 查询任务表列表 + * + * @param mydoJob 任务表 + * @return 任务表 + */ + @Override + public List selectMydoJobList(MydoJob mydoJob) + { + return mydoJobMapper.selectMydoJobList(mydoJob); + } + + /** + * 新增任务表 + * + * @param mydoJob 任务表 + * @return 结果 + */ + @Override + public int insertMydoJob(MydoJob mydoJob) + { + mydoJob.setCreateTime(DateUtils.getNowDate()); + return mydoJobMapper.insertMydoJob(mydoJob); + } + + /** + * 修改任务表 + * + * @param mydoJob 任务表 + * @return 结果 + */ + @Override + public int updateMydoJob(MydoJob mydoJob) + { + return mydoJobMapper.updateMydoJob(mydoJob); + } + + /** + * 批量删除任务表 + * + * @param jobIds 需要删除的任务表主键 + * @return 结果 + */ + @Override + public int deleteMydoJobByJobIds(String[] jobIds) + { + return mydoJobMapper.deleteMydoJobByJobIds(jobIds); + } + + /** + * 删除任务表信息 + * + * @param jobId 任务表主键 + * @return 结果 + */ + @Override + public int deleteMydoJobByJobId(String jobId) + { + return mydoJobMapper.deleteMydoJobByJobId(jobId); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/controller/MydoJobDetailController.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/controller/MydoJobDetailController.java new file mode 100644 index 0000000..942bfa7 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/controller/MydoJobDetailController.java @@ -0,0 +1,104 @@ +package com.ruoyi.job.mydojobdetail.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.job.mydojobdetail.domain.MydoJobDetail; +import com.ruoyi.job.mydojobdetail.service.IMydoJobDetailService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 子任务Controller + * + * @author ruoyi + * @date 2025-05-22 + */ +@RestController +@RequestMapping("/job/mydoJobDetail") +public class MydoJobDetailController extends BaseController +{ + @Autowired + private IMydoJobDetailService mydoJobDetailService; + + /** + * 查询子任务列表 + */ + @PreAuthorize("@ss.hasPermi('job:mydoJobDetail:list')") + @GetMapping("/list") + public TableDataInfo list(MydoJobDetail mydoJobDetail) + { + startPage(); + List list = mydoJobDetailService.selectMydoJobDetailList(mydoJobDetail); + return getDataTable(list); + } + + /** + * 导出子任务列表 + */ + @PreAuthorize("@ss.hasPermi('job:mydoJobDetail:export')") + @Log(title = "子任务", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, MydoJobDetail mydoJobDetail) + { + List list = mydoJobDetailService.selectMydoJobDetailList(mydoJobDetail); + ExcelUtil util = new ExcelUtil(MydoJobDetail.class); + util.exportExcel(response, list, "子任务数据"); + } + + /** + * 获取子任务详细信息 + */ + @PreAuthorize("@ss.hasPermi('job:mydoJobDetail:query')") + @GetMapping(value = "/{jobDetailId}") + public AjaxResult getInfo(@PathVariable("jobDetailId") String jobDetailId) + { + return success(mydoJobDetailService.selectMydoJobDetailByJobDetailId(jobDetailId)); + } + + /** + * 新增子任务 + */ + @PreAuthorize("@ss.hasPermi('job:mydoJobDetail:add')") + @Log(title = "子任务", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody MydoJobDetail mydoJobDetail) + { + return toAjax(mydoJobDetailService.insertMydoJobDetail(mydoJobDetail)); + } + + /** + * 修改子任务 + */ + @PreAuthorize("@ss.hasPermi('job:mydoJobDetail:edit')") + @Log(title = "子任务", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody MydoJobDetail mydoJobDetail) + { + return toAjax(mydoJobDetailService.updateMydoJobDetail(mydoJobDetail)); + } + + /** + * 删除子任务 + */ + @PreAuthorize("@ss.hasPermi('job:mydoJobDetail:remove')") + @Log(title = "子任务", businessType = BusinessType.DELETE) + @DeleteMapping("/{jobDetailIds}") + public AjaxResult remove(@PathVariable String[] jobDetailIds) + { + return toAjax(mydoJobDetailService.deleteMydoJobDetailByJobDetailIds(jobDetailIds)); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/domain/MydoJobDetail.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/domain/MydoJobDetail.java new file mode 100644 index 0000000..90ee2d9 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/domain/MydoJobDetail.java @@ -0,0 +1,413 @@ +package com.ruoyi.job.mydojobdetail.domain; + +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; + +/** + * 子任务对象 mydo_job_detail + * + * @author ruoyi + * @date 2025-05-22 + */ +public class MydoJobDetail extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 子任务ID */ + @Excel(name = "子任务ID") + private String jobDetailId; + + /** 任务ID */ + @Excel(name = "任务ID") + private String jobId; + + /** 库存ID */ + @Excel(name = "库存ID") + private String stockId; + + /** 批次号 */ + @Excel(name = "批次号") + private String lotNo; + + /** 入库时间 */ + @Excel(name = "入库时间") + private String inDate; + + /** 单据ID */ + @Excel(name = "单据ID") + private String inOrOutId; + + /** 子单据ID */ + @Excel(name = "子单据ID") + private String inOrOutDId; + + /** 物料GUID */ + @Excel(name = "物料GUID") + private String productGuid; + + /** 物料编码 */ + @Excel(name = "物料编码") + private String productId; + + /** 库存状态 */ + @Excel(name = "库存状态") + private String stockStatus; + + /** 入库数量 */ + @Excel(name = "入库数量") + private String inQuantity; + + /** 库存数量 */ + @Excel(name = "库存数量") + private String stockQuantity; + + /** 出库数量 */ + @Excel(name = "出库数量") + private String outQuantity; + + /** 整层数量 */ + @Excel(name = "整层数量") + private String layerQuantity; + + /** 出库层数量 */ + @Excel(name = "出库层数量") + private String outLayerQuantity; + + /** 回流数量 */ + @Excel(name = "回流数量") + private String giveNum; + + /** 追溯入库单ID */ + @Excel(name = "追溯入库单ID") + private String stockinId; + + /** 垛型ID */ + @Excel(name = "垛型ID") + private String stackingId; + + /** 出库口ID */ + @Excel(name = "出库口ID") + private String exitId; + + /** 生产日期 */ + @Excel(name = "生产日期") + private String printDate; + + /** 客户ID */ + @Excel(name = "客户ID") + private String customerId; + + /** 供应商ID */ + @Excel(name = "供应商ID") + private String supplierId; + + /** 备用字段1 */ + @Excel(name = "备用字段1") + private String spare1; + + /** 备用字段2 */ + @Excel(name = "备用字段2") + private String spare2; + + /** 备用字段3 */ + @Excel(name = "备用字段3") + private String spare3; + + /** 备用字段4 */ + @Excel(name = "备用字段4") + private String spare4; + + public void setJobDetailId(String jobDetailId) + { + this.jobDetailId = jobDetailId; + } + + public String getJobDetailId() + { + return jobDetailId; + } + + public void setJobId(String jobId) + { + this.jobId = jobId; + } + + public String getJobId() + { + return jobId; + } + + public void setStockId(String stockId) + { + this.stockId = stockId; + } + + public String getStockId() + { + return stockId; + } + + public void setLotNo(String lotNo) + { + this.lotNo = lotNo; + } + + public String getLotNo() + { + return lotNo; + } + + public void setInDate(String inDate) + { + this.inDate = inDate; + } + + public String getInDate() + { + return inDate; + } + + public void setInOrOutId(String inOrOutId) + { + this.inOrOutId = inOrOutId; + } + + public String getInOrOutId() + { + return inOrOutId; + } + + public void setInOrOutDId(String inOrOutDId) + { + this.inOrOutDId = inOrOutDId; + } + + public String getInOrOutDId() + { + return inOrOutDId; + } + + public void setProductGuid(String productGuid) + { + this.productGuid = productGuid; + } + + public String getProductGuid() + { + return productGuid; + } + + public void setProductId(String productId) + { + this.productId = productId; + } + + public String getProductId() + { + return productId; + } + + public void setStockStatus(String stockStatus) + { + this.stockStatus = stockStatus; + } + + public String getStockStatus() + { + return stockStatus; + } + + public void setInQuantity(String inQuantity) + { + this.inQuantity = inQuantity; + } + + public String getInQuantity() + { + return inQuantity; + } + + public void setStockQuantity(String stockQuantity) + { + this.stockQuantity = stockQuantity; + } + + public String getStockQuantity() + { + return stockQuantity; + } + + public void setOutQuantity(String outQuantity) + { + this.outQuantity = outQuantity; + } + + public String getOutQuantity() + { + return outQuantity; + } + + public void setLayerQuantity(String layerQuantity) + { + this.layerQuantity = layerQuantity; + } + + public String getLayerQuantity() + { + return layerQuantity; + } + + public void setOutLayerQuantity(String outLayerQuantity) + { + this.outLayerQuantity = outLayerQuantity; + } + + public String getOutLayerQuantity() + { + return outLayerQuantity; + } + + public void setGiveNum(String giveNum) + { + this.giveNum = giveNum; + } + + public String getGiveNum() + { + return giveNum; + } + + public void setStockinId(String stockinId) + { + this.stockinId = stockinId; + } + + public String getStockinId() + { + return stockinId; + } + + public void setStackingId(String stackingId) + { + this.stackingId = stackingId; + } + + public String getStackingId() + { + return stackingId; + } + + public void setExitId(String exitId) + { + this.exitId = exitId; + } + + public String getExitId() + { + return exitId; + } + + public void setPrintDate(String printDate) + { + this.printDate = printDate; + } + + public String getPrintDate() + { + return printDate; + } + + public void setCustomerId(String customerId) + { + this.customerId = customerId; + } + + public String getCustomerId() + { + return customerId; + } + + public void setSupplierId(String supplierId) + { + this.supplierId = supplierId; + } + + public String getSupplierId() + { + return supplierId; + } + + public void setSpare1(String spare1) + { + this.spare1 = spare1; + } + + public String getSpare1() + { + return spare1; + } + + public void setSpare2(String spare2) + { + this.spare2 = spare2; + } + + public String getSpare2() + { + return spare2; + } + + public void setSpare3(String spare3) + { + this.spare3 = spare3; + } + + public String getSpare3() + { + return spare3; + } + + public void setSpare4(String spare4) + { + this.spare4 = spare4; + } + + public String getSpare4() + { + return spare4; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("jobDetailId", getJobDetailId()) + .append("jobId", getJobId()) + .append("stockId", getStockId()) + .append("lotNo", getLotNo()) + .append("inDate", getInDate()) + .append("inOrOutId", getInOrOutId()) + .append("inOrOutDId", getInOrOutDId()) + .append("productGuid", getProductGuid()) + .append("productId", getProductId()) + .append("stockStatus", getStockStatus()) + .append("inQuantity", getInQuantity()) + .append("stockQuantity", getStockQuantity()) + .append("outQuantity", getOutQuantity()) + .append("layerQuantity", getLayerQuantity()) + .append("outLayerQuantity", getOutLayerQuantity()) + .append("giveNum", getGiveNum()) + .append("stockinId", getStockinId()) + .append("stackingId", getStackingId()) + .append("exitId", getExitId()) + .append("printDate", getPrintDate()) + .append("customerId", getCustomerId()) + .append("supplierId", getSupplierId()) + .append("spare1", getSpare1()) + .append("spare2", getSpare2()) + .append("spare3", getSpare3()) + .append("spare4", getSpare4()) + .toString(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/mapper/MydoJobDetailMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/mapper/MydoJobDetailMapper.java new file mode 100644 index 0000000..3571ac2 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/mapper/MydoJobDetailMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.job.mydojobdetail.mapper; + +import java.util.List; +import com.ruoyi.job.mydojobdetail.domain.MydoJobDetail; + +/** + * 子任务Mapper接口 + * + * @author ruoyi + * @date 2025-05-22 + */ +public interface MydoJobDetailMapper +{ + /** + * 查询子任务 + * + * @param jobDetailId 子任务主键 + * @return 子任务 + */ + public MydoJobDetail selectMydoJobDetailByJobDetailId(String jobDetailId); + + /** + * 查询子任务列表 + * + * @param mydoJobDetail 子任务 + * @return 子任务集合 + */ + public List selectMydoJobDetailList(MydoJobDetail mydoJobDetail); + + /** + * 新增子任务 + * + * @param mydoJobDetail 子任务 + * @return 结果 + */ + public int insertMydoJobDetail(MydoJobDetail mydoJobDetail); + + /** + * 修改子任务 + * + * @param mydoJobDetail 子任务 + * @return 结果 + */ + public int updateMydoJobDetail(MydoJobDetail mydoJobDetail); + + /** + * 删除子任务 + * + * @param jobDetailId 子任务主键 + * @return 结果 + */ + public int deleteMydoJobDetailByJobDetailId(String jobDetailId); + + /** + * 批量删除子任务 + * + * @param jobDetailIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteMydoJobDetailByJobDetailIds(String[] jobDetailIds); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/service/IMydoJobDetailService.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/service/IMydoJobDetailService.java new file mode 100644 index 0000000..7b153aa --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/service/IMydoJobDetailService.java @@ -0,0 +1,61 @@ +package com.ruoyi.job.mydojobdetail.service; + +import java.util.List; +import com.ruoyi.job.mydojobdetail.domain.MydoJobDetail; + +/** + * 子任务Service接口 + * + * @author ruoyi + * @date 2025-05-22 + */ +public interface IMydoJobDetailService +{ + /** + * 查询子任务 + * + * @param jobDetailId 子任务主键 + * @return 子任务 + */ + public MydoJobDetail selectMydoJobDetailByJobDetailId(String jobDetailId); + + /** + * 查询子任务列表 + * + * @param mydoJobDetail 子任务 + * @return 子任务集合 + */ + public List selectMydoJobDetailList(MydoJobDetail mydoJobDetail); + + /** + * 新增子任务 + * + * @param mydoJobDetail 子任务 + * @return 结果 + */ + public int insertMydoJobDetail(MydoJobDetail mydoJobDetail); + + /** + * 修改子任务 + * + * @param mydoJobDetail 子任务 + * @return 结果 + */ + public int updateMydoJobDetail(MydoJobDetail mydoJobDetail); + + /** + * 批量删除子任务 + * + * @param jobDetailIds 需要删除的子任务主键集合 + * @return 结果 + */ + public int deleteMydoJobDetailByJobDetailIds(String[] jobDetailIds); + + /** + * 删除子任务信息 + * + * @param jobDetailId 子任务主键 + * @return 结果 + */ + public int deleteMydoJobDetailByJobDetailId(String jobDetailId); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/service/impl/MydoJobDetailServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/service/impl/MydoJobDetailServiceImpl.java new file mode 100644 index 0000000..afc0a18 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/service/impl/MydoJobDetailServiceImpl.java @@ -0,0 +1,93 @@ +package com.ruoyi.job.mydojobdetail.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.job.mydojobdetail.mapper.MydoJobDetailMapper; +import com.ruoyi.job.mydojobdetail.domain.MydoJobDetail; +import com.ruoyi.job.mydojobdetail.service.IMydoJobDetailService; + +/** + * 子任务Service业务层处理 + * + * @author ruoyi + * @date 2025-05-22 + */ +@Service +public class MydoJobDetailServiceImpl implements IMydoJobDetailService +{ + @Autowired + private MydoJobDetailMapper mydoJobDetailMapper; + + /** + * 查询子任务 + * + * @param jobDetailId 子任务主键 + * @return 子任务 + */ + @Override + public MydoJobDetail selectMydoJobDetailByJobDetailId(String jobDetailId) + { + return mydoJobDetailMapper.selectMydoJobDetailByJobDetailId(jobDetailId); + } + + /** + * 查询子任务列表 + * + * @param mydoJobDetail 子任务 + * @return 子任务 + */ + @Override + public List selectMydoJobDetailList(MydoJobDetail mydoJobDetail) + { + return mydoJobDetailMapper.selectMydoJobDetailList(mydoJobDetail); + } + + /** + * 新增子任务 + * + * @param mydoJobDetail 子任务 + * @return 结果 + */ + @Override + public int insertMydoJobDetail(MydoJobDetail mydoJobDetail) + { + return mydoJobDetailMapper.insertMydoJobDetail(mydoJobDetail); + } + + /** + * 修改子任务 + * + * @param mydoJobDetail 子任务 + * @return 结果 + */ + @Override + public int updateMydoJobDetail(MydoJobDetail mydoJobDetail) + { + return mydoJobDetailMapper.updateMydoJobDetail(mydoJobDetail); + } + + /** + * 批量删除子任务 + * + * @param jobDetailIds 需要删除的子任务主键 + * @return 结果 + */ + @Override + public int deleteMydoJobDetailByJobDetailIds(String[] jobDetailIds) + { + return mydoJobDetailMapper.deleteMydoJobDetailByJobDetailIds(jobDetailIds); + } + + /** + * 删除子任务信息 + * + * @param jobDetailId 子任务主键 + * @return 结果 + */ + @Override + public int deleteMydoJobDetailByJobDetailId(String jobDetailId) + { + return mydoJobDetailMapper.deleteMydoJobDetailByJobDetailId(jobDetailId); + } +} diff --git a/ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailMapper.xml new file mode 100644 index 0000000..421e681 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailMapper.xml @@ -0,0 +1,179 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select job_detail_id, job_id, stock_id, lot_no, in_date, in_or_out_id, in_or_out_d_id, product_guid, product_id, stock_status, in_quantity, stock_quantity, out_quantity, layer_quantity, out_layer_quantity, give_num, stockin_id, stacking_id, exit_id, print_date, customer_id, supplier_id, spare1, spare2, spare3, spare4 from mydo_job_detail + + + + + + + + insert into mydo_job_detail + + job_detail_id, + job_id, + stock_id, + lot_no, + in_date, + in_or_out_id, + in_or_out_d_id, + product_guid, + product_id, + stock_status, + in_quantity, + stock_quantity, + out_quantity, + layer_quantity, + out_layer_quantity, + give_num, + stockin_id, + stacking_id, + exit_id, + print_date, + customer_id, + supplier_id, + spare1, + spare2, + spare3, + spare4, + + + #{jobDetailId}, + #{jobId}, + #{stockId}, + #{lotNo}, + #{inDate}, + #{inOrOutId}, + #{inOrOutDId}, + #{productGuid}, + #{productId}, + #{stockStatus}, + #{inQuantity}, + #{stockQuantity}, + #{outQuantity}, + #{layerQuantity}, + #{outLayerQuantity}, + #{giveNum}, + #{stockinId}, + #{stackingId}, + #{exitId}, + #{printDate}, + #{customerId}, + #{supplierId}, + #{spare1}, + #{spare2}, + #{spare3}, + #{spare4}, + + + + + update mydo_job_detail + + job_id = #{jobId}, + stock_id = #{stockId}, + lot_no = #{lotNo}, + in_date = #{inDate}, + in_or_out_id = #{inOrOutId}, + in_or_out_d_id = #{inOrOutDId}, + product_guid = #{productGuid}, + product_id = #{productId}, + stock_status = #{stockStatus}, + in_quantity = #{inQuantity}, + stock_quantity = #{stockQuantity}, + out_quantity = #{outQuantity}, + layer_quantity = #{layerQuantity}, + out_layer_quantity = #{outLayerQuantity}, + give_num = #{giveNum}, + stockin_id = #{stockinId}, + stacking_id = #{stackingId}, + exit_id = #{exitId}, + print_date = #{printDate}, + customer_id = #{customerId}, + supplier_id = #{supplierId}, + spare1 = #{spare1}, + spare2 = #{spare2}, + spare3 = #{spare3}, + spare4 = #{spare4}, + + where job_detail_id = #{jobDetailId} + + + + delete from mydo_job_detail where job_detail_id = #{jobDetailId} + + + + delete from mydo_job_detail where job_detail_id in + + #{jobDetailId} + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml b/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml new file mode 100644 index 0000000..1a4a6e5 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml @@ -0,0 +1,173 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select job_id, status, on_line_type, task_no, supplier_id, customer_id, department_id, tray_code, roadway_id, cargo_space_id, target_roadway_id, target_cargo_space_id, line_id, workshop_id, priority, execution_phase, in_or_out, create_time, start_time, finish_time, entrance_id, exit_id, class_id, warehouse_id, fault_flag from mydo_job + + + + + + + + insert into mydo_job + + job_id, + status, + on_line_type, + task_no, + supplier_id, + customer_id, + department_id, + tray_code, + roadway_id, + cargo_space_id, + target_roadway_id, + target_cargo_space_id, + line_id, + workshop_id, + priority, + execution_phase, + in_or_out, + create_time, + start_time, + finish_time, + entrance_id, + exit_id, + class_id, + warehouse_id, + fault_flag, + + + #{jobId}, + #{status}, + #{onLineType}, + #{taskNo}, + #{supplierId}, + #{customerId}, + #{departmentId}, + #{trayCode}, + #{roadwayId}, + #{cargoSpaceId}, + #{targetRoadwayId}, + #{targetCargoSpaceId}, + #{lineId}, + #{workshopId}, + #{priority}, + #{executionPhase}, + #{inOrOut}, + #{createTime}, + #{startTime}, + #{finishTime}, + #{entranceId}, + #{exitId}, + #{classId}, + #{warehouseId}, + #{faultFlag}, + + + + + update mydo_job + + status = #{status}, + on_line_type = #{onLineType}, + task_no = #{taskNo}, + supplier_id = #{supplierId}, + customer_id = #{customerId}, + department_id = #{departmentId}, + tray_code = #{trayCode}, + roadway_id = #{roadwayId}, + cargo_space_id = #{cargoSpaceId}, + target_roadway_id = #{targetRoadwayId}, + target_cargo_space_id = #{targetCargoSpaceId}, + line_id = #{lineId}, + workshop_id = #{workshopId}, + priority = #{priority}, + execution_phase = #{executionPhase}, + in_or_out = #{inOrOut}, + create_time = #{createTime}, + start_time = #{startTime}, + finish_time = #{finishTime}, + entrance_id = #{entranceId}, + exit_id = #{exitId}, + class_id = #{classId}, + warehouse_id = #{warehouseId}, + fault_flag = #{faultFlag}, + + where job_id = #{jobId} + + + + delete from mydo_job where job_id = #{jobId} + + + + delete from mydo_job where job_id in + + #{jobId} + + + \ No newline at end of file