【ADD】增加标准工序相关功能代码

huangjiayang

2025-04-23 a7d03c3ea44f7d4b781c56b28550eb7f6e9d90c1

【ADD】增加标准工序相关功能代码

 aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsStandardProcessController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,99 @@
package com.aps.core.controller.basicData;

import com.aps.common.core.utils.poi.ExcelUtil;
import com.aps.common.core.web.controller.BaseController;
import com.aps.common.core.web.domain.AjaxResult;
import com.aps.common.core.web.page.TableDataInfo;
import com.aps.common.log.annotation.Log;
import com.aps.common.log.enums.BusinessType;
import com.aps.common.security.annotation.RequiresPermissions;
import com.aps.core.domain.ApsStandardProcess;
import com.aps.core.service.IApsStandardProcessService;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.List;

/**
 * æ ‡å‡†å·¥åºController
 * 
 * @author hjy
 * @date 2025-04-23
 */

@RestController
@RequestMapping("/standardProcess")
public class ApsStandardProcessController extends BaseController
{
    @Autowired
    private IApsStandardProcessService apsStandardProcessService;

    /**
     * æŸ¥è¯¢æ ‡å‡†å·¥åºåˆ—表
     */
    @RequiresPermissions("core:standardProcess:list")
    @GetMapping("/list")
    public TableDataInfo list(ApsStandardProcess apsStandardProcess)
    {
        startPage();
        List<ApsStandardProcess> list = apsStandardProcessService.selectApsStandardProcessList(apsStandardProcess);
        return getDataTable(list);
    }

    /**
     * å¯¼å‡ºæ ‡å‡†å·¥åºåˆ—表
     */
    @RequiresPermissions("core:standardProcess:export")
    @Log(title = "标准工序", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, ApsStandardProcess apsStandardProcess)
    {
        List<ApsStandardProcess> list = apsStandardProcessService.selectApsStandardProcessList(apsStandardProcess);
        ExcelUtil<ApsStandardProcess> util = new ExcelUtil<ApsStandardProcess>(ApsStandardProcess.class);
        util.exportExcel(response, list, "标准工序数据");
    }

    /**
     * èŽ·å–标准工序详细信息
     */
    @RequiresPermissions("core:standardProcess:query")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id)
    {
        return success(apsStandardProcessService.selectApsStandardProcessById(id));
    }

    /**
     * æ–°å¢žæ ‡å‡†å·¥åº
     */
    @RequiresPermissions("core:standardProcess:add")
    @Log(title = "标准工序", businessType = BusinessType.INSERT)
    @PostMapping
    public AjaxResult add(@RequestBody ApsStandardProcess apsStandardProcess)
    {
        return toAjax(apsStandardProcessService.insertApsStandardProcess(apsStandardProcess));
    }

    /**
     * ä¿®æ”¹æ ‡å‡†å·¥åº
     */
    @RequiresPermissions("core:standardProcess:edit")
    @Log(title = "标准工序", businessType = BusinessType.UPDATE)
    @PutMapping
    public AjaxResult edit(@RequestBody ApsStandardProcess apsStandardProcess)
    {
        return toAjax(apsStandardProcessService.updateApsStandardProcess(apsStandardProcess));
    }

    /**
     * åˆ é™¤æ ‡å‡†å·¥åº
     */
    @RequiresPermissions("core:standardProcess:remove")
    @Log(title = "标准工序", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
        return toAjax(apsStandardProcessService.deleteApsStandardProcessByIds(ids));
    }
}

 aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsStandardProcess.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,235 @@
package com.aps.core.domain;

import com.aps.common.core.annotation.Excel;
import com.aps.common.core.web.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;

/**
 * æ ‡å‡†å·¥åºå¯¹è±¡ aps_standard_process
 * 
 * @author hjy
 * @date 2025-04-23
 */
public class ApsStandardProcess extends BaseEntity
{
    private static final long serialVersionUID = 1L;

    /** ä¸»é”®id */
    private Long id;

    /** å·¥åºç¼–码 */
    @Excel(name = "工序编码")
    private String processNumber;

    /** å·¥åºåç§° */
    @Excel(name = "工序名称")
    private String processName;

    /** èµ„源组 */
    @Excel(name = "资源组")
    private String resourceGroupName;

    /** äº§èƒ½æ¨¡åž‹: ç‹¬å /合批 */
    @Excel(name = "产能模型: ç‹¬å /合批")
    private String model;

    /** è®¾è®¡äº§èƒ½ */
    @Excel(name = "设计产能")
    private String designCapacity;

