Merge remote-tracking branch 'origin/dev' into dev

zhanghl

2025-04-21 66635aefcff1aa3d9e6cd6210773752414184f14

Merge remote-tracking branch 'origin/dev' into dev

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

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

import com.aps.core.domain.ApsProfessionalFixedCycleManagement;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
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.service.IApsProfessionalFixedCycleManagementService;
import com.aps.common.core.web.controller.BaseController;
import com.aps.common.core.web.domain.AjaxResult;
import com.aps.common.core.utils.poi.ExcelUtil;
import com.aps.common.core.web.page.TableDataInfo;

import java.util.List;

/**
 * ä¸“业固定周期管理Controller
 * 
 * @author ruoyi
 * @date 2025-04-21
 */
@RestController
@RequestMapping("/professionalFixedCycleManagement")
public class ApsProfessionalFixedCycleManagementController extends BaseController
{
    @Autowired
    private IApsProfessionalFixedCycleManagementService apsProfessionalFixedCycleManagementService;

    /**
     * æŸ¥è¯¢ä¸“业固定周期管理列表
     */
    @RequiresPermissions("professionalFixedCycleManagement:professionalFixedCycleManagement:list")
    @GetMapping("/list")
    public TableDataInfo list(ApsProfessionalFixedCycleManagement apsProfessionalFixedCycleManagement)
    {
        startPage();
        List<ApsProfessionalFixedCycleManagement> list = apsProfessionalFixedCycleManagementService.selectApsProfessionalFixedCycleManagementList(apsProfessionalFixedCycleManagement);
        return getDataTable(list);
    }

    /**
     * å¯¼å‡ºä¸“业固定周期管理列表
     */
    @RequiresPermissions("professionalFixedCycleManagement:professionalFixedCycleManagement:export")
    @Log(title = "专业固定周期管理", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, ApsProfessionalFixedCycleManagement apsProfessionalFixedCycleManagement)
    {
        List<ApsProfessionalFixedCycleManagement> list = apsProfessionalFixedCycleManagementService.selectApsProfessionalFixedCycleManagementList(apsProfessionalFixedCycleManagement);
        ExcelUtil<ApsProfessionalFixedCycleManagement> util = new ExcelUtil<ApsProfessionalFixedCycleManagement>(ApsProfessionalFixedCycleManagement.class);
        util.exportExcel(response, list, "专业固定周期管理数据");
    }

    /**
     * èŽ·å–专业固定周期管理详细信息
     */
    @RequiresPermissions("professionalFixedCycleManagement:professionalFixedCycleManagement:query")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") String id)
    {
        return success(apsProfessionalFixedCycleManagementService.selectApsProfessionalFixedCycleManagementById(id));
    }

    /**
     * æ–°å¢žä¸“业固定周期管理
     */
    @RequiresPermissions("professionalFixedCycleManagement:professionalFixedCycleManagement:add")
    @Log(title = "专业固定周期管理", businessType = BusinessType.INSERT)
    @PostMapping
    public AjaxResult add(@RequestBody ApsProfessionalFixedCycleManagement apsProfessionalFixedCycleManagement)
    {
        return toAjax(apsProfessionalFixedCycleManagementService.insertApsProfessionalFixedCycleManagement(apsProfessionalFixedCycleManagement));
    }

    /**
     * ä¿®æ”¹ä¸“业固定周期管理
     */
    @RequiresPermissions("professionalFixedCycleManagement:professionalFixedCycleManagement:edit")
    @Log(title = "专业固定周期管理", businessType = BusinessType.UPDATE)
    @PutMapping
    public AjaxResult edit(@RequestBody ApsProfessionalFixedCycleManagement apsProfessionalFixedCycleManagement)
    {
        return toAjax(apsProfessionalFixedCycleManagementService.updateApsProfessionalFixedCycleManagement(apsProfessionalFixedCycleManagement));
    }

    /**
     * åˆ é™¤ä¸“业固定周期管理
     */
    @RequiresPermissions("professionalFixedCycleManagement:professionalFixedCycleManagement:remove")
    @Log(title = "专业固定周期管理", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable String[] ids)
    {
        return toAjax(apsProfessionalFixedCycleManagementService.deleteApsProfessionalFixedCycleManagementByIds(ids));
    }
}

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

