add(hwmom-mes): 生产派工相关功能

- 新增获取派工编号接口
- 新增生产派工列表查询接口，支持与工序关联查询
- 修改生产订单信息查询，增加物料编码和名称等字段
- 更新生产工单信息Mapper和XML文件，支持新的查询功能

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<ProdPlanInfoVo> list = prodPlanInfoService.queryList(bo);
         return R.ok(list);
     }
+
+    /**
+     * 获取派工编号
+     *
+     * @return orderCode
+     */
+    @GetMapping(value = "/getDispatchCode")
+    public R<Void> getDispatchCode() {
+        return R.ok(prodPlanInfoService.getDispatchCode());
+    }
+
+    /**
+     * 获取工序及关联生产人员信息
+     *
+     * @param prodBaseRouteProcess
+     * @return
+     */
+    @GetMapping(value = "/getBaseRouteProcesses")
+    public R<List<ProdBaseRouteProcess>> getBaseRouteProcesses(ProdBaseRouteProcess prodBaseRouteProcess) {
+        return R.ok(prodBaseRouteProcessService.selectProdBaseRouteProcessJoinList(prodBaseRouteProcess));
+    }
+
+    /**
+     * 查询生产派工List
+     *
+     * @param bo
+     * @return
+     */
+    @GetMapping("/selectProductPlans")
+    public R<List<ProdPlanInfoVo>> selectProductPlans(ProdPlanInfoBo bo) {
+        List<ProdPlanInfoVo> list = prodPlanInfoService.selectProdPlanInfoJoinProcessList(bo);
+        return R.ok(list);
+    }
+
 }

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;//映射字段
 }

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;//映射字段
 
 }

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;//映射字段
+
+
 
 }

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;
+
 }

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<ProdPlanInfo, ProdPla
      */
     public Page<ProdPlanInfoVo> selectProdPlanInfoList(@Param("page") Page<ProdPlanInfoVo> page, @Param(Constants.WRAPPER) Wrapper<ProdPlanInfo> queryWrapper);
 
-
+    /**
+     * 查询生产派工列表,Join process
+     *
+     * @param bo 生产派工
+     * @return 生产派工集合
+     */
+    public List<ProdPlanInfoVo> selectProdPlanInfoJoinProcessList(ProdPlanInfoBo bo);
 }

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IProdPlanInfoService.java