    /** å·¥åŽ‚Id */
    @Excel(name = "工厂Id")
    private String plantId;

    /** å·¥åŽ‚ */
    @Excel(name = "工厂")
    private String plant;

    /** è½¦é—´Id */
    @Excel(name = "车间Id")
    private String workShopId;

    /** è½¦é—´ */
    @Excel(name = "车间")
    private String workShop;

    /** æ—¥åŽ†Id */
    @Excel(name = "日历Id")
    private Long workCalenderId;

    /** åˆ é™¤æ ‡å¿—（0代表存在 2代表删除） */
    private String delFlag;

    /** äº§èƒ½æ¨¡åž‹Id */
    @Excel(name = "产能模型Id")
    private Long modelId;

    /** æ—¥åŽ†æè¿° */
    @Excel(name = "日历描述")
    private String workCalender;

    public void setId(Long id) 
    {
        this.id = id;
    }

    public Long getId() 
    {
        return id;
    }

    public void setProcessNumber(String processNumber) 
    {
        this.processNumber = processNumber;
    }

    public String getProcessNumber() 
    {
        return processNumber;
    }

    public void setProcessName(String processName) 
    {
        this.processName = processName;
    }

    public String getProcessName() 
    {
        return processName;
    }

    public void setResourceGroupName(String resourceGroupName) 
    {
        this.resourceGroupName = resourceGroupName;
    }

    public String getResourceGroupName() 
    {
        return resourceGroupName;
    }

    public void setModel(String model) 
    {
        this.model = model;
    }

    public String getModel() 
    {
        return model;
    }

    public void setDesignCapacity(String designCapacity) 
    {
        this.designCapacity = designCapacity;
    }

    public String getDesignCapacity() 
    {
        return designCapacity;
    }

    public void setPlantId(String plantId) 
    {
        this.plantId = plantId;
    }

    public String getPlantId() 
    {
        return plantId;
    }

    public void setPlant(String plant) 
    {
        this.plant = plant;
    }

    public String getPlant() 
    {
        return plant;
    }

    public void setWorkShopId(String workShopId) 
    {
        this.workShopId = workShopId;
    }

    public String getWorkShopId() 
    {
        return workShopId;
    }

    public void setWorkShop(String workShop) 
    {
        this.workShop = workShop;
    }

    public String getWorkShop() 
    {
        return workShop;
    }

    public void setWorkCalenderId(Long workCalenderId) 
    {
        this.workCalenderId = workCalenderId;
    }

    public Long getWorkCalenderId() 
    {
        return workCalenderId;
    }

    public void setDelFlag(String delFlag) 
    {
        this.delFlag = delFlag;
    }

    public String getDelFlag() 
    {
        return delFlag;
    }

    public void setModelId(Long modelId) 
    {
        this.modelId = modelId;
    }

    public Long getModelId() 
    {
        return modelId;
    }

    public void setWorkCalender(String workCalender) 
    {
        this.workCalender = workCalender;
    }

    public String getWorkCalender() 
    {
        return workCalender;
    }

    @Override
    public String toString() {
        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
            .append("id", getId())
            .append("processNumber", getProcessNumber())
            .append("processName", getProcessName())
            .append("resourceGroupName", getResourceGroupName())
            .append("model", getModel())
            .append("designCapacity", getDesignCapacity())
            .append("plantId", getPlantId())
            .append("plant", getPlant())
            .append("workShopId", getWorkShopId())
            .append("workShop", getWorkShop())
            .append("workCalenderId", getWorkCalenderId())
            .append("delFlag", getDelFlag())
            .append("createBy", getCreateBy())
            .append("createTime", getCreateTime())
            .append("updateBy", getUpdateBy())
            .append("updateTime", getUpdateTime())
            .append("modelId", getModelId())
            .append("workCalender", getWorkCalender())
            .toString();
    }
}

 aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsStandardProcessMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,62 @@
package com.aps.core.mapper;

import com.aps.core.domain.ApsStandardProcess;

import java.util.List;

/**
 * æ ‡å‡†å·¥åºMapper接口
 * 
 * @author hjy
 * @date 2025-04-23
 */
public interface ApsStandardProcessMapper 
{
    /**
     * æŸ¥è¯¢æ ‡å‡†å·¥åº
     * 
     * @param id æ ‡å‡†å·¥åºä¸»é”®
     * @return æ ‡å‡†å·¥åº
     */
    public ApsStandardProcess selectApsStandardProcessById(Long id);