@@ -1,5 +1,6 @@
package com.aps.core.domain;

import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -50,7 +51,7 @@

    /** æœ€æ—©å¯æå‰ç”Ÿäº§å¤©æ•° */
    @Excel(name = "最早可提前生产天数")
    private String advanceProductionDays;
    private BigDecimal advanceProductionDays;

    /** æ‹†åˆ†æ‰¹é‡ */
    @Excel(name = "拆分批量")
@@ -163,12 +164,12 @@
        return versionNumber;
    }

    public void setAdvanceProductionDays(String advanceProductionDays) 
    public void setAdvanceProductionDays(BigDecimal advanceProductionDays)
    {
        this.advanceProductionDays = advanceProductionDays;
    }

    public String getAdvanceProductionDays() 
    public BigDecimal getAdvanceProductionDays()
    {
        return advanceProductionDays;
    }

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

@@ -1,5 +1,6 @@
package com.aps.core.domain;

import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -26,7 +27,7 @@

    /** æ•°é‡ */
    @Excel(name = "数量")
    private Long num;
    private BigDecimal num;

    /** é€‚用工厂 */
    @Excel(name = "适用工厂")
@@ -61,12 +62,12 @@
        return itemNumber;
    }

    public void setNum(Long num) 
    public void setNum(BigDecimal num)
    {
        this.num = num;
    }

    public Long getNum() 
    public BigDecimal getNum()
    {
        return num;
    }

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

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

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

import java.util.Date;

/**
 * ä¸“业固定周期管理对象 aps_professional_fixed_cycle_management
 * 
 * @author ruoyi
 * @date 2025-04-21
 */
public class ApsProfessionalFixedCycleManagement extends BaseEntity
{
    private static final long serialVersionUID = 1L;

    /** id */
    private String id;

    /** æ–™å· */
    @Excel(name = "料号")
    private String itemNumber;

    /** ä¸“业描述 */
    @Excel(name = "专业描述")
    private String professionalDescription;

    /** ä¸“业 */
    @Excel(name = "专业")
    private String professional;

    /** ä¸“业固定周期 */
    @Excel(name = "专业固定周期")
    private String professionalFixedCycle;

    /** é›†æˆæ—¥æœŸ */
    @Excel(name = "集成日期")
    private Date integrationDate;

    /** é€‚用工厂 */
    @Excel(name = "适用工厂")
    private String applicableFactories;

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

    public String getId() 
    {
        return id;
    }

    public void setItemNumber(String itemNumber) 
    {
        this.itemNumber = itemNumber;
    }

    public String getItemNumber() 
    {
        return itemNumber;
    }

    public void setProfessionalDescription(String professionalDescription) 
    {
        this.professionalDescription = professionalDescription;
    }

    public String getProfessionalDescription() 
    {
        return professionalDescription;
    }

    public void setProfessional(String professional) 
    {
        this.professional = professional;
    }

    public String getProfessional() 
    {
        return professional;
    }

    public void setProfessionalFixedCycle(String professionalFixedCycle) 
    {
        this.professionalFixedCycle = professionalFixedCycle;
    }

    public String getProfessionalFixedCycle() 
    {
        return professionalFixedCycle;
    }

    public void setIntegrationDate(Date integrationDate)
    {
        this.integrationDate = integrationDate;
    }

    public Date getIntegrationDate()
    {
        return integrationDate;
    }

    public void setApplicableFactories(String applicableFactories) 
    {
        this.applicableFactories = applicableFactories;
    }

    public String getApplicableFactories() 
    {
        return applicableFactories;
    }

    @Override
    public String toString() {
        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
            .append("id", getId())
            .append("itemNumber", getItemNumber())
            .append("professionalDescription", getProfessionalDescription())
            .append("professional", getProfessional())
            .append("professionalFixedCycle", getProfessionalFixedCycle())
            .append("integrationDate", getIntegrationDate())
            .append("applicableFactories", getApplicableFactories())
            .append("createBy", getCreateBy())
            .append("createTime", getCreateTime())
            .append("updateBy", getUpdateBy())
            .append("updateTime", getUpdateTime())
            .toString();
    }
}

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

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

