From f10225e45510f35f83405e7983abeafb44f9a5ca Mon Sep 17 00:00:00 2001 From: zch Date: Thu, 6 Mar 2025 14:18:06 +0800 Subject: [PATCH] =?UTF-8?q?change(mes):=20=E6=9B=B4=E6=96=B0=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E6=8A=95=E5=85=A5=E6=89=AB=E6=8F=8F=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增字段名称： inputBarcode， productionBarcode - 添加新字段：stationId（投料工位ID） - 在 ProdInputScanInfo 模型中添加 join映射字段 - 更新 ProdInputScanInfoBo 和 ProdInputScanInfoVo 相关代码 --- .../ProdInputScanInfoController.java | 2 +- .../dromara/mes/domain/ProdInputScanInfo.java | 40 ++++++++++++-- .../mes/domain/bo/ProdInputScanInfoBo.java | 15 ++++-- .../mes/domain/vo/ProdInputScanInfoVo.java | 53 +++++++++++++++---- .../mes/mapper/ProdInputScanInfoMapper.java | 2 +- .../service/IProdInputScanInfoService.java | 2 +- .../impl/ProdInputScanInfoServiceImpl.java | 42 +++++++++++---- 7 files changed, 121 insertions(+), 35 deletions(-) diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdInputScanInfoController.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdInputScanInfoController.java index 00faf6b4..8aa0236a 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdInputScanInfoController.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdInputScanInfoController.java @@ -27,7 +27,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; * 前端访问路由地址为:/mes/prodInputScanInfo * * @author zch - * @date 2025-03-05 + * @date 2025-03-06 */ @Validated @RequiredArgsConstructor diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdInputScanInfo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdInputScanInfo.java index 610ddac6..9664ca6f 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdInputScanInfo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdInputScanInfo.java @@ -11,7 +11,7 @@ import java.io.Serial; * 生产投入扫描信息对象 prod_input_scan_info * * @author zch - * @date 2025-03-05 + * @date 2025-03-06 */ @Data @EqualsAndHashCode(callSuper = true) @@ -38,14 +38,14 @@ public class ProdInputScanInfo extends TenantEntity { private Long machineId; /** - * 硫化条码 + * 投入条码（密炼、半制品、成型） */ - private String vulcanizedBarcode; + private String inputBarcode; /** - * 胎胚条码 + * 生产条码（半制品、成型、硫化） */ - private String embryoBarcode; + private String productionBarcode; /** * 生产工具 @@ -57,6 +57,11 @@ public class ProdInputScanInfo extends TenantEntity { */ private Long materielId; + /** + * 投料工位ID + */ + private Long stationId; + /** * 扫描结果 */ @@ -73,4 +78,29 @@ public class ProdInputScanInfo extends TenantEntity { private String remark; + /** + * 物料名称 + */ + @TableField(exist = false) + private String materialName;//join映射字段 + + /** + * 机台名称 + */ + @TableField(exist = false) + private String machineName;//join映射字段 + + + /** + * 工序名称 + */ + @TableField(exist = false) + private String processName;//join映射字段 + + /** + * 工位名称 + */ + @TableField(exist = false) + private String stationName;//join映射字段 + } diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdInputScanInfoBo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdInputScanInfoBo.java index 624a5c63..cff2792d 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdInputScanInfoBo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdInputScanInfoBo.java @@ -13,7 +13,7 @@ import jakarta.validation.constraints.*; * 生产投入扫描信息业务对象 prod_input_scan_info * * @author zch - * @date 2025-03-05 + * @date 2025-03-06 */ @Data @EqualsAndHashCode(callSuper = true) @@ -36,14 +36,14 @@ public class ProdInputScanInfoBo extends BaseEntity { private Long machineId; /** - * 硫化条码 + * 投入条码（密炼、半制品、成型） */ - private String vulcanizedBarcode; + private String inputBarcode; /** - * 胎胚条码 + * 生产条码（半制品、成型、硫化） */ - private String embryoBarcode; + private String productionBarcode; /** * 生产工具 @@ -55,6 +55,11 @@ public class ProdInputScanInfoBo extends BaseEntity { */ private Long materielId; + /** + * 投料工位ID + */ + private Long stationId; + /** * 扫描结果 */ diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdInputScanInfoVo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdInputScanInfoVo.java index 02c9ab7e..fd10d086 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdInputScanInfoVo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdInputScanInfoVo.java @@ -1,16 +1,15 @@ package org.dromara.mes.domain.vo; -import org.dromara.mes.domain.ProdInputScanInfo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import org.dromara.mes.domain.ProdInputScanInfo; import java.io.Serial; import java.io.Serializable; -import java.util.Date; @@ -18,7 +17,7 @@ import java.util.Date; * 生产投入扫描信息视图对象 prod_input_scan_info * * @author zch - * @date 2025-03-05 + * @date 2025-03-06 */ @Data @ExcelIgnoreUnannotated @@ -47,16 +46,18 @@ public class ProdInputScanInfoVo implements Serializable { private Long machineId; /** - * 硫化条码 + * 投入条码（密炼、半制品、成型） */ - @ExcelProperty(value = "硫化条码") - private String vulcanizedBarcode; + @ExcelProperty(value = "投入条码", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "密=炼、半制品、成型") + private String inputBarcode; /** - * 胎胚条码 + * 生产条码（半制品、成型、硫化） */ - @ExcelProperty(value = "胎胚条码") - private String embryoBarcode; + @ExcelProperty(value = "生产条码", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "半=制品、成型、硫化") + private String productionBarcode; /** * 生产工具 @@ -70,6 +71,12 @@ public class ProdInputScanInfoVo implements Serializable { @ExcelProperty(value = "物料ID") private Long materielId; + /** + * 投料工位ID + */ + @ExcelProperty(value = "投料工位ID") + private Long stationId; + /** * 扫描结果 */ @@ -88,5 +95,29 @@ public class ProdInputScanInfoVo implements Serializable { @ExcelProperty(value = "备注") private String remark; + /** + * 物料名称 + */ + @ExcelProperty(value = "物料名称") + private String materielName;//join映射字段 + + /** + * 投料工位名称 + */ + @ExcelProperty(value = "投料工位名称") + private String stationName;//join映射字段 + + /** + * 工序名称 + */ + @ExcelProperty(value = "工序名称") + private String processName;//join映射字段 + + /** + * 机台名称 + */ + @ExcelProperty(value = "机台名称") + private String machineName;//join映射字段 + } diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/ProdInputScanInfoMapper.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/ProdInputScanInfoMapper.java index c98c4c6f..1b6e4a60 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/ProdInputScanInfoMapper.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/ProdInputScanInfoMapper.java @@ -8,7 +8,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; * 生产投入扫描信息Mapper接口 * * @author zch - * @date 2025-03-05 + * @date 2025-03-06 */ public interface ProdInputScanInfoMapper extends BaseMapperPlus { diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IProdInputScanInfoService.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IProdInputScanInfoService.java index 3e0d8cd1..dca55ed3 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IProdInputScanInfoService.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IProdInputScanInfoService.java @@ -13,7 +13,7 @@ import java.util.List; * 生产投入扫描信息Service接口 * * @author zch - * @date 2025-03-05 + * @date 2025-03-06 */ public interface IProdInputScanInfoService { diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdInputScanInfoServiceImpl.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdInputScanInfoServiceImpl.java index 35b47bdb..9701416c 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdInputScanInfoServiceImpl.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdInputScanInfoServiceImpl.java @@ -1,30 +1,29 @@ package org.dromara.mes.service.impl; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.mybatis.core.page.PageQuery; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.yulichang.toolkit.JoinWrappers; import com.github.yulichang.wrapper.MPJLambdaWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mes.domain.*; import org.dromara.mes.domain.bo.ProdInputScanInfoBo; import org.dromara.mes.domain.vo.ProdInputScanInfoVo; -import org.dromara.mes.domain.ProdInputScanInfo; import org.dromara.mes.mapper.ProdInputScanInfoMapper; import org.dromara.mes.service.IProdInputScanInfoService; +import org.springframework.stereotype.Service; +import java.util.Collection; import java.util.List; import java.util.Map; -import java.util.Collection; /** * 生产投入扫描信息Service业务层处理 * * @author zch - * @date 2025-03-05 + * @date 2025-03-06 */ @RequiredArgsConstructor @Service @@ -73,13 +72,34 @@ public class ProdInputScanInfoServiceImpl implements IProdInputScanInfoService { Map params = bo.getParams(); MPJLambdaWrapper lqw = JoinWrappers.lambda(ProdInputScanInfo.class) .selectAll(ProdInputScanInfo.class) + + //物料连表查询名称 + .select(BaseMaterialInfo::getMaterialName) + .leftJoin(BaseMaterialInfo.class, BaseMaterialInfo::getMaterialId, ProdInputScanInfo::getMaterielId) + + + //机台连表查询名称 + .select(ProdBaseMachineInfo::getMachineName) + .leftJoin(ProdBaseMachineInfo.class, ProdBaseMachineInfo::getMachineId, ProdInputScanInfo::getMachineId) + + //工序连表查询名称 + .select(ProdBaseProcessInfo::getProcessName) + .leftJoin(ProdBaseProcessInfo.class, ProdBaseProcessInfo::getProcessId, ProdInputScanInfo::getProcessId) + + //投料工位连表查询名称 + .select(ProdBaseStationInfo::getStationName) + .leftJoin(ProdBaseStationInfo.class, ProdBaseStationInfo::getStationId, ProdInputScanInfo::getStationId) + + + .eq(bo.getProdInputScanInfoId() != null, ProdInputScanInfo::getProdInputScanInfoId, bo.getProdInputScanInfoId()) .eq(bo.getProcessId() != null, ProdInputScanInfo::getProcessId, bo.getProcessId()) .eq(bo.getMachineId() != null, ProdInputScanInfo::getMachineId, bo.getMachineId()) - .eq(StringUtils.isNotBlank(bo.getVulcanizedBarcode()), ProdInputScanInfo::getVulcanizedBarcode, bo.getVulcanizedBarcode()) - .eq(StringUtils.isNotBlank(bo.getEmbryoBarcode()), ProdInputScanInfo::getEmbryoBarcode, bo.getEmbryoBarcode()) + .eq(StringUtils.isNotBlank(bo.getInputBarcode()), ProdInputScanInfo::getInputBarcode, bo.getInputBarcode()) + .eq(StringUtils.isNotBlank(bo.getProductionBarcode()), ProdInputScanInfo::getProductionBarcode, bo.getProductionBarcode()) .eq(bo.getToolId() != null, ProdInputScanInfo::getToolId, bo.getToolId()) .eq(bo.getMaterielId() != null, ProdInputScanInfo::getMaterielId, bo.getMaterielId()) + .eq(bo.getStationId() != null, ProdInputScanInfo::getStationId, bo.getStationId()) .eq(StringUtils.isNotBlank(bo.getScanResult()), ProdInputScanInfo::getScanResult, bo.getScanResult()) .like(StringUtils.isNotBlank(bo.getUserName()), ProdInputScanInfo::getUserName, bo.getUserName()) .orderByDesc(ProdInputScanInfo::getCreateTime);