    /**
     * æŸ¥è¯¢æ ‡å‡†å·¥åºåˆ—表
     * 
     * @param apsStandardProcess æ ‡å‡†å·¥åº
     * @return æ ‡å‡†å·¥åºé›†åˆ
     */
    public List<ApsStandardProcess> selectApsStandardProcessList(ApsStandardProcess apsStandardProcess);

    /**
     * æ–°å¢žæ ‡å‡†å·¥åº
     * 
     * @param apsStandardProcess æ ‡å‡†å·¥åº
     * @return ç»“æžœ
     */
    public int insertApsStandardProcess(ApsStandardProcess apsStandardProcess);

    /**
     * ä¿®æ”¹æ ‡å‡†å·¥åº
     * 
     * @param apsStandardProcess æ ‡å‡†å·¥åº
     * @return ç»“æžœ
     */
    public int updateApsStandardProcess(ApsStandardProcess apsStandardProcess);

    /**
     * åˆ é™¤æ ‡å‡†å·¥åº
     * 
     * @param id æ ‡å‡†å·¥åºä¸»é”®
     * @return ç»“æžœ
     */
    public int deleteApsStandardProcessById(Long id);

    /**
     * æ‰¹é‡åˆ é™¤æ ‡å‡†å·¥åº
     * 
     * @param ids éœ€è¦åˆ é™¤çš„数据主键集合
     * @return ç»“æžœ
     */
    public int deleteApsStandardProcessByIds(Long[] ids);
}

 aps-modules/aps-core/src/main/java/com/aps/core/service/IApsStandardProcessService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,62 @@
package com.aps.core.service;

import com.aps.core.domain.ApsStandardProcess;

import java.util.List;

/**
 * æ ‡å‡†å·¥åºService接口
 * 
 * @author hjy
 * @date 2025-04-23
 */
public interface IApsStandardProcessService 
{
    /**
     * æŸ¥è¯¢æ ‡å‡†å·¥åº
     * 
     * @param id æ ‡å‡†å·¥åºä¸»é”®
     * @return æ ‡å‡†å·¥åº
     */
    public ApsStandardProcess selectApsStandardProcessById(Long id);

    /**
     * æŸ¥è¯¢æ ‡å‡†å·¥åºåˆ—表
     * 
     * @param apsStandardProcess æ ‡å‡†å·¥åº
     * @return æ ‡å‡†å·¥åºé›†åˆ
     */
    public List<ApsStandardProcess> selectApsStandardProcessList(ApsStandardProcess apsStandardProcess);

    /**
     * æ–°å¢žæ ‡å‡†å·¥åº
     * 
     * @param apsStandardProcess æ ‡å‡†å·¥åº
     * @return ç»“æžœ
     */
    public int insertApsStandardProcess(ApsStandardProcess apsStandardProcess);

    /**
     * ä¿®æ”¹æ ‡å‡†å·¥åº
     * 
     * @param apsStandardProcess æ ‡å‡†å·¥åº
     * @return ç»“æžœ
     */
    public int updateApsStandardProcess(ApsStandardProcess apsStandardProcess);

    /**
     * æ‰¹é‡åˆ é™¤æ ‡å‡†å·¥åº
     * 
     * @param ids éœ€è¦åˆ é™¤çš„标准工序主键集合
     * @return ç»“æžœ
     */
    public int deleteApsStandardProcessByIds(Long[] ids);

    /**
     * åˆ é™¤æ ‡å‡†å·¥åºä¿¡æ¯
     * 
     * @param id æ ‡å‡†å·¥åºä¸»é”®
     * @return ç»“æžœ
     */
    public int deleteApsStandardProcessById(Long id);
}

 aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsStandardProcessServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,97 @@
package com.aps.core.service.impl;

import com.aps.common.core.utils.DateUtils;
import com.aps.core.domain.ApsStandardProcess;
import com.aps.core.mapper.ApsStandardProcessMapper;
import com.aps.core.service.IApsStandardProcessService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * æ ‡å‡†å·¥åºService业务层处理
 * 
 * @author hjy
 * @date 2025-04-23
 */
@Service
public class ApsStandardProcessServiceImpl implements IApsStandardProcessService 
{
    @Autowired
    private ApsStandardProcessMapper apsStandardProcessMapper;

    /**
     * æŸ¥è¯¢æ ‡å‡†å·¥åº
     * 
     * @param id æ ‡å‡†å·¥åºä¸»é”®
     * @return æ ‡å‡†å·¥åº
     */
    @Override
    public ApsStandardProcess selectApsStandardProcessById(Long id)
    {
        return apsStandardProcessMapper.selectApsStandardProcessById(id);
    }

