From 1560c16e7c6c5a3ffe2c66eb01a0843c0a934b46 Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Wed, 23 Apr 2025 11:12:06 +0800 Subject: [PATCH 1/4] =?UTF-8?q?wms=E6=89=B9=E6=AC=A1=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../op/wms/service/impl/OdsProcureOrderServiceImpl.java | 5 ++--- .../wms/service/impl/OdsProcureOutOrderServiceImpl.java | 8 ++++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java index 1309448f2..5f871c2f7 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java @@ -911,7 +911,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { qcCheckTaskIncomeDTO.setQuality(odsProcureOrder.getCzNumber());//操作数量 qcCheckTaskIncomeDTO.setMaterialCode(order1.getMaterialCode()); qcCheckTaskIncomeDTO.setMaterialName(order1.getMaterialDesc()); - //qcCheckTaskIncomeDTO.setIncomeBatchNo(order1.getUserDefined7());//批次号 + qcCheckTaskIncomeDTO.setIncomeBatchNo(order1.getUserDefined7());//批次号 qcCheckTaskIncomeDTO.setOrderNo(order1.getProcureCode()+order1.getUserDefined7()); qcCheckTaskIncomeDTO.setIncomeTime(new Date()); R ruslt= remoteQualityService.createIncomeTask(qcCheckTaskIncomeDTO); @@ -3192,8 +3192,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { qcCheckTaskIncomeDTO.setQuality(odsProcureOrder1.getPlanNumber());//操作数量 qcCheckTaskIncomeDTO.setMaterialCode(order1.getMaterialCode()); qcCheckTaskIncomeDTO.setMaterialName(order1.getMaterialDesc()); - // qcCheckTaskIncomeDTO.setIncomeBatchNo(order.getUserDefined2()); - + qcCheckTaskIncomeDTO.setIncomeBatchNo(order1.getUserDefined7()); qcCheckTaskIncomeDTO.setOrderNo(order1.getProcureCode()+order1.getUserDefined7()); qcCheckTaskIncomeDTO.setIncomeTime(new Date()); R ruslt= remoteQualityService.createIncomeTask(qcCheckTaskIncomeDTO); diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOutOrderServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOutOrderServiceImpl.java index ab5140513..8b9a6d4a0 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOutOrderServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOutOrderServiceImpl.java @@ -386,10 +386,10 @@ public class OdsProcureOutOrderServiceImpl implements IOdsProcureOutOrderService wmsOdsMateStorageNewsSnMapper.updatekdd(wmsOdsEmStorageNews);//库存调整 } } - OdsProcureOutOrder order=new OdsProcureOutOrder(); - order.setID(ID); - List orderList1 = odsProcureOutOrderMapper.selectWmsOdsProcureOutOrderByOrderStatusSpecial(order); - +// OdsProcureOutOrder order=new OdsProcureOutOrder(); +// order.setID(ID); +// List orderList1 = odsProcureOutOrderMapper.selectWmsOdsProcureOutOrderByOrderStatusSpecial(order); +// // if (orderList1.size()>0){ // OutboundPostingzcSAPGYTS(orderList1); From df4809d9b06b4a19f6a856e0e972af321936b43b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=85=83=E6=B0=94=E6=BB=A1=E6=BB=A1?= <11056461+jia-guiying@user.noreply.gitee.com> Date: Wed, 23 Apr 2025 15:50:49 +0800 Subject: [PATCH 2/4] =?UTF-8?q?2025-04-23=20=E8=AE=BE=E5=A4=87=E4=BF=9D?= =?UTF-8?q?=E5=85=BB=E5=B7=A5=E5=8D=95=E4=B8=8D=E7=94=9F=E6=88=90=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/device/DeviceTaskMapper.xml | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/op-modules/op-device/src/main/resources/mapper/device/DeviceTaskMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/DeviceTaskMapper.xml index 42687941e..190d2d3bd 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/DeviceTaskMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/DeviceTaskMapper.xml @@ -33,9 +33,7 @@ where ep.del_flag = '0' and epe.del_flag = '0' and ep.plan_status = '0' and epe.equipment_code in( select be.equipment_code from base_equipment be - left join equ_bind_auxiliary_equipment ebae0 on be.equipment_code = ebae0.auxiliary_equipment_code where be.del_flag = '0' - and ebae0.del_flag = '0' ) and ep.plan_type = #{planType} and CONVERT(varchar(10),GETDATE(), 120) >= CONVERT(varchar(10),ep.plan_loop_start, 120) @@ -80,4 +78,20 @@ where CONVERT(varchar(10),pow.product_date, 120) = CONVERT(varchar(10),GETDATE(), 120) and status = 'w1' + + + + SELECT TOP 0 * INTO ${tableNew} FROM equ_order_person + + + + + + delete from equ_order_person + where create_time >= #{startDate} and #{endDate}>create_time + 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 3/4] =?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 From ae793e5da3efa9d7d8314fcaef7a66d53ab00639 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=81=92=E6=9D=B0?= <2658502433@qq.com> Date: Fri, 25 Apr 2025 17:09:27 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=B8=8B=E7=BA=BF?= =?UTF-8?q?=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WcsPrintTaskController.java | 108 +++++++ .../java/com/op/mes/domain/WcsPrintTask.java | 280 ++++++++++++++++++ .../com/op/mes/mapper/WcsPrintTaskMapper.java | 61 ++++ .../service/impl/WcsPrintTaskServiceImpl.java | 104 +++++++ .../mapper/mes/WcsPrintTaskMapper.xml | 155 ++++++++++ 5 files changed, 708 insertions(+) create mode 100644 op-modules/op-mes/src/main/java/com/op/mes/controller/WcsPrintTaskController.java create mode 100644 op-modules/op-mes/src/main/java/com/op/mes/domain/WcsPrintTask.java create mode 100644 op-modules/op-mes/src/main/java/com/op/mes/mapper/WcsPrintTaskMapper.java create mode 100644 op-modules/op-mes/src/main/java/com/op/mes/service/impl/WcsPrintTaskServiceImpl.java create mode 100644 op-modules/op-mes/src/main/resources/mapper/mes/WcsPrintTaskMapper.xml diff --git a/op-modules/op-mes/src/main/java/com/op/mes/controller/WcsPrintTaskController.java b/op-modules/op-mes/src/main/java/com/op/mes/controller/WcsPrintTaskController.java new file mode 100644 index 000000000..43c70332c --- /dev/null +++ b/op-modules/op-mes/src/main/java/com/op/mes/controller/WcsPrintTaskController.java @@ -0,0 +1,108 @@ +package com.op.mes.controller; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.servlet.http.HttpServletResponse; +//import org.springframework.security.access.prepost.PreAuthorize; +import com.op.common.core.utils.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +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.WcsPrintTask; +import com.op.mes.service.IWcsPrintTaskService; +import com.op.common.core.utils.poi.ExcelUtil; +import com.op.common.core.web.page.TableDataInfo; + +/** + * 生产箱码和托盘绑定关系Controller + * + * @author ruoyi + * @date 2025-04-24 + */ +@RestController +@RequestMapping("/task") +public class WcsPrintTaskController extends BaseController +{ + @Autowired + private IWcsPrintTaskService wcsPrintTaskService; + + /** + * 查询生产箱码和托盘绑定关系列表 + */ + @GetMapping("/list") + public TableDataInfo list(WcsPrintTask wcsPrintTask,@RequestParam(required = false) String beginTime, + @RequestParam(required = false) String endTime) + { + // 直接使用前端传递的完整时间格式 + if (StringUtils.isNotEmpty(beginTime)){ + wcsPrintTask.getParams().put("beginTime", beginTime); + } + if (StringUtils.isNotEmpty(endTime)) { + wcsPrintTask.getParams().put("endTime", endTime); + } + startPage(); + List list = wcsPrintTaskService.selectWcsPrintTaskList(wcsPrintTask); + return getDataTable(list); + } + + /** + * 导出生产箱码和托盘绑定关系列表 + */ + @Log(title = "生产箱码和托盘绑定关系", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, WcsPrintTask wcsPrintTask,@RequestParam(required = false) String beginTime, + @RequestParam(required = false) String endTime) + { + if (StringUtils.isNotEmpty(beginTime) && StringUtils.isNotEmpty(endTime)) { + wcsPrintTask.getParams().put("beginTime", beginTime + " 00:00:00"); + wcsPrintTask.getParams().put("endTime", endTime + " 23:59:59"); + } + + List list = wcsPrintTaskService.selectWcsPrintTaskList(wcsPrintTask); + ExcelUtil util = new ExcelUtil(WcsPrintTask.class); + util.exportExcel(response, list, "生产箱码和托盘绑定关系数据"); + } + + /** + * 获取生产箱码和托盘绑定关系详细信息 + */ + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") String id) + { + return success(wcsPrintTaskService.selectWcsPrintTaskById(id)); + } + + /** + * 新增生产箱码和托盘绑定关系 + */ + @Log(title = "生产箱码和托盘绑定关系", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody WcsPrintTask wcsPrintTask) + { + return toAjax(wcsPrintTaskService.insertWcsPrintTask(wcsPrintTask)); + } + + /** + * 修改生产箱码和托盘绑定关系 + */ + @Log(title = "生产箱码和托盘绑定关系", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody WcsPrintTask wcsPrintTask) + { + return toAjax(wcsPrintTaskService.updateWcsPrintTask(wcsPrintTask)); + } + + /** + * 删除生产箱码和托盘绑定关系 + */ + @Log(title = "生产箱码和托盘绑定关系", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable String[] ids) + { + return toAjax(wcsPrintTaskService.deleteWcsPrintTaskByIds(ids)); + } +} diff --git a/op-modules/op-mes/src/main/java/com/op/mes/domain/WcsPrintTask.java b/op-modules/op-mes/src/main/java/com/op/mes/domain/WcsPrintTask.java new file mode 100644 index 000000000..2d0728880 --- /dev/null +++ b/op-modules/op-mes/src/main/java/com/op/mes/domain/WcsPrintTask.java @@ -0,0 +1,280 @@ +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 org.springframework.data.annotation.Transient; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDateTime; +import java.util.HashMap; +import java.util.Map; + +/** + * 生产箱码和托盘绑定关系对象 wcs_print_task + * + * @author ruoyi + * @date 2025-04-24 + */ +public class WcsPrintTask extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 打印任务ID */ + private String id; + + /** 工单号 */ + @Excel(name = "工单号") + private String workorderCode; + + /** 打印状态 */ + @Excel(name = "打印状态") + private String printStatus; + + /** 产线编码 */ + @Excel(name = "产线编码") + private String lineCode; + + /** 预留字段1 */ + @Excel(name = "预留字段1") + private String attr1; + + /** 预留字段2 */ + @Excel(name = "预留字段2") + private String attr2; + + /** 预留字段3 */ + @Excel(name = "预留字段3") + private String attr3; + + /** 预留字段4 */ + @Excel(name = "预留字段4") + private String attr4; + + /** 删除字段标识(0未删除1删除) */ + private String delFlag; + + /** 打印标签码 */ + @Excel(name = "打印标签码") + private String printLableCode; + + /** 数量 */ + @Excel(name = "数量") + private Long quantity; + + /** 序号 */ + @Excel(name = "序号") + private Long inum; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String productName; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String batchCode; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String productDate; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String productUnit; + /** + * 开始结束日期 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime beginTime; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime endTime; + + public LocalDateTime getBeginTime() { + return beginTime; + } + + public void setBeginTime(LocalDateTime beginTime) { + this.beginTime = beginTime; + } + + public LocalDateTime getEndTime() { + return endTime; + } + + public void setEndTime(LocalDateTime endTime) { + this.endTime = endTime; + } + + public void setId(String id) + { + this.id = id; + } + + public String getId() + { + return id; + } + public void setWorkorderCode(String workorderCode) + { + this.workorderCode = workorderCode; + } + + public String getWorkorderCode() + { + return workorderCode; + } + public void setPrintStatus(String printStatus) + { + this.printStatus = printStatus; + } + + public String getPrintStatus() + { + return printStatus; + } + public void setLineCode(String lineCode) + { + this.lineCode = lineCode; + } + + public String getLineCode() + { + return lineCode; + } + public void setAttr1(String attr1) + { + this.attr1 = attr1; + } + + public String getAttr1() + { + return attr1; + } + public void setAttr2(String attr2) + { + this.attr2 = attr2; + } + + public String getAttr2() + { + return attr2; + } + public void setAttr3(String attr3) + { + this.attr3 = attr3; + } + + public String getAttr3() + { + return attr3; + } + public void setAttr4(String attr4) + { + this.attr4 = attr4; + } + + public String getAttr4() + { + return attr4; + } + public void setDelFlag(String delFlag) + { + this.delFlag = delFlag; + } + + public String getDelFlag() + { + return delFlag; + } + public void setPrintLableCode(String printLableCode) + { + this.printLableCode = printLableCode; + } + + public String getPrintLableCode() + { + return printLableCode; + } + public void setQuantity(Long quantity) + { + this.quantity = quantity; + } + + public Long getQuantity() + { + return quantity; + } + public void setInum(Long inum) + { + this.inum = inum; + } + + public Long getInum() + { + return inum; + } + public void setProductName(String productName) + { + this.productName = productName; + } + + public String getProductName() + { + return productName; + } + public void setBatchCode(String batchCode) + { + this.batchCode = batchCode; + } + + public String getBatchCode() + { + return batchCode; + } + public void setProductDate(String productDate) + { + this.productDate = productDate; + } + + public String getProductDate() + { + return productDate; + } + public void setProductUnit(String productUnit) + { + this.productUnit = productUnit; + } + + public String getProductUnit() + { + return productUnit; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("workorderCode", getWorkorderCode()) + .append("printStatus", getPrintStatus()) + .append("lineCode", getLineCode()) + .append("remark", getRemark()) + .append("attr1", getAttr1()) + .append("attr2", getAttr2()) + .append("attr3", getAttr3()) + .append("attr4", getAttr4()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("delFlag", getDelFlag()) + .append("printLableCode", getPrintLableCode()) + .append("quantity", getQuantity()) + .append("inum", getInum()) + .append("productName", getProductName()) + .append("batchCode", getBatchCode()) + .append("productDate", getProductDate()) + .append("productUnit", getProductUnit()) + .toString(); + } +} diff --git a/op-modules/op-mes/src/main/java/com/op/mes/mapper/WcsPrintTaskMapper.java b/op-modules/op-mes/src/main/java/com/op/mes/mapper/WcsPrintTaskMapper.java new file mode 100644 index 000000000..18daa0b92 --- /dev/null +++ b/op-modules/op-mes/src/main/java/com/op/mes/mapper/WcsPrintTaskMapper.java @@ -0,0 +1,61 @@ +package com.op.mes.mapper; + +import java.util.List; +import com.op.mes.domain.WcsPrintTask; + +/** + * 生产箱码和托盘绑定关系Mapper接口 + * + * @author ruoyi + * @date 2025-04-24 + */ +public interface WcsPrintTaskMapper +{ + /** + * 查询生产箱码和托盘绑定关系 + * + * @param id 生产箱码和托盘绑定关系主键 + * @return 生产箱码和托盘绑定关系 + */ + public WcsPrintTask selectWcsPrintTaskById(String id); + + /** + * 查询生产箱码和托盘绑定关系列表 + * + * @param wcsPrintTask 生产箱码和托盘绑定关系 + * @return 生产箱码和托盘绑定关系集合 + */ + public List selectWcsPrintTaskList(WcsPrintTask wcsPrintTask); + + /** + * 新增生产箱码和托盘绑定关系 + * + * @param wcsPrintTask 生产箱码和托盘绑定关系 + * @return 结果 + */ + public int insertWcsPrintTask(WcsPrintTask wcsPrintTask); + + /** + * 修改生产箱码和托盘绑定关系 + * + * @param wcsPrintTask 生产箱码和托盘绑定关系 + * @return 结果 + */ + public int updateWcsPrintTask(WcsPrintTask wcsPrintTask); + + /** + * 删除生产箱码和托盘绑定关系 + * + * @param id 生产箱码和托盘绑定关系主键 + * @return 结果 + */ + public int deleteWcsPrintTaskById(String id); + + /** + * 批量删除生产箱码和托盘绑定关系 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteWcsPrintTaskByIds(String[] ids); +} diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/WcsPrintTaskServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/WcsPrintTaskServiceImpl.java new file mode 100644 index 000000000..aa1927992 --- /dev/null +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/WcsPrintTaskServiceImpl.java @@ -0,0 +1,104 @@ +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.WcsPrintTaskMapper; +import com.op.mes.domain.WcsPrintTask; +import com.op.mes.service.IWcsPrintTaskService; + +/** + * 生产箱码和托盘绑定关系Service业务层处理 + * + * @author ruoyi + * @date 2025-04-24 + */ +@Service +public class WcsPrintTaskServiceImpl implements IWcsPrintTaskService +{ + @Autowired + private WcsPrintTaskMapper wcsPrintTaskMapper; + + /** + * 查询生产箱码和托盘绑定关系 + * + * @param id 生产箱码和托盘绑定关系主键 + * @return 生产箱码和托盘绑定关系 + */ + @Override + @DS("#header.poolName") + public WcsPrintTask selectWcsPrintTaskById(String id) + { + return wcsPrintTaskMapper.selectWcsPrintTaskById(id); + } + + /** + * 查询生产箱码和托盘绑定关系列表 + * + * @param wcsPrintTask 生产箱码和托盘绑定关系 + * @return 生产箱码和托盘绑定关系 + */ + @Override + @DS("#header.poolName") + public List selectWcsPrintTaskList(WcsPrintTask wcsPrintTask) + { + return wcsPrintTaskMapper.selectWcsPrintTaskList(wcsPrintTask); + } + + /** + * 新增生产箱码和托盘绑定关系 + * + * @param wcsPrintTask 生产箱码和托盘绑定关系 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int insertWcsPrintTask(WcsPrintTask wcsPrintTask) + { + wcsPrintTask.setCreateTime(DateUtils.getNowDate()); + return wcsPrintTaskMapper.insertWcsPrintTask(wcsPrintTask); + } + + /** + * 修改生产箱码和托盘绑定关系 + * + * @param wcsPrintTask 生产箱码和托盘绑定关系 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int updateWcsPrintTask(WcsPrintTask wcsPrintTask) + { + wcsPrintTask.setUpdateTime(DateUtils.getNowDate()); + return wcsPrintTaskMapper.updateWcsPrintTask(wcsPrintTask); + } + + /** + * 批量删除生产箱码和托盘绑定关系 + * + * @param ids 需要删除的生产箱码和托盘绑定关系主键 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int deleteWcsPrintTaskByIds(String[] ids) + { + return wcsPrintTaskMapper.deleteWcsPrintTaskByIds(ids); + } + + /** + * 删除生产箱码和托盘绑定关系信息 + * + * @param id 生产箱码和托盘绑定关系主键 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int deleteWcsPrintTaskById(String id) + { + return wcsPrintTaskMapper.deleteWcsPrintTaskById(id); + } +} diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/WcsPrintTaskMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/WcsPrintTaskMapper.xml new file mode 100644 index 000000000..0dbb4df70 --- /dev/null +++ b/op-modules/op-mes/src/main/resources/mapper/mes/WcsPrintTaskMapper.xml @@ -0,0 +1,155 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, workorder_code, print_status, line_code, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time, del_flag, print_lable_code, quantity, inum, product_name, batch_code, product_date, product_unit from wcs_print_task + + + + + + + + insert into wcs_print_task + + id, + workorder_code, + print_status, + line_code, + remark, + attr1, + attr2, + attr3, + attr4, + create_by, + create_time, + update_by, + update_time, + del_flag, + print_lable_code, + quantity, + inum, + product_name, + batch_code, + product_date, + product_unit, + + + #{id}, + #{workorderCode}, + #{printStatus}, + #{lineCode}, + #{remark}, + #{attr1}, + #{attr2}, + #{attr3}, + #{attr4}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{delFlag}, + #{printLableCode}, + #{quantity}, + #{inum}, + #{productName}, + #{batchCode}, + #{productDate}, + #{productUnit}, + + + + + update wcs_print_task + + workorder_code = #{workorderCode}, + print_status = #{printStatus}, + line_code = #{lineCode}, + remark = #{remark}, + attr1 = #{attr1}, + attr2 = #{attr2}, + attr3 = #{attr3}, + attr4 = #{attr4}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + del_flag = #{delFlag}, + print_lable_code = #{printLableCode}, + quantity = #{quantity}, + inum = #{inum}, + product_name = #{productName}, + batch_code = #{batchCode}, + product_date = #{productDate}, + product_unit = #{productUnit}, + + where id = #{id} + + + + delete from wcs_print_task where id = #{id} + + + + delete from wcs_print_task where id in + + #{id} + + + \ No newline at end of file