import java.util.List;
import com.aps.core.domain.ApsProfessionalFixedCycleManagement;
import org.apache.ibatis.annotations.Mapper;

/**
 * ä¸“业固定周期管理Mapper接口
 * 
 * @author ruoyi
 * @date 2025-04-21
 */
@Mapper
public interface ApsProfessionalFixedCycleManagementMapper 
{
    /**
     * æŸ¥è¯¢ä¸“业固定周期管理
     * 
     * @param id ä¸“业固定周期管理主键
     * @return ä¸“业固定周期管理
     */
    public ApsProfessionalFixedCycleManagement selectApsProfessionalFixedCycleManagementById(String id);

    /**
     * æŸ¥è¯¢ä¸“业固定周期管理列表
     * 
     * @param apsProfessionalFixedCycleManagement ä¸“业固定周期管理
     * @return ä¸“业固定周期管理集合
     */
    public List<ApsProfessionalFixedCycleManagement> selectApsProfessionalFixedCycleManagementList(ApsProfessionalFixedCycleManagement apsProfessionalFixedCycleManagement);

    /**
     * æ–°å¢žä¸“业固定周期管理
     * 
     * @param apsProfessionalFixedCycleManagement ä¸“业固定周期管理
     * @return ç»“æžœ
     */
    public int insertApsProfessionalFixedCycleManagement(ApsProfessionalFixedCycleManagement apsProfessionalFixedCycleManagement);

    /**
     * ä¿®æ”¹ä¸“业固定周期管理
     * 
     * @param apsProfessionalFixedCycleManagement ä¸“业固定周期管理
     * @return ç»“æžœ
     */
    public int updateApsProfessionalFixedCycleManagement(ApsProfessionalFixedCycleManagement apsProfessionalFixedCycleManagement);

    /**
     * åˆ é™¤ä¸“业固定周期管理
     * 
     * @param id ä¸“业固定周期管理主键
     * @return ç»“æžœ
     */
    public int deleteApsProfessionalFixedCycleManagementById(String id);

    /**
     * æ‰¹é‡åˆ é™¤ä¸“业固定周期管理
     * 
     * @param ids éœ€è¦åˆ é™¤çš„数据主键集合
     * @return ç»“æžœ
     */
    public int deleteApsProfessionalFixedCycleManagementByIds(String[] ids);
}

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

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

import java.util.List;
import com.aps.core.domain.ApsProfessionalFixedCycleManagement;

/**
 * ä¸“业固定周期管理Service接口
 * 
 * @author ruoyi
 * @date 2025-04-21
 */
public interface IApsProfessionalFixedCycleManagementService 
{
    /**
     * æŸ¥è¯¢ä¸“业固定周期管理
     * 
     * @param id ä¸“业固定周期管理主键
     * @return ä¸“业固定周期管理
     */
    public ApsProfessionalFixedCycleManagement selectApsProfessionalFixedCycleManagementById(String id);

    /**
     * æŸ¥è¯¢ä¸“业固定周期管理列表
     * 
     * @param apsProfessionalFixedCycleManagement ä¸“业固定周期管理
     * @return ä¸“业固定周期管理集合
     */
    public List<ApsProfessionalFixedCycleManagement> selectApsProfessionalFixedCycleManagementList(ApsProfessionalFixedCycleManagement apsProfessionalFixedCycleManagement);

    /**
     * æ–°å¢žä¸“业固定周期管理
     * 
     * @param apsProfessionalFixedCycleManagement ä¸“业固定周期管理
     * @return ç»“æžœ
     */
    public int insertApsProfessionalFixedCycleManagement(ApsProfessionalFixedCycleManagement apsProfessionalFixedCycleManagement);

    /**
     * ä¿®æ”¹ä¸“业固定周期管理
     * 
     * @param apsProfessionalFixedCycleManagement ä¸“业固定周期管理
     * @return ç»“æžœ
     */
    public int updateApsProfessionalFixedCycleManagement(ApsProfessionalFixedCycleManagement apsProfessionalFixedCycleManagement);