    /**
     * æŸ¥è¯¢æ ‡å‡†å·¥åºåˆ—表
     * 
     * @param apsStandardProcess æ ‡å‡†å·¥åº
     * @return æ ‡å‡†å·¥åº
     */
    @Override
    public List<ApsStandardProcess> selectApsStandardProcessList(ApsStandardProcess apsStandardProcess)
    {
        return apsStandardProcessMapper.selectApsStandardProcessList(apsStandardProcess);
    }

    /**
     * æ–°å¢žæ ‡å‡†å·¥åº
     * 
     * @param apsStandardProcess æ ‡å‡†å·¥åº
     * @return ç»“æžœ
     */
    @Override
    public int insertApsStandardProcess(ApsStandardProcess apsStandardProcess)
    {
        apsStandardProcess.setCreateTime(DateUtils.getNowDate());
        return apsStandardProcessMapper.insertApsStandardProcess(apsStandardProcess);
    }

    /**
     * ä¿®æ”¹æ ‡å‡†å·¥åº
     * 
     * @param apsStandardProcess æ ‡å‡†å·¥åº
     * @return ç»“æžœ
     */
    @Override
    public int updateApsStandardProcess(ApsStandardProcess apsStandardProcess)
    {
        apsStandardProcess.setUpdateTime(DateUtils.getNowDate());
        return apsStandardProcessMapper.updateApsStandardProcess(apsStandardProcess);
    }

    /**
     * æ‰¹é‡åˆ é™¤æ ‡å‡†å·¥åº
     * 
     * @param ids éœ€è¦åˆ é™¤çš„标准工序主键
     * @return ç»“æžœ
     */
    @Override
    public int deleteApsStandardProcessByIds(Long[] ids)
    {
        return apsStandardProcessMapper.deleteApsStandardProcessByIds(ids);
    }

