From 49eee4769a63b0c24d19bd676cdb0eb0df0a6541 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期二, 20 五月 2025 18:32:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsWeldSeamStandardMapper.java | 23 +++++
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsMaterialProductGroupManagementServiceImpl.java | 3
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsWeldSeamStandardServiceImpl.java | 33 ++++++++
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsWeldSeamStandard.java | 55 +++++++++++++
aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamStandardMapper.xml | 34 ++++++++
aps-modules/aps-core/src/main/java/com/aps/core/service/IApsWeldSeamStandardService.java | 21 +++++
aps-modules/aps-core/src/main/resources/mapper/core/ApsMaterialProductGroupManagementMapper.xml | 2
aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsWeldSeamStandardController.java | 36 +++++++++
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipelineMoServiceImpl.java | 1
9 files changed, 206 insertions(+), 2 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsWeldSeamStandardController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsWeldSeamStandardController.java
new file mode 100644
index 0000000..2bbea33
--- /dev/null
+++ b/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);
+ }
+}
\ No newline at end of file
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsWeldSeamStandard.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsWeldSeamStandard.java
new file mode 100644
index 0000000..fb3e055
--- /dev/null
+++ b/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;
+}
\ No newline at end of file
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsWeldSeamStandardMapper.java b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsWeldSeamStandardMapper.java
new file mode 100644
index 0000000..190b85b
--- /dev/null
+++ b/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);
+}
\ No newline at end of file
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsWeldSeamStandardService.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsWeldSeamStandardService.java
new file mode 100644
index 0000000..927b997
--- /dev/null
+++ b/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);
+}
\ No newline at end of file
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipelineMoServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipelineMoServiceImpl.java
index 41d23c6..d714577 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipelineMoServiceImpl.java
+++ b/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());
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsMaterialProductGroupManagementServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsMaterialProductGroupManagementServiceImpl.java
index 84aab1d..5a9c0e1 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsMaterialProductGroupManagementServiceImpl.java
+++ b/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);
}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsWeldSeamStandardServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsWeldSeamStandardServiceImpl.java
new file mode 100644
index 0000000..0c29784
--- /dev/null
+++ b/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);
+ }
+}
\ No newline at end of file
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsMaterialProductGroupManagementMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsMaterialProductGroupManagementMapper.xml
index 37b7ace..73a5bd1 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsMaterialProductGroupManagementMapper.xml
+++ b/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>
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamStandardMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamStandardMapper.xml
new file mode 100644
index 0000000..bf80750
--- /dev/null
+++ b/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>
\ No newline at end of file
--
Gitblit v1.9.3