    /**
     * æ‰¹é‡åˆ é™¤ä¸“业固定周期管理
     * 
     * @param ids éœ€è¦åˆ é™¤çš„专业固定周期管理主键集合
     * @return ç»“æžœ
     */
    public int deleteApsProfessionalFixedCycleManagementByIds(String[] ids);

    /**
     * åˆ é™¤ä¸“业固定周期管理信息
     * 
     * @param id ä¸“业固定周期管理主键
     * @return ç»“æžœ
     */
    public int deleteApsProfessionalFixedCycleManagementById(String id);
}

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

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

import java.util.List;
import com.aps.common.core.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.aps.core.mapper.ApsProfessionalFixedCycleManagementMapper;
import com.aps.core.domain.ApsProfessionalFixedCycleManagement;
import com.aps.core.service.IApsProfessionalFixedCycleManagementService;

/**
 * ä¸“业固定周期管理Service业务层处理
 * 
 * @author ruoyi
 * @date 2025-04-21
 */
@Service
public class ApsProfessionalFixedCycleManagementServiceImpl implements IApsProfessionalFixedCycleManagementService 
{
    @Autowired
    private ApsProfessionalFixedCycleManagementMapper apsProfessionalFixedCycleManagementMapper;

    /**
     * æŸ¥è¯¢ä¸“业固定周期管理
     * 
     * @param id ä¸“业固定周期管理主键
     * @return ä¸“业固定周期管理
     */
    @Override
    public ApsProfessionalFixedCycleManagement selectApsProfessionalFixedCycleManagementById(String id)
    {
        return apsProfessionalFixedCycleManagementMapper.selectApsProfessionalFixedCycleManagementById(id);
    }

    /**
     * æŸ¥è¯¢ä¸“业固定周期管理列表
     * 
     * @param apsProfessionalFixedCycleManagement ä¸“业固定周期管理
     * @return ä¸“业固定周期管理
     */
    @Override
    public List<ApsProfessionalFixedCycleManagement> selectApsProfessionalFixedCycleManagementList(ApsProfessionalFixedCycleManagement apsProfessionalFixedCycleManagement)
    {
        return apsProfessionalFixedCycleManagementMapper.selectApsProfessionalFixedCycleManagementList(apsProfessionalFixedCycleManagement);
    }

    /**
     * æ–°å¢žä¸“业固定周期管理
     * 
     * @param apsProfessionalFixedCycleManagement ä¸“业固定周期管理
     * @return ç»“æžœ
     */
    @Override
    public int insertApsProfessionalFixedCycleManagement(ApsProfessionalFixedCycleManagement apsProfessionalFixedCycleManagement)
    {
        apsProfessionalFixedCycleManagement.setCreateTime(DateUtils.getNowDate());
        return apsProfessionalFixedCycleManagementMapper.insertApsProfessionalFixedCycleManagement(apsProfessionalFixedCycleManagement);
    }

    /**
     * ä¿®æ”¹ä¸“业固定周期管理
     * 
     * @param apsProfessionalFixedCycleManagement ä¸“业固定周期管理
     * @return ç»“æžœ
     */
    @Override
    public int updateApsProfessionalFixedCycleManagement(ApsProfessionalFixedCycleManagement apsProfessionalFixedCycleManagement)
    {
        apsProfessionalFixedCycleManagement.setUpdateTime(DateUtils.getNowDate());
        return apsProfessionalFixedCycleManagementMapper.updateApsProfessionalFixedCycleManagement(apsProfessionalFixedCycleManagement);
    }

    /**
     * æ‰¹é‡åˆ é™¤ä¸“业固定周期管理
     * 
     * @param ids éœ€è¦åˆ é™¤çš„专业固定周期管理主键
     * @return ç»“æžœ
     */
    @Override
    public int deleteApsProfessionalFixedCycleManagementByIds(String[] ids)
    {
        return apsProfessionalFixedCycleManagementMapper.deleteApsProfessionalFixedCycleManagementByIds(ids);
    }

