From ac175a1405cbca4b4e91ce8b0d8b5b286c01a172 Mon Sep 17 00:00:00 2001 From: "1009473166@qq.com" <草拟吗23> Date: Fri, 31 Jul 2026 10:35:09 +0800 Subject: [PATCH] Changes --- .../AgvContainerTaskController.java | 104 +++++++++++ .../ruoyi/system/domain/AgvContainerTask.java | 173 ++++++++++++++++++ .../system/mapper/AgvContainerTaskMapper.java | 68 +++++++ .../service/IAgvContainerTaskService.java | 63 +++++++ .../impl/AgvContainerTaskServiceImpl.java | 100 ++++++++++ .../mapper/system/AgvContainerTaskMapper.xml | 116 ++++++++++++ 6 files changed, 624 insertions(+) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/system/controller/AgvContainerTaskController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/system/domain/AgvContainerTask.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/system/mapper/AgvContainerTaskMapper.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/system/service/IAgvContainerTaskService.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/AgvContainerTaskServiceImpl.java create mode 100644 ruoyi-admin/src/main/resources/mapper/system/AgvContainerTaskMapper.xml diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/AgvContainerTaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/AgvContainerTaskController.java new file mode 100644 index 0000000..b8f1fc8 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/AgvContainerTaskController.java @@ -0,0 +1,104 @@ +package com.ruoyi.system.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.system.domain.AgvContainerTask; +import com.ruoyi.system.service.IAgvContainerTaskService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * agv料架搬运任务Controller + * + * @author ruoyi + * @date 2026-05-15 + */ +@RestController +@RequestMapping("/system/task") +public class AgvContainerTaskController extends BaseController +{ + @Autowired + private IAgvContainerTaskService agvContainerTaskService; + + /** + * 查询agv料架搬运任务列表 + */ + @PreAuthorize("@ss.hasPermi('system:task:list')") + @GetMapping("/list") + public TableDataInfo list(AgvContainerTask agvContainerTask) + { + startPage(); + List list = agvContainerTaskService.selectAgvContainerTaskList(agvContainerTask); + return getDataTable(list); + } + + /** + * 导出agv料架搬运任务列表 + */ + @PreAuthorize("@ss.hasPermi('system:task:export')") + @Log(title = "agv料架搬运任务", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, AgvContainerTask agvContainerTask) + { + List list = agvContainerTaskService.selectAgvContainerTaskList(agvContainerTask); + ExcelUtil util = new ExcelUtil(AgvContainerTask.class); + util.exportExcel(response, list, "agv料架搬运任务数据"); + } + + /** + * 获取agv料架搬运任务详细信息 + */ + @PreAuthorize("@ss.hasPermi('system:task:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(agvContainerTaskService.selectAgvContainerTaskById(id)); + } + + /** + * 新增agv料架搬运任务 + */ + @PreAuthorize("@ss.hasPermi('system:task:add')") + @Log(title = "agv料架搬运任务", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody AgvContainerTask agvContainerTask) + { + return toAjax(agvContainerTaskService.insertAgvContainerTask(agvContainerTask)); + } + + /** + * 修改agv料架搬运任务 + */ + @PreAuthorize("@ss.hasPermi('system:task:edit')") + @Log(title = "agv料架搬运任务", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody AgvContainerTask agvContainerTask) + { + return toAjax(agvContainerTaskService.updateAgvContainerTask(agvContainerTask)); + } + + /** + * 删除agv料架搬运任务 + */ + @PreAuthorize("@ss.hasPermi('system:task:remove')") + @Log(title = "agv料架搬运任务", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(agvContainerTaskService.deleteAgvContainerTaskByIds(ids)); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/AgvContainerTask.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/AgvContainerTask.java new file mode 100644 index 0000000..98b91c0 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/AgvContainerTask.java @@ -0,0 +1,173 @@ +package com.ruoyi.system.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; + +/** + * agv料架搬运任务对象 agv_container_task + * + * @author ruoyi + * @date 2026-05-15 + */ +public class AgvContainerTask extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** $column.columnComment */ + private Long id; + + /** 作业编码 */ + @Excel(name = "作业编码") + private String container; + + /** 起点 */ + @Excel(name = "起点") + private String startPoint; + + /** 终点 */ + @Excel(name = "终点") + private String endPoint; + + /** 开始时间 */ + @Excel(name = "开始时间") + private String startTime; + + /** 结束时间 */ + @Excel(name = "结束时间") + private String finishTime; + + /** 任务号 */ + @Excel(name = "任务号") + private String taskNo; + + /** 任务状态 0-创建 1-执行中 2-完成 */ + @Excel(name = "任务状态 0-创建 1-执行中 2-完成") + private String status; + + /** 任务类型 */ + @Excel(name = "任务类型") + private String spare1; + + /** 托盘码 */ + @Excel(name = "托盘码") + private String spare2; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + + public void setContainer(String container) + { + this.container = container; + } + + public String getContainer() + { + return container; + } + + public void setStartPoint(String startPoint) + { + this.startPoint = startPoint; + } + + public String getStartPoint() + { + return startPoint; + } + + public void setEndPoint(String endPoint) + { + this.endPoint = endPoint; + } + + public String getEndPoint() + { + return endPoint; + } + + 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 setTaskNo(String taskNo) + { + this.taskNo = taskNo; + } + + public String getTaskNo() + { + return taskNo; + } + + public void setStatus(String status) + { + this.status = status; + } + + public String getStatus() + { + return status; + } + + 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; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("container", getContainer()) + .append("startPoint", getStartPoint()) + .append("endPoint", getEndPoint()) + .append("createTime", getCreateTime()) + .append("startTime", getStartTime()) + .append("finishTime", getFinishTime()) + .append("taskNo", getTaskNo()) + .append("status", getStatus()) + .append("spare1", getSpare1()) + .append("spare2", getSpare2()) + .toString(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/AgvContainerTaskMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/AgvContainerTaskMapper.java new file mode 100644 index 0000000..23996bf --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/AgvContainerTaskMapper.java @@ -0,0 +1,68 @@ +package com.ruoyi.system.mapper; + +import java.util.List; +import com.ruoyi.system.domain.AgvContainerTask; + +/** + * agv料架搬运任务Mapper接口 + * + * @author ruoyi + * @date 2026-05-15 + */ +public interface AgvContainerTaskMapper +{ + /** + * 查询agv料架搬运任务 + * + * @param id agv料架搬运任务主键 + * @return agv料架搬运任务 + */ + public AgvContainerTask selectAgvContainerTaskById(Long id); + + /** + * 查询agv料架搬运任务列表 + * + * @param agvContainerTask agv料架搬运任务 + * @return agv料架搬运任务集合 + */ + public List selectAgvContainerTaskList(AgvContainerTask agvContainerTask); + + /** + * 新增agv料架搬运任务 + * + * @param agvContainerTask agv料架搬运任务 + * @return 结果 + */ + public int insertAgvContainerTask(AgvContainerTask agvContainerTask); + + /** + * 修改agv料架搬运任务 + * + * @param agvContainerTask agv料架搬运任务 + * @return 结果 + */ + public int updateAgvContainerTask(AgvContainerTask agvContainerTask); + + /** + * 删除agv料架搬运任务 + * + * @param id agv料架搬运任务主键 + * @return 结果 + */ + public int deleteAgvContainerTaskById(Long id); + + public int deleteAgvContainerTaskByContainer(String orderId); + /** + * 批量删除agv料架搬运任务 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteAgvContainerTaskByIds(Long[] ids); + + void insertAgvContainerTaskFinish(String orderId); + + void updateAgvContainerTaskByOrder(String orderId); + + AgvContainerTask selectAgvContainerFinishOne(); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/IAgvContainerTaskService.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/IAgvContainerTaskService.java new file mode 100644 index 0000000..8f489f9 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/IAgvContainerTaskService.java @@ -0,0 +1,63 @@ +package com.ruoyi.system.service; + +import java.util.List; +import com.ruoyi.system.domain.AgvContainerTask; + +/** + * agv料架搬运任务Service接口 + * + * @author ruoyi + * @date 2026-05-15 + */ +public interface IAgvContainerTaskService +{ + /** + * 查询agv料架搬运任务 + * + * @param id agv料架搬运任务主键 + * @return agv料架搬运任务 + */ + public AgvContainerTask selectAgvContainerTaskById(Long id); + + /** + * 查询agv料架搬运任务列表 + * + * @param agvContainerTask agv料架搬运任务 + * @return agv料架搬运任务集合 + */ + public List selectAgvContainerTaskList(AgvContainerTask agvContainerTask); + + /** + * 新增agv料架搬运任务 + * + * @param agvContainerTask agv料架搬运任务 + * @return 结果 + */ + public int insertAgvContainerTask(AgvContainerTask agvContainerTask); + + /** + * 修改agv料架搬运任务 + * + * @param agvContainerTask agv料架搬运任务 + * @return 结果 + */ + public int updateAgvContainerTask(AgvContainerTask agvContainerTask); + + /** + * 批量删除agv料架搬运任务 + * + * @param ids 需要删除的agv料架搬运任务主键集合 + * @return 结果 + */ + public int deleteAgvContainerTaskByIds(Long[] ids); + + /** + * 删除agv料架搬运任务信息 + * + * @param id agv料架搬运任务主键 + * @return 结果 + */ + public int deleteAgvContainerTaskById(Long id); + + void deleteAgvContainerTaskByOrderId(String container); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/AgvContainerTaskServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/AgvContainerTaskServiceImpl.java new file mode 100644 index 0000000..ef4b294 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/AgvContainerTaskServiceImpl.java @@ -0,0 +1,100 @@ +package com.ruoyi.system.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.system.mapper.AgvContainerTaskMapper; +import com.ruoyi.system.domain.AgvContainerTask; +import com.ruoyi.system.service.IAgvContainerTaskService; + +/** + * agv料架搬运任务Service业务层处理 + * + * @author ruoyi + * @date 2026-05-15 + */ +@Service +public class AgvContainerTaskServiceImpl implements IAgvContainerTaskService +{ + @Autowired + private AgvContainerTaskMapper agvContainerTaskMapper; + + /** + * 查询agv料架搬运任务 + * + * @param id agv料架搬运任务主键 + * @return agv料架搬运任务 + */ + @Override + public AgvContainerTask selectAgvContainerTaskById(Long id) + { + return agvContainerTaskMapper.selectAgvContainerTaskById(id); + } + + /** + * 查询agv料架搬运任务列表 + * + * @param agvContainerTask agv料架搬运任务 + * @return agv料架搬运任务 + */ + @Override + public List selectAgvContainerTaskList(AgvContainerTask agvContainerTask) + { + return agvContainerTaskMapper.selectAgvContainerTaskList(agvContainerTask); + } + + /** + * 新增agv料架搬运任务 + * + * @param agvContainerTask agv料架搬运任务 + * @return 结果 + */ + @Override + public int insertAgvContainerTask(AgvContainerTask agvContainerTask) + { + agvContainerTask.setCreateTime(DateUtils.getNowDate()); + return agvContainerTaskMapper.insertAgvContainerTask(agvContainerTask); + } + + /** + * 修改agv料架搬运任务 + * + * @param agvContainerTask agv料架搬运任务 + * @return 结果 + */ + @Override + public int updateAgvContainerTask(AgvContainerTask agvContainerTask) + { + return agvContainerTaskMapper.updateAgvContainerTask(agvContainerTask); + } + + /** + * 批量删除agv料架搬运任务 + * + * @param ids 需要删除的agv料架搬运任务主键 + * @return 结果 + */ + @Override + public int deleteAgvContainerTaskByIds(Long[] ids) + { + return agvContainerTaskMapper.deleteAgvContainerTaskByIds(ids); + } + + /** + * 删除agv料架搬运任务信息 + * + * @param id agv料架搬运任务主键 + * @return 结果 + */ + @Override + public int deleteAgvContainerTaskById(Long id) + { + return agvContainerTaskMapper.deleteAgvContainerTaskById(id); + } + + @Override + public void deleteAgvContainerTaskByOrderId(String container) { + agvContainerTaskMapper.deleteAgvContainerTaskByContainer(container); + } +} diff --git a/ruoyi-admin/src/main/resources/mapper/system/AgvContainerTaskMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/AgvContainerTaskMapper.xml new file mode 100644 index 0000000..7b5d4ce --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/system/AgvContainerTaskMapper.xml @@ -0,0 +1,116 @@ + + + + + + + + + + + + + + + + + + + + select id, container, start_point, end_point, create_time, start_time, finish_time, task_no, status, spare1, spare2 from agv_container_task + + + + + + + + insert into agv_container_task + + container, + start_point, + end_point, + create_time, + start_time, + finish_time, + task_no, + status, + spare1, + spare2, + + + #{container}, + #{startPoint}, + #{endPoint}, + #{createTime}, + #{startTime}, + #{finishTime}, + #{taskNo}, + #{status}, + #{spare1}, + #{spare2}, + + + + + update agv_container_task + + container = #{container}, + start_point = #{startPoint}, + end_point = #{endPoint}, + create_time = #{createTime}, + start_time = #{startTime}, + finish_time = #{finishTime}, + task_no = #{taskNo}, + status = #{status}, + spare1 = #{spare1}, + spare2 = #{spare2}, + + where id = #{id} + + + + delete from agv_container_task where id = #{id} + + + delete from agv_container_task where container = #{container} + + + + delete from agv_container_task where id in + + #{id} + + + + + + + update agv_container_task set status='2' where container=#{orderId} + + + + + \ No newline at end of file