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

zhanghl

2025-05-20 49eee4769a63b0c24d19bd676cdb0eb0df0a6541

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

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

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

import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.aps.core.domain.ApsWeldSeamStandard;
import com.aps.core.service.IApsWeldSeamStandardService;
import com.aps.common.core.web.controller.BaseController;
import com.aps.common.core.web.page.TableDataInfo;

/**
 * ç„Šç¼æ ‡å‡†Controller
 * 
 * @author user
 * @date 2023-11-05
 */
@RestController
@RequestMapping("/weldSeamStandard")
public class ApsWeldSeamStandardController extends BaseController
{
    @Autowired
    private IApsWeldSeamStandardService apsWeldSeamStandardService;

    /**
     * æŸ¥è¯¢ç„Šç¼æ ‡å‡†åˆ—表
     */
    @GetMapping("/list")
    public TableDataInfo list(ApsWeldSeamStandard apsWeldSeamStandard)
    {
        startPage();
        List<ApsWeldSeamStandard> list = apsWeldSeamStandardService.selectApsWeldSeamStandardList(apsWeldSeamStandard);
        return getDataTable(list);
    }
} 

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

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

import com.aps.common.core.annotation.Excel;
import com.aps.common.core.web.domain.BaseEntity;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;

import java.math.BigDecimal;

/**
 * ç„Šç¼æ ‡å‡†å¯¹è±¡ aps_weld_seam_standard
 * 
 * @author user
 * @date 2023-11-05
 */
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class ApsWeldSeamStandard extends BaseEntity
{
    private static final long serialVersionUID = 1L;

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

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

    /** å›¾å· */
    @Excel(name = "图号")
    private String itemFigure;

    /** ç‰ˆæœ¬å· */
    @Excel(name = "版本号")
    private String itemFigureVersion;

    /** å•ä»¶ç„Šç¼æ•°ï¼ˆHup） */
    @Excel(name = "单件焊缝数（Hup）")
    private BigDecimal hupQty;

    /** å•ä»¶ç„Šç¼æ•°ï¼ˆLOD） */
    @Excel(name = "单件焊缝数（LOD）")
    private BigDecimal lodQty;

    /** ç„ŠæŽ¥å½¢å¼(hup\lod) */
    @Excel(name = "焊接形式")
    private String type;

    /** æ˜¯å¦åˆ é™¤(0否，1是) */
    private Integer delFlag;
} 

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

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

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

/**
 * ç„Šç¼æ ‡å‡†Mapper接口
 * 
 * @author user
 * @date 2023-11-05
 */
@Mapper
public interface ApsWeldSeamStandardMapper 
{
    /**
     * æŸ¥è¯¢ç„Šç¼æ ‡å‡†åˆ—表
     * 
     * @param apsWeldSeamStandard ç„Šç¼æ ‡å‡†
     * @return ç„Šç¼æ ‡å‡†é›†åˆ
     */
    public List<ApsWeldSeamStandard> selectApsWeldSeamStandardList(ApsWeldSeamStandard apsWeldSeamStandard);
} 

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

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

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

/**
 * ç„Šç¼æ ‡å‡†Service接口
 * 
 * @author user
 * @date 2023-11-05
 */
public interface IApsWeldSeamStandardService 
{
    /**
     * æŸ¥è¯¢ç„Šç¼æ ‡å‡†åˆ—表
     * 
     * @param apsWeldSeamStandard ç„Šç¼æ ‡å‡†
     * @return ç„Šç¼æ ‡å‡†é›†åˆ
     */
    public List<ApsWeldSeamStandard> selectApsWeldSeamStandardList(ApsWeldSeamStandard apsWeldSeamStandard);
} 

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