@@ -66,4 +66,15 @@ public interface IProdPlanInfoService {
      * @return 是否删除成功
      */
     Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+
+    /**
+     * 获取派工编号
+     *
+     * @return 生产派工
+     */
+    public String getDispatchCode();
+
+
+    public List<ProdPlanInfoVo> selectProdPlanInfoJoinProcessList(ProdPlanInfoBo bo);
 }

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;
     }
 
     /**

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<ProdPlanInfoVo> selectProdPlanInfoJoinProcessList(ProdPlanInfoBo bo) {
+        return baseMapper.selectProdPlanInfoJoinProcessList(bo);
+    }
+
+
+ }

ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdOrderInfoMapper.xml

@@ -8,13 +8,22 @@
         select
         <if test="ew.getSqlSelect != null">
             ${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
         </if>
         <if test="ew.getSqlSelect == null">
             *
         </if>
         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}
     </select>
 

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">
 <mapper namespace="org.dromara.mes.mapper.ProdPlanInfoMapper">
 
+
+    <resultMap type="ProdPlanInfo" id="ProdPlanInfoResult">
+        <result property="planId" column="plan_id"/>
+        <result property="productOrderId" column="product_order_id"/>
+        <result property="saleOrderId" column="sale_order_id"/>
+        <result property="saleorderCode" column="saleorder_code"/>
+        <result property="planCode" column="plan_code"/>
+        <result property="dispatchCode" column="dispatch_code"/>
+        <result property="materialId" column="material_id"/>
+        <result property="materialName" column="material_name"/>
+        <result property="materialBomId" column="material_bom_id"/>
+        <result property="materialBomName" column="materialBomName"/>
+        <result property="processId" column="process_id"/>
+        <result property="processOrder" column="process_order"/>
+        <result property="lastProcessId" column="last_process_id"/>
+        <result property="finalProcessFlag" column="final_process_flag"/>
+        <result property="lastProcessName" column="lastProcessName"/>
+        <result property="stationId" column="station_id"/>
+        <result property="userId" column="user_id"/>
+        <result property="userName" column="user_name"/>
+        <result property="productionTime" column="production_time"/>
+        <result property="dispatchAmount" column="dispatch_amount"/>
+        <result property="planAmount" column="plan_amount"/>
+        <result property="completeAmount" column="complete_amount"/>
+        <result property="planBeginTime" column="plan_begin_time"/>
+        <result property="planEndTime" column="plan_end_time"/>
+        <result property="realBeginTime" column="real_begin_time"/>
+        <result property="realEndTime" column="real_end_time"/>
+        <result property="attachId" column="attach_id"/>
+        <result property="planStatus" column="plan_status"/>
+        <result property="isFlag" column="is_flag"/>
+        <result property="remark" column="remark"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="planDeliveryDate" column="plan_delivery_date"/>
+        <result property="materialCode" column="material_code"/>
+        <result property="materialName" column="material_name"/>
+        <result property="materialSpec" column="material_spec"/>
+        <result property="materialClassfication" column="material_classfication"/>
+<!--        <result property="processName" column="process_name"/>-->
+        <result property="processType" column="process_type"/>
+        <result property="stationName" column="station_name"/>
+        <result property="sopId" column="sop_id"/>
+        <result property="orderCode" column="order_code"/>
+        <result property="saleType" column="sale_type"/>
+
+        <result property="displayFlag" column="display_flag"/>
+        <result property="processProductionTime" column="process_production_time"/>
+        <result property="nickName" column="nick_name"/>
+        <result property="cabinetChannel" column="cabinet_channel"/>
+        <result property="productId" column="product_id"/>
+        <result property="dispatchType" column="dispatch_type"/>
+        <result property="dispatchId" column="dispatch_id"/>
+        <result property="orderStatus" column="order_status"/>
+        <result property="processType" column="process_type"/>
+        <result property="productionTime" column="production_time"/>
+
+        <result property="releaseName" column="release_name"/>
+    </resultMap>
+
+
     <select id="selectProdPlanInfoList" parameterType="ProdPlanInfoBo" resultType="ProdPlanInfoVo">
         select
         <if test="ew.getSqlSelect != null">
@@ -29,5 +92,76 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ${ew.getCustomSqlSegment}
     </select>
 
+    <select id="selectProdPlanInfoJoinProcessList" parameterType="ProdPlanInfo" resultMap="ProdPlanInfoResult">
+        select mpp.plan_id,
+        mpp.product_order_id,
+        mpp.plan_code,
+        mpp.dispatch_code,
+        mpp.material_id,
+        mpp.material_bom_id,
+        mpp.process_id,
+        bpi.process_name,
+        bpi.process_type,
+
+        mpp.process_order,
+        mpp.last_process_id,
+        mpp.final_process_flag,
+        mpp.production_time,
+        bpi.production_time as process_production_time,
+        mpp.dispatch_amount,
+        mpp.plan_amount,
+        mpp.complete_amount,
+        mpp.plan_begin_time,
+        mpp.plan_end_time,
+        mpp.real_begin_time,
+        mpp.real_end_time,
+        mpp.attach_id,
+
+        mpp.plan_status,
 
+        mpp.remark,
+        mpp.create_by,
+        mpp.create_time,
+        mpp.update_by,
+        mpp.update_time,
+
+        mpp.release_type,
+        mpp.release_id,
+        case
+        when mpp.release_type = 2 then su.user_name
+        when mpp.release_type = 3 then pbsi_3.station_name
+        when mpp.release_type = 1 then pbsi_1.station_name
+        else null
+        end as release_name
+        from prod_plan_info mpp
+        left join prod_base_process_info bpi on bpi.process_id = mpp.process_id
+
+        left join sys_user su on mpp.release_type = 2 and mpp.release_id = su.user_id
+        left join  prod_base_station_info pbsi_3 on mpp.release_type = 3 and mpp.release_id = pbsi_3.station_id
+        left join  prod_base_station_info pbsi_1 on mpp.release_type = 1 and mpp.release_id = pbsi_1.station_id
+        <where>
+            <if test="productOrderId != null ">and  mpp.product_order_id = #{productOrderId}</if>
+            <if test="planCode != null  and planCode != ''">and  mpp.plan_code = #{planCode}</if>
+            <if test="dispatchCode != null  and dispatchCode != ''">and  mpp.dispatch_code = #{dispatchCode}</if>
+            <if test="materialId != null ">and  mpp.material_id = #{materialId}</if>
+            <if test="materialBomId != null ">and  mpp.material_bom_id = #{materialBomId}</if>
+            <if test="processId != null ">and  mpp.process_id = #{processId}</if>
+            <if test="processOrder != null ">and  mpp.process_order = #{processOrder}</if>
+            <if test="lastProcessId != null ">and  mpp.last_process_id = #{lastProcessId}</if>
+
+
+            <if test="productionTime != null ">and  mpp.production_time = #{productionTime}</if>
+            <if test="planAmount != null ">and  mpp.plan_amount = #{planAmount}</if>
+            <if test="completeAmount != null ">and  mpp.complete_amount = #{completeAmount}</if>
+            <if test="planBeginTime != null ">and  mpp.plan_begin_time = #{planBeginTime}</if>
+            <if test="planEndTime != null ">and  mpp.plan_end_time = #{planEndTime}</if>
+            <if test="realBeginTime != null ">and  mpp.real_begin_time = #{realBeginTime}</if>
+            <if test="realEndTime != null ">and  mpp.real_end_time = #{realEndTime}</if>
+            <if test="attachId != null  and attachId != ''">and  mpp.attach_id = #{attachId}</if>
+            <if test="planStatus != null  and planStatus != ''">and  mpp.plan_status = #{planStatus}</if>
+
+
+        </where>
+        order by mpp.dispatch_code,mpp.process_order
+    </select>
 </mapper>