    /**
     * åˆ é™¤ä¸“业固定周期管理信息
     * 
     * @param id ä¸“业固定周期管理主键
     * @return ç»“æžœ
     */
    @Override
    public int deleteApsProfessionalFixedCycleManagementById(String id)
    {
        return apsProfessionalFixedCycleManagementMapper.deleteApsProfessionalFixedCycleManagementById(id);
    }
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,94 @@
<?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.ApsProfessionalFixedCycleManagementMapper">
    
    <resultMap type="ApsProfessionalFixedCycleManagement" id="ApsProfessionalFixedCycleManagementResult">
        <result property="id"    column="id"    />
        <result property="itemNumber"    column="item_number"    />
        <result property="professionalDescription"    column="professional_description"    />
        <result property="professional"    column="professional"    />
        <result property="professionalFixedCycle"    column="professional_fixed_cycle"    />
        <result property="integrationDate"    column="integration_date"    />
        <result property="applicableFactories"    column="applicable_factories"    />
        <result property="createBy"    column="create_by"    />
        <result property="createTime"    column="create_time"    />
        <result property="updateBy"    column="update_by"    />
        <result property="updateTime"    column="update_time"    />
    </resultMap>

    <sql id="selectApsProfessionalFixedCycleManagementVo">
        select id, item_number, professional_description, professional, professional_fixed_cycle, integration_date, applicable_factories, create_by, create_time, update_by, update_time from aps_professional_fixed_cycle_management
    </sql>

    <select id="selectApsProfessionalFixedCycleManagementList" parameterType="ApsProfessionalFixedCycleManagement" resultMap="ApsProfessionalFixedCycleManagementResult">
        <include refid="selectApsProfessionalFixedCycleManagementVo"/>
        <where>  
            <if test="itemNumber != null  and itemNumber != ''"> and item_number = #{itemNumber}</if>
        </where>
    </select>
    
    <select id="selectApsProfessionalFixedCycleManagementById" parameterType="String" resultMap="ApsProfessionalFixedCycleManagementResult">
        <include refid="selectApsProfessionalFixedCycleManagementVo"/>
        where id = #{id}
    </select>

    <insert id="insertApsProfessionalFixedCycleManagement" parameterType="ApsProfessionalFixedCycleManagement">
        insert into aps_professional_fixed_cycle_management
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">id,</if>
            <if test="itemNumber != null">item_number,</if>
            <if test="professionalDescription != null">professional_description,</if>
            <if test="professional != null">professional,</if>
            <if test="professionalFixedCycle != null">professional_fixed_cycle,</if>
            <if test="integrationDate != null">integration_date,</if>
            <if test="applicableFactories != null">applicable_factories,</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>
         </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="id != null">#{id},</if>
            <if test="itemNumber != null">#{itemNumber},</if>
            <if test="professionalDescription != null">#{professionalDescription},</if>
            <if test="professional != null">#{professional},</if>
            <if test="professionalFixedCycle != null">#{professionalFixedCycle},</if>
            <if test="integrationDate != null">#{integrationDate},</if>
            <if test="applicableFactories != null">#{applicableFactories},</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>
         </trim>
    </insert>

    <update id="updateApsProfessionalFixedCycleManagement" parameterType="ApsProfessionalFixedCycleManagement">
        update aps_professional_fixed_cycle_management
        <trim prefix="SET" suffixOverrides=",">
            <if test="itemNumber != null">item_number = #{itemNumber},</if>
            <if test="professionalDescription != null">professional_description = #{professionalDescription},</if>
            <if test="professional != null">professional = #{professional},</if>
            <if test="professionalFixedCycle != null">professional_fixed_cycle = #{professionalFixedCycle},</if>
            <if test="integrationDate != null">integration_date = #{integrationDate},</if>
            <if test="applicableFactories != null">applicable_factories = #{applicableFactories},</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>
        </trim>
        where id = #{id}
    </update>

    <delete id="deleteApsProfessionalFixedCycleManagementById" parameterType="String">
        delete from aps_professional_fixed_cycle_management where id = #{id}
    </delete>

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