    /**
     * åˆ é™¤æ ‡å‡†å·¥åºä¿¡æ¯
     * 
     * @param id æ ‡å‡†å·¥åºä¸»é”®
     * @return ç»“æžœ
     */
    @Override
    public int deleteApsStandardProcessById(Long id)
    {
        return apsStandardProcessMapper.deleteApsStandardProcessById(id);
    }
}

 aps-modules/aps-core/src/main/resources/mapper/core/ApsStandardProcessMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,133 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.core.mapper.ApsStandardProcessMapper">
    
    <resultMap type="ApsStandardProcess" id="ApsStandardProcessResult">
        <result property="id"    column="id"    />
        <result property="processNumber"    column="process_number"    />
        <result property="processName"    column="process_name"    />
        <result property="resourceGroupName"    column="resource_group_name"    />
        <result property="model"    column="model"    />
        <result property="designCapacity"    column="design_capacity"    />
        <result property="plantId"    column="plant_id"    />
        <result property="plant"    column="plant"    />
        <result property="workShopId"    column="work_shop_id"    />
        <result property="workShop"    column="work_shop"    />
        <result property="workCalenderId"    column="work_calender_id"    />
        <result property="delFlag"    column="del_flag"    />
        <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="modelId"    column="model_id"    />
        <result property="workCalender"    column="work_calender"    />
    </resultMap>

    <sql id="selectApsStandardProcessVo">
        select id, process_number, process_name, resource_group_name, model, design_capacity, plant_id, plant, work_shop_id, work_shop, work_calender_id, del_flag, create_by, create_time, update_by, update_time, model_id, work_calender from aps_standard_process
    </sql>

    <select id="selectApsStandardProcessList" parameterType="ApsStandardProcess" resultMap="ApsStandardProcessResult">
        <include refid="selectApsStandardProcessVo"/>
        <where>  
            <if test="processNumber != null  and processNumber != ''"> and process_number = #{processNumber}</if>
            <if test="processName != null  and processName != ''"> and process_name like '%' || #{processName} ||  '%'</if>
            <if test="resourceGroupName != null  and resourceGroupName != ''"> and resource_group_name like '%' || #{resourceGroupName} || '%'</if>
            <if test="model != null  and model != ''"> and model = #{model}</if>
            <if test="designCapacity != null  and designCapacity != ''"> and design_capacity = #{designCapacity}</if>
            <if test="plantId != null  and plantId != ''"> and plant_id = #{plantId}</if>
            <if test="plant != null  and plant != ''"> and plant = #{plant}</if>
            <if test="workShopId != null  and workShopId != ''"> and work_shop_id = #{workShopId}</if>
            <if test="workShop != null  and workShop != ''"> and work_shop = #{workShop}</if>
            <if test="workCalenderId != null "> and work_calender_id = #{workCalenderId}</if>
            <if test="modelId != null "> and model_id = #{modelId}</if>
            <if test="workCalender != null  and workCalender != ''"> and work_calender = #{workCalender}</if>
        </where>
    </select>
    
    <select id="selectApsStandardProcessById" parameterType="Long" resultMap="ApsStandardProcessResult">
        <include refid="selectApsStandardProcessVo"/>
        where id = #{id}
    </select>

    <insert id="insertApsStandardProcess" parameterType="ApsStandardProcess">
        insert into aps_standard_process
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">id,</if>
            <if test="processNumber != null">process_number,</if>
            <if test="processName != null">process_name,</if>
            <if test="resourceGroupName != null">resource_group_name,</if>
            <if test="model != null">model,</if>
            <if test="designCapacity != null">design_capacity,</if>
            <if test="plantId != null">plant_id,</if>
            <if test="plant != null">plant,</if>
            <if test="workShopId != null">work_shop_id,</if>
            <if test="workShop != null">work_shop,</if>
            <if test="workCalenderId != null">work_calender_id,</if>
            <if test="delFlag != null">del_flag,</if>
            <if test="createBy != null">create_by,</if>
            <if test="createTime != null">create_time,</if>
            <if test="updateBy != null">update_by,</if>
            <if test="updateTime != null">update_time,</if>
            <if test="modelId != null">model_id,</if>
            <if test="workCalender != null">work_calender,</if>
         </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="id != null">#{id},</if>
            <if test="processNumber != null">#{processNumber},</if>
            <if test="processName != null">#{processName},</if>
            <if test="resourceGroupName != null">#{resourceGroupName},</if>
            <if test="model != null">#{model},</if>
            <if test="designCapacity != null">#{designCapacity},</if>
            <if test="plantId != null">#{plantId},</if>
            <if test="plant != null">#{plant},</if>
            <if test="workShopId != null">#{workShopId},</if>
            <if test="workShop != null">#{workShop},</if>
            <if test="workCalenderId != null">#{workCalenderId},</if>
            <if test="delFlag != null">#{delFlag},</if>
            <if test="createBy != null">#{createBy},</if>
            <if test="createTime != null">#{createTime},</if>
            <if test="updateBy != null">#{updateBy},</if>
            <if test="updateTime != null">#{updateTime},</if>
            <if test="modelId != null">#{modelId},</if>
            <if test="workCalender != null">#{workCalender},</if>
         </trim>
    </insert>

    <update id="updateApsStandardProcess" parameterType="ApsStandardProcess">
        update aps_standard_process
        <trim prefix="SET" suffixOverrides=",">
            <if test="processNumber != null">process_number = #{processNumber},</if>
            <if test="processName != null">process_name = #{processName},</if>
            <if test="resourceGroupName != null">resource_group_name = #{resourceGroupName},</if>
            <if test="model != null">model = #{model},</if>
            <if test="designCapacity != null">design_capacity = #{designCapacity},</if>
            <if test="plantId != null">plant_id = #{plantId},</if>
            <if test="plant != null">plant = #{plant},</if>
            <if test="workShopId != null">work_shop_id = #{workShopId},</if>
            <if test="workShop != null">work_shop = #{workShop},</if>
            <if test="workCalenderId != null">work_calender_id = #{workCalenderId},</if>
            <if test="delFlag != null">del_flag = #{delFlag},</if>
            <if test="createBy != null">create_by = #{createBy},</if>
            <if test="createTime != null">create_time = #{createTime},</if>
            <if test="updateBy != null">update_by = #{updateBy},</if>
            <if test="updateTime != null">update_time = #{updateTime},</if>
            <if test="modelId != null">model_id = #{modelId},</if>
            <if test="workCalender != null">work_calender = #{workCalender},</if>
        </trim>
        where id = #{id}
    </update>

    <delete id="deleteApsStandardProcessById" parameterType="Long">
        delete from aps_standard_process where id = #{id}
    </delete>

    <delete id="deleteApsStandardProcessByIds" parameterType="String">
        delete from aps_standard_process where id in 
        <foreach item="id" collection="array" open="(" separator="," close=")">
            #{id}
        </foreach>
    </delete>
</mapper>