wenwj
2025-04-14 f095619e00f149b538e8cdafa16513a7a70c6b47
工艺路线工序序号调整
已修改5个文件
26 ■■■■■ 文件已修改
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsProcessRoute.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsProcessRouteTemp.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsWeldSeamMapper.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsWeldSeamServiceImpl.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamMapper.xml 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsProcessRoute.java
@@ -30,7 +30,7 @@
    /** 工序序号 */
    @Excel(name = "工序序号")
    private Long processNumber;
    private String processNumber;
    /** 工序名称 */
    @Excel(name = "工序名称")
@@ -101,12 +101,12 @@
        return workOrderNo;
    }
    public void setProcessNumber(Long processNumber)
    public void setProcessNumber(String processNumber)
    {
        this.processNumber = processNumber;
    }
    public Long getProcessNumber()
    public String getProcessNumber()
    {
        return processNumber;
    }
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsProcessRouteTemp.java
@@ -30,7 +30,7 @@
    /** 工序序号 */
    @Excel(name = "工序序号")
    private Long processNumber;
    private String processNumber;
    /** 工序名称 */
    @Excel(name = "工序名称")
@@ -105,12 +105,12 @@
        return workOrderNo;
    }
    public void setProcessNumber(Long processNumber)
    public void setProcessNumber(String processNumber)
    {
        this.processNumber = processNumber;
    }
    public Long getProcessNumber()
    public String getProcessNumber()
    {
        return processNumber;
    }
aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsWeldSeamMapper.java
@@ -2,6 +2,8 @@
import java.util.List;
import com.aps.core.domain.ApsWeldSeam;
import com.aps.core.domain.ApsWeldSeamStatistics;
import com.aps.core.domain.ApsWeldSeamTemp;
import org.apache.ibatis.annotations.Mapper;
/**
@@ -67,4 +69,6 @@
     * @return 结果
     */
    public int deleteApsWeldSeamByIds(String[] ids);
    List<ApsWeldSeamStatistics> weldSeamStat(List<ApsWeldSeamTemp> apsWeldSeamTemps);
}
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsWeldSeamServiceImpl.java
@@ -5,15 +5,12 @@
import com.aps.common.core.utils.DateUtils;
import com.aps.common.core.utils.StringUtils;
import com.aps.common.core.utils.uuid.IdUtils;
import com.aps.core.domain.ApsPartPlan;
import com.aps.core.domain.ApsPartPlanTemp;
import com.aps.core.domain.ApsWeldSeamTemp;
import com.aps.core.domain.*;
import com.aps.core.mapper.ApsWeldSeamTempMapper;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.aps.core.mapper.ApsWeldSeamMapper;
import com.aps.core.domain.ApsWeldSeam;
import com.aps.core.service.IApsWeldSeamService;
import org.springframework.transaction.annotation.Transactional;
@@ -133,6 +130,8 @@
        if (count==apsWeldSeamTemps.size()) {
            apsWeldSeamTempMapper.deleteApsWeldSeamTempByIds(ids);
        }
        //插入焊缝统计表
        List<ApsWeldSeamStatistics> apsWeldSeamStatistics=apsWeldSeamMapper.weldSeamStat(apsWeldSeamTemps);
        return 1;
    }
}
aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamMapper.xml
@@ -153,4 +153,7 @@
            #{id}
        </foreach>
    </delete>
    <select id="weldSeamStat" >
    </select>
</mapper>