@@ -134,6 +134,7 @@
                    planEnd != null) {
                    ApsGasPipelineMo apsGasPipelineMo = new ApsGasPipelineMo();
                    apsGasPipelineMo.setMo(mo);
                    apsGasPipelineMo.setMaterialCode(materialNum);
                    apsGasPipelineMo.setId(IdUtil.getSnowflakeNextId());
                    apsGasPipelineMo.setFactory(factory);
                    apsGasPipelineMo.setCreateBy(SecurityUtils.getUsername());

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

@@ -68,6 +68,8 @@
    @Override
    public int insertApsMaterialProductGroupManagement(ApsMaterialProductGroupManagement apsMaterialProductGroupManagement)
    {
        apsMaterialProductGroupManagement.setId(IdUtil.getSnowflakeNextId());
        apsMaterialProductGroupManagement.setCreateBy(SecurityUtils.getUsername());
        apsMaterialProductGroupManagement.setCreateTime(DateUtils.getNowDate());
        return apsMaterialProductGroupManagementMapper.insertApsMaterialProductGroupManagement(apsMaterialProductGroupManagement);
    }
@@ -82,6 +84,7 @@
    public int updateApsMaterialProductGroupManagement(ApsMaterialProductGroupManagement apsMaterialProductGroupManagement)
    {
        apsMaterialProductGroupManagement.setUpdateTime(DateUtils.getNowDate());
        apsMaterialProductGroupManagement.setUpdateBy(SecurityUtils.getUsername());
        return apsMaterialProductGroupManagementMapper.updateApsMaterialProductGroupManagement(apsMaterialProductGroupManagement);
    }


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

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

import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.aps.core.mapper.ApsWeldSeamStandardMapper;
import com.aps.core.domain.ApsWeldSeamStandard;
import com.aps.core.service.IApsWeldSeamStandardService;

/**
 * ç„Šç¼æ ‡å‡†Service业务层处理
 * 
 * @author user
 * @date 2023-11-05
 */
@Service
public class ApsWeldSeamStandardServiceImpl implements IApsWeldSeamStandardService 
{
    @Autowired
    private ApsWeldSeamStandardMapper apsWeldSeamStandardMapper;

    /**
     * æŸ¥è¯¢ç„Šç¼æ ‡å‡†åˆ—表
     * 
     * @param apsWeldSeamStandard ç„Šç¼æ ‡å‡†
     * @return ç„Šç¼æ ‡å‡†
     */
    @Override
    public List<ApsWeldSeamStandard> selectApsWeldSeamStandardList(ApsWeldSeamStandard apsWeldSeamStandard)
    {
        return apsWeldSeamStandardMapper.selectApsWeldSeamStandardList(apsWeldSeamStandard);
    }
} 

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

@@ -69,8 +69,6 @@
            <if test="factory != null">factory = #{factory},</if>
            <if test="materialCode != null">material_code = #{materialCode},</if>
            <if test="domain != null">domain = #{domain},</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="isMain != null">is_main = #{isMain},</if>

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,34 @@
<?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.ApsWeldSeamStandardMapper">
    
    <resultMap type="com.aps.core.domain.ApsWeldSeamStandard" id="ApsWeldSeamStandardResult">
        <result property="id"    column="id"    />
        <result property="itemCode"    column="item_code"    />
        <result property="itemFigure"    column="item_figure"    />
        <result property="itemFigureVersion"    column="item_figure_version"    />
        <result property="hupQty"    column="hup_qty"    />
        <result property="lodQty"    column="lod_qty"    />
        <result property="type"    column="type"    />
        <result property="delFlag"    column="del_flag"    />
    </resultMap>

    <sql id="selectApsWeldSeamStandardVo">
        select id, item_code, item_figure, item_figure_version, hup_qty, lod_qty, type, del_flag from aps_weld_seam_standard
    </sql>

    <select id="selectApsWeldSeamStandardList" parameterType="com.aps.core.domain.ApsWeldSeamStandard" resultMap="ApsWeldSeamStandardResult">
        <include refid="selectApsWeldSeamStandardVo"/>
        <where>  
            <if test="itemCode != null  and itemCode != ''"> and item_code LIKE '%' || #{itemCode} || '%'</if>
            <if test="itemFigure != null  and itemFigure != ''"> and item_figure = #{itemFigure}</if>
            <if test="itemFigureVersion != null  and itemFigureVersion != ''"> and item_figure_version = #{itemFigureVersion}</if>
            <if test="hupQty != null "> and hup_qty = #{hupQty}</if>
            <if test="lodQty != null "> and lod_qty = #{lodQty}</if>
            <if test="type != null  and type != ''"> and type = #{type}</if>
            and del_flag = 0
        </where>
    </select>
</mapper>