From 3683578f41ff9cde89cdb9ecee98d93fa536e9f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=81=92=E6=9D=B0?= <2658502433@qq.com> Date: Wed, 23 Apr 2025 17:18:01 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AE=B1=E7=A0=81=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/controller/WcsTrayBoxsController.java | 103 ++++++++++++++++++ .../java/com/op/mes/domain/WcsTrayBoxs.java | 90 +++++++++++++++ .../com/op/mes/mapper/WcsTrayBoxsMapper.java | 61 +++++++++++ .../op/mes/service/IWcsTrayBoxsService.java | 61 +++++++++++ .../service/impl/WcsTrayBoxsServiceImpl.java | 98 +++++++++++++++++ .../mapper/mes/WcsTrayBoxsMapper.xml | 78 +++++++++++++ 6 files changed, 491 insertions(+) create mode 100644 op-modules/op-mes/src/main/java/com/op/mes/controller/WcsTrayBoxsController.java create mode 100644 op-modules/op-mes/src/main/java/com/op/mes/domain/WcsTrayBoxs.java create mode 100644 op-modules/op-mes/src/main/java/com/op/mes/mapper/WcsTrayBoxsMapper.java create mode 100644 op-modules/op-mes/src/main/java/com/op/mes/service/IWcsTrayBoxsService.java create mode 100644 op-modules/op-mes/src/main/java/com/op/mes/service/impl/WcsTrayBoxsServiceImpl.java create mode 100644 op-modules/op-mes/src/main/resources/mapper/mes/WcsTrayBoxsMapper.xml diff --git a/op-modules/op-mes/src/main/java/com/op/mes/controller/WcsTrayBoxsController.java b/op-modules/op-mes/src/main/java/com/op/mes/controller/WcsTrayBoxsController.java new file mode 100644 index 000000000..a872330e2 --- /dev/null +++ b/op-modules/op-mes/src/main/java/com/op/mes/controller/WcsTrayBoxsController.java @@ -0,0 +1,103 @@ +package com.op.mes.controller; + +import java.util.Calendar; +import java.util.Date; +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.format.annotation.DateTimeFormat; +import org.springframework.web.bind.annotation.*; +import com.op.common.log.annotation.Log; +import com.op.common.core.web.controller.BaseController; +import com.op.common.core.web.domain.AjaxResult; +import com.op.common.log.enums.BusinessType; +import com.op.mes.domain.WcsTrayBoxs; +import com.op.mes.service.IWcsTrayBoxsService; +import com.op.common.core.utils.poi.ExcelUtil; +import com.op.common.core.web.page.TableDataInfo; + +/** + * 【请填写功能名称】Controller + * + * @author ruoyi + * @date 2025-04-23 + */ +@RestController +@RequestMapping("/boxs") +public class WcsTrayBoxsController extends BaseController +{ + @Autowired + private IWcsTrayBoxsService wcsTrayBoxsService; + + /** + * 查询【d打码信息】列表 + */ + + @GetMapping("/list") + public TableDataInfo list(WcsTrayBoxs wcsTrayBoxs, @RequestParam(value = "startTime", required = false) + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date startTime, + @RequestParam(value = "endTime", required = false) + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date endTime) + { + // 设置时间范围到查询对象 + wcsTrayBoxs.setStartTime(startTime); + wcsTrayBoxs.setEndTime(endTime); + startPage(); + List list = wcsTrayBoxsService.selectWcsTrayBoxsList(wcsTrayBoxs); + return getDataTable(list); + } + + /** + * 导出【打码信息】列表 + */ + @Log(title = "【打码信息】", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, WcsTrayBoxs wcsTrayBoxs) + { + // 导出逻辑保持不变，底层复用相同的查询方法 + List list = wcsTrayBoxsService.selectWcsTrayBoxsList(wcsTrayBoxs); + ExcelUtil util = new ExcelUtil<>(WcsTrayBoxs.class); + util.exportExcel(response, list, "打码信息数据"); + } + + /** + * 获取【打码信息】详细信息 + */ + + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") String id) + { + return success(wcsTrayBoxsService.selectWcsTrayBoxsById(id)); + } + + /** + * 新增【打码信息】 + */ + @Log(title = "【打码信息】", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody WcsTrayBoxs wcsTrayBoxs) + { + return toAjax(wcsTrayBoxsService.insertWcsTrayBoxs(wcsTrayBoxs)); + } + + /** + * 修改【打码信息】 + */ + @Log(title = "【打码信息】", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody WcsTrayBoxs wcsTrayBoxs) + { + return toAjax(wcsTrayBoxsService.updateWcsTrayBoxs(wcsTrayBoxs)); + } + + /** + * 删除【打码信息】 + */ + @Log(title = "【打码信息】", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable String[] ids) + { + return toAjax(wcsTrayBoxsService.deleteWcsTrayBoxsByIds(ids)); + } +} diff --git a/op-modules/op-mes/src/main/java/com/op/mes/domain/WcsTrayBoxs.java b/op-modules/op-mes/src/main/java/com/op/mes/domain/WcsTrayBoxs.java new file mode 100644 index 000000000..677225936 --- /dev/null +++ b/op-modules/op-mes/src/main/java/com/op/mes/domain/WcsTrayBoxs.java @@ -0,0 +1,90 @@ +package com.op.mes.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.op.common.core.annotation.Excel; +import com.op.common.core.web.domain.BaseEntity; + +import java.util.Date; + +/** + * 【请填写功能名称】对象 wcs_tray_boxs + * + * @author ruoyi + * @date 2025-04-23 + */ +public class WcsTrayBoxs extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** id */ + private String id; + + /** 托盘码 */ + @Excel(name = "托盘码") + private String trayCode; + + /** 箱码 */ + @Excel(name = "箱码") + private String boxCode; + + /** 3台机械手，9条道 */ + @Excel(name = "3台机械手，9条道") + + private String lineCode; + private Date startTime; // 查询开始时间 + private Date endTime; // 查询结束时间 + + public Date getStartTime() { return startTime; } + public void setStartTime(Date startTime) { this.startTime = startTime; } + public Date getEndTime() { return endTime; } + public void setEndTime(Date endTime) { this.endTime = endTime; } + + public void setId(String id) + { + this.id = id; + } + + public String getId() + { + return id; + } + public void setTrayCode(String trayCode) + { + this.trayCode = trayCode; + } + + public String getTrayCode() + { + return trayCode; + } + public void setBoxCode(String boxCode) + { + this.boxCode = boxCode; + } + + public String getBoxCode() + { + return boxCode; + } + public void setLineCode(String lineCode) + { + this.lineCode = lineCode; + } + + public String getLineCode() + { + return lineCode; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("trayCode", getTrayCode()) + .append("boxCode", getBoxCode()) + .append("lineCode", getLineCode()) + .append("createTime", getCreateTime()) + .toString(); + } +} diff --git a/op-modules/op-mes/src/main/java/com/op/mes/mapper/WcsTrayBoxsMapper.java b/op-modules/op-mes/src/main/java/com/op/mes/mapper/WcsTrayBoxsMapper.java new file mode 100644 index 000000000..f293dfbe5 --- /dev/null +++ b/op-modules/op-mes/src/main/java/com/op/mes/mapper/WcsTrayBoxsMapper.java @@ -0,0 +1,61 @@ +package com.op.mes.mapper; + +import java.util.List; +import com.op.mes.domain.WcsTrayBoxs; + +/** + * 【打码信息】Mapper接口 + * + * @author ruoyi + * @date 2025-04-23 + */ +public interface WcsTrayBoxsMapper +{ + /** + * 查询【打码信息】 + * + * @param id 【打码信息】主键 + * @return 【打码信息】 + */ + public WcsTrayBoxs selectWcsTrayBoxsById(String id); + + /** + * 查询【打码信息】列表 + * + * @param wcsTrayBoxs 【打码信息】 + * @return 【打码信息】集合 + */ + public List selectWcsTrayBoxsList(WcsTrayBoxs wcsTrayBoxs); + + /** + * 新增【打码信息】 + * + * @param wcsTrayBoxs 【打码信息】 + * @return 结果 + */ + public int insertWcsTrayBoxs(WcsTrayBoxs wcsTrayBoxs); + + /** + * 修改【打码信息】 + * + * @param wcsTrayBoxs 【打码信息】 + * @return 结果 + */ + public int updateWcsTrayBoxs(WcsTrayBoxs wcsTrayBoxs); + + /** + * 删除【打码信息】 + * + * @param id 【打码信息】主键 + * @return 结果 + */ + public int deleteWcsTrayBoxsById(String id); + + /** + * 批量删除【打码信息】 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteWcsTrayBoxsByIds(String[] ids); +} diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/IWcsTrayBoxsService.java b/op-modules/op-mes/src/main/java/com/op/mes/service/IWcsTrayBoxsService.java new file mode 100644 index 000000000..1692bb323 --- /dev/null +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/IWcsTrayBoxsService.java @@ -0,0 +1,61 @@ +package com.op.mes.service; + +import java.util.List; +import com.op.mes.domain.WcsTrayBoxs; + +/** + * 【打码信息】Service接口 + * + * @author ruoyi + * @date 2025-04-23 + */ +public interface IWcsTrayBoxsService +{ + /** + * 查询【打码信息】 + * + * @param id 【打码信息】主键 + * @return 【打码信息】 + */ + public WcsTrayBoxs selectWcsTrayBoxsById(String id); + + /** + * 查询【打码信息】列表 + * + * @param wcsTrayBoxs 【打码信息】 + * @return 【打码信息】集合 + */ + public List selectWcsTrayBoxsList(WcsTrayBoxs wcsTrayBoxs); + + /** + * 新增【打码信息】 + * + * @param wcsTrayBoxs 【打码信息】 + * @return 结果 + */ + public int insertWcsTrayBoxs(WcsTrayBoxs wcsTrayBoxs); + + /** + * 修改【打码信息】 + * + * @param wcsTrayBoxs 【打码信息】 + * @return 结果 + */ + public int updateWcsTrayBoxs(WcsTrayBoxs wcsTrayBoxs); + + /** + * 批量删除【打码信息】 + * + * @param ids 需要删除的【打码信息】主键集合 + * @return 结果 + */ + public int deleteWcsTrayBoxsByIds(String[] ids); + + /** + * 删除【打码信息】信息 + * + * @param id 【打码信息】主键 + * @return 结果 + */ + public int deleteWcsTrayBoxsById(String id); +} diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/WcsTrayBoxsServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/WcsTrayBoxsServiceImpl.java new file mode 100644 index 000000000..deb7b50a5 --- /dev/null +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/WcsTrayBoxsServiceImpl.java @@ -0,0 +1,98 @@ +package com.op.mes.service.impl; + +import java.util.List; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.op.common.core.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.op.mes.mapper.WcsTrayBoxsMapper; +import com.op.mes.domain.WcsTrayBoxs; +import com.op.mes.service.IWcsTrayBoxsService; + +/** + * 【请填写功能名称】Service业务层处理 + * + * @author ruoyi + * @date 2025-04-23 + */ +@Service +public class WcsTrayBoxsServiceImpl implements IWcsTrayBoxsService +{ + @Autowired + private WcsTrayBoxsMapper wcsTrayBoxsMapper; + + /** + * 查询【请填写功能名称】 + * + * @param id 【请填写功能名称】主键 + * @return 【请填写功能名称】 + */ + @Override + @DS("#header.poolName") + public WcsTrayBoxs selectWcsTrayBoxsById(String id) + { + return wcsTrayBoxsMapper.selectWcsTrayBoxsById(id); + } + + /** + * 查询【请填写功能名称】列表 + * + * @param wcsTrayBoxs 【请填写功能名称】 + * @return 【请填写功能名称】 + */ + @Override + @DS("#header.poolName") + public List selectWcsTrayBoxsList(WcsTrayBoxs wcsTrayBoxs) + { + return wcsTrayBoxsMapper.selectWcsTrayBoxsList(wcsTrayBoxs); + } + + /** + * 新增【请填写功能名称】 + * + * @param wcsTrayBoxs 【请填写功能名称】 + * @return 结果 + */ + @Override + public int insertWcsTrayBoxs(WcsTrayBoxs wcsTrayBoxs) + { + return wcsTrayBoxsMapper.insertWcsTrayBoxs(wcsTrayBoxs); + } + + /** + * 修改【请填写功能名称】 + * + * @param wcsTrayBoxs 【请填写功能名称】 + * @return 结果 + */ + @Override + public int updateWcsTrayBoxs(WcsTrayBoxs wcsTrayBoxs) + { + return wcsTrayBoxsMapper.updateWcsTrayBoxs(wcsTrayBoxs); + } + + /** + * 批量删除【请填写功能名称】 + * + * @param ids 需要删除的【请填写功能名称】主键 + * @return 结果 + */ + @Override + public int deleteWcsTrayBoxsByIds(String[] ids) + { + return wcsTrayBoxsMapper.deleteWcsTrayBoxsByIds(ids); + } + + /** + * 删除【请填写功能名称】信息 + * + * @param id 【请填写功能名称】主键 + * @return 结果 + */ + @Override + public int deleteWcsTrayBoxsById(String id) + { + return wcsTrayBoxsMapper.deleteWcsTrayBoxsById(id); + } +} diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/WcsTrayBoxsMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/WcsTrayBoxsMapper.xml new file mode 100644 index 000000000..30f84cf9f --- /dev/null +++ b/op-modules/op-mes/src/main/resources/mapper/mes/WcsTrayBoxsMapper.xml @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + select id, tray_code, box_code, line_code, create_time from wcs_tray_boxs + + + + + + + + insert into wcs_tray_boxs + + id, + tray_code, + box_code, + line_code, + create_time, + + + #{id}, + #{trayCode}, + #{boxCode}, + #{lineCode}, + #{createTime}, + + + + + update wcs_tray_boxs + + tray_code = #{trayCode}, + box_code = #{boxCode}, + line_code = #{lineCode}, + create_time = #{createTime}, + + where id = #{id} + + + + delete from wcs_tray_boxs where id = #{id} + + + + delete from wcs_tray_boxs where id in + + #{id} + + + \ No newline at end of file