From 3ce2e846c9e116e436bf7d6a3d08f11120690f08 Mon Sep 17 00:00:00 2001 From: zch Date: Mon, 20 Jan 2025 09:00:51 +0800 Subject: [PATCH] =?UTF-8?q?add(hwmom-mes):=20=E7=94=9F=E4=BA=A7=E6=B4=BE?= =?UTF-8?q?=E5=B7=A5=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增获取派工编号接口 - 新增生产派工列表查询接口，支持与工序关联查询 - 修改生产订单信息查询，增加物料编码和名称等字段 - 更新生产工单信息Mapper和XML文件，支持新的查询功能 --- .../controller/ProdPlanInfoController.java | 38 +++++ .../org/dromara/mes/domain/ProdOrderInfo.java | 23 +++ .../org/dromara/mes/domain/ProdPlanInfo.java | 21 +++ .../mes/domain/vo/ProdOrderInfoVo.java | 21 ++- .../dromara/mes/domain/vo/ProdPlanInfoVo.java | 12 ++ .../mes/mapper/ProdPlanInfoMapper.java | 11 +- .../mes/service/IProdPlanInfoService.java | 11 ++ .../impl/ProdOrderInfoServiceImpl.java | 35 ++++- .../service/impl/ProdPlanInfoServiceImpl.java | 25 +++- .../mapper/mes/ProdOrderInfoMapper.xml | 11 +- .../mapper/mes/ProdPlanInfoMapper.xml | 134 ++++++++++++++++++ 11 files changed, 335 insertions(+), 7 deletions(-) diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdPlanInfoController.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdPlanInfoController.java index c497a859..ef7f2ecc 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdPlanInfoController.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdPlanInfoController.java @@ -6,6 +6,8 @@ import lombok.RequiredArgsConstructor; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; +import org.dromara.mes.domain.ProdBaseRouteProcess; +import org.dromara.mes.service.IProdBaseRouteProcessService; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; import org.dromara.common.idempotent.annotation.RepeatSubmit; @@ -37,6 +39,8 @@ public class ProdPlanInfoController extends BaseController { private final IProdPlanInfoService prodPlanInfoService; + private final IProdBaseRouteProcessService prodBaseRouteProcessService; + /** * 查询生产工单信息列表 */ @@ -114,4 +118,38 @@ public class ProdPlanInfoController extends BaseController { List list = prodPlanInfoService.queryList(bo); return R.ok(list); } + + /** + * 获取派工编号 + * + * @return orderCode + */ + @GetMapping(value = "/getDispatchCode") + public R getDispatchCode() { + return R.ok(prodPlanInfoService.getDispatchCode()); + } + + /** + * 获取工序及关联生产人员信息 + * + * @param prodBaseRouteProcess + * @return + */ + @GetMapping(value = "/getBaseRouteProcesses") + public R> getBaseRouteProcesses(ProdBaseRouteProcess prodBaseRouteProcess) { + return R.ok(prodBaseRouteProcessService.selectProdBaseRouteProcessJoinList(prodBaseRouteProcess)); + } + + /** + * 查询生产派工List + * + * @param bo + * @return + */ + @GetMapping("/selectProductPlans") + public R> selectProductPlans(ProdPlanInfoBo bo) { + List list = prodPlanInfoService.selectProdPlanInfoJoinProcessList(bo); + return R.ok(list); + } + } diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdOrderInfo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdOrderInfo.java index 46e604ea..76d9c700 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdOrderInfo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdOrderInfo.java @@ -165,4 +165,27 @@ public class ProdOrderInfo extends TenantEntity { private String remark; + /** + * 物料编码 + */ + @TableField(exist = false) + private String materialCode;//映射字段 + + /** + * 物料名称 + */ + @TableField(exist = false) + private String materialName;//映射字段 + + /** + * + */ + @TableField(exist = false) + private String dispatchName;//映射字段 + + /** + * 工艺路线名称 + */ + @TableField(exist = false) + private String routeName;//映射字段 } diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdPlanInfo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdPlanInfo.java index 9a8cf211..b2fe4ebc 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdPlanInfo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdPlanInfo.java @@ -179,5 +179,26 @@ public class ProdPlanInfo extends TenantEntity { */ private String remark; + /** + * 工序类别（1生产工序 2质检工序） + */ + @TableField(exist = false) + private String processType;//映射字段 + + /** + * 工序名称 + */ + @TableField(exist = false) + private String processName;//映射字段 + + /** + * 单位生产时间(秒) + */ + @TableField(exist = false) + private Long processProductionTime;//映射字段 + + + @TableField(exist = false) + private String releaseName;//映射字段 } diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdOrderInfoVo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdOrderInfoVo.java index 6f3e6663..edaa8400 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdOrderInfoVo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdOrderInfoVo.java @@ -242,6 +242,25 @@ public class ProdOrderInfoVo implements Serializable { @ExcelProperty(value = "更新时间") private Date updateTime; - private String materialName; + /** + * 物料名称 + */ + @ExcelProperty(value = "物料名称") + private String materialName;//映射字段 + + /** + * 物料编码 + */ + @ExcelProperty(value = "物料编码") + private String materialCode;//映射字段 + + + /** + * 工艺路线名称 + */ + @ExcelProperty(value = "工艺路线名称") + private String dispatchName;//映射字段 + + } diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdPlanInfoVo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdPlanInfoVo.java index cbb406f1..40a43f11 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdPlanInfoVo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdPlanInfoVo.java @@ -1,6 +1,8 @@ package org.dromara.mes.domain.vo; import java.util.Date; + +import com.alibaba.excel.annotation.ExcelIgnore; import com.fasterxml.jackson.annotation.JsonFormat; import org.dromara.mes.domain.ProdPlanInfo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; @@ -229,4 +231,14 @@ public class ProdPlanInfoVo implements Serializable { private String teamName; private String materialBomName; private String releaseName; + + /** + * 工序类别（1生产工序 2质检工序） + */ + @ExcelIgnore + private String processType; + + @ExcelIgnore + private Long processProductionTime; + } diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/ProdPlanInfoMapper.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/ProdPlanInfoMapper.java index d8ca16fe..555aec6e 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/ProdPlanInfoMapper.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/ProdPlanInfoMapper.java @@ -6,10 +6,13 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import org.dromara.mes.domain.ProdOrderInfo; import org.dromara.mes.domain.ProdPlanInfo; +import org.dromara.mes.domain.bo.ProdPlanInfoBo; import org.dromara.mes.domain.vo.ProdOrderInfoVo; import org.dromara.mes.domain.vo.ProdPlanInfoVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import java.util.List; + /** * 生产工单信息Mapper接口 * @@ -26,5 +29,11 @@ public interface ProdPlanInfoMapper extends BaseMapperPlus selectProdPlanInfoList(@Param("page") Page page, @Param(Constants.WRAPPER) Wrapper queryWrapper); - + /** + * 查询生产派工列表,Join process + * + * @param bo 生产派工 + * @return 生产派工集合 + */ + public List selectProdPlanInfoJoinProcessList(ProdPlanInfoBo bo); } diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IProdPlanInfoService.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IProdPlanInfoService.java index 7aaf3d14..e7758d0d 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IProdPlanInfoService.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IProdPlanInfoService.java @@ -66,4 +66,15 @@ public interface IProdPlanInfoService { * @return 是否删除成功 */ Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + + /** + * 获取派工编号 + * + * @return 生产派工 + */ + public String getDispatchCode(); + + + public List selectProdPlanInfoJoinProcessList(ProdPlanInfoBo bo); } diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdOrderInfoServiceImpl.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdOrderInfoServiceImpl.java index 9b15614d..fb05555b 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdOrderInfoServiceImpl.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdOrderInfoServiceImpl.java @@ -8,11 +8,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.yulichang.toolkit.JoinWrappers; import com.github.yulichang.wrapper.MPJLambdaWrapper; import lombok.RequiredArgsConstructor; +import org.dromara.mes.domain.*; +import org.dromara.mes.domain.vo.BaseMaterialInfoVo; +import org.dromara.mes.mapper.*; import org.springframework.stereotype.Service; import org.dromara.mes.domain.bo.ProdOrderInfoBo; import org.dromara.mes.domain.vo.ProdOrderInfoVo; -import org.dromara.mes.domain.ProdOrderInfo; -import org.dromara.mes.mapper.ProdOrderInfoMapper; import org.dromara.mes.service.IProdOrderInfoService; import java.util.List; @@ -31,6 +32,10 @@ public class ProdOrderInfoServiceImpl implements IProdOrderInfoService { private final ProdOrderInfoMapper baseMapper; + private final ProdBaseProdLineInfoMapper prodBaseProdLineInfoMapper; + private final ProdBaseRouteMapper prodBaseRouteMapper; + private final ProdBaseProcessInfoMapper prodBaseProcessInfoMapper; + private final BaseMaterialInfoMapper baseMaterialInfoMapper; /** * 查询生产订单信息 * @@ -39,7 +44,31 @@ public class ProdOrderInfoServiceImpl implements IProdOrderInfoService { */ @Override public ProdOrderInfoVo queryById(Long productOrderId){ - return baseMapper.selectVoById(productOrderId); + ProdOrderInfoVo prodOrderInfoVo = baseMapper.selectVoById(productOrderId); + //根据dispatchType查询对应的名称 + String dispatchType = prodOrderInfoVo.getDispatchType(); + switch (dispatchType) { + // 1:产线 2:工艺路线 3:工序 + case "1": + prodOrderInfoVo.setDispatchName(prodBaseProdLineInfoMapper.selectVoById(prodOrderInfoVo.getDispatchId()).getProdLineName()); + break; + case "2": + prodOrderInfoVo.setDispatchName(prodBaseRouteMapper.selectVoById(prodOrderInfoVo.getDispatchId()).getRouteName()); + break; + case "3": + prodOrderInfoVo.setDispatchName(prodBaseProcessInfoMapper.selectVoById(prodOrderInfoVo.getDispatchId()).getProcessName()); + break; + default: + break; + } + //根据materialId查询对应的名称和编码 + Long materialId = prodOrderInfoVo.getMaterialId(); + if (materialId != null) { + BaseMaterialInfoVo baseMaterialInfo = baseMaterialInfoMapper.selectVoById(materialId); + prodOrderInfoVo.setMaterialName(baseMaterialInfo.getMaterialName()); + prodOrderInfoVo.setMaterialCode(baseMaterialInfo.getMaterialCode()); + } + return prodOrderInfoVo; } /** diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdPlanInfoServiceImpl.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdPlanInfoServiceImpl.java index c71e31b9..1c8f9e02 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdPlanInfoServiceImpl.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdPlanInfoServiceImpl.java @@ -160,4 +160,27 @@ public class ProdPlanInfoServiceImpl implements IProdPlanInfoService { } return baseMapper.deleteByIds(ids) > 0; } -} + + /** + * 获取派工编号 + * + * @return + */ + @Override + public String getDispatchCode() { + return Seq.getId(Seq.mesPlanCodeSeqType, Seq.mesPlanCodeCode); + } + + /** + * 查询生产派工列表,join process + * + * @param bo 生产派工 + * @return 生产派工 + */ + @Override + public List selectProdPlanInfoJoinProcessList(ProdPlanInfoBo bo) { + return baseMapper.selectProdPlanInfoJoinProcessList(bo); + } + + + } diff --git a/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdOrderInfoMapper.xml b/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdOrderInfoMapper.xml index 01a495a0..ef86018c 100644 --- a/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdOrderInfoMapper.xml +++ b/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdOrderInfoMapper.xml @@ -8,13 +8,22 @@ select ${ew.getSqlSelect}, - bmi.material_name + bmi.material_name, + CASE + WHEN t.dispatch_type = 1 THEN pli.prod_line_name + WHEN t.dispatch_type = 2 THEN rt.route_name + WHEN t.dispatch_type = 3 THEN pi.process_name + ELSE NULL + END AS dispatchName * from prod_order_info t left join base_material_info bmi on bmi.material_id = t.material_id + left join prod_base_prod_line_info pli on t.dispatch_type = 1 and pli.prod_line_id = t.dispatch_id + left join prod_base_route rt on t.dispatch_type = 2 and rt.route_id = t.dispatch_id + left join prod_base_process_info pi on t.dispatch_type = 3 and pi.process_id = t.dispatch_id ${ew.getCustomSqlSegment} diff --git a/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdPlanInfoMapper.xml b/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdPlanInfoMapper.xml index 43427da6..ee17ee73 100644 --- a/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdPlanInfoMapper.xml +++ b/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdPlanInfoMapper.xml @@ -4,6 +4,69 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +