From 15fbf58a52b504f919d72189bdd87fc5c42de374 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期五, 25 四月 2025 21:46:28 +0800
Subject: [PATCH] 气体管理 增加 planType
---
aps-modules/aps-core/src/main/resources/bootstrap-int.yml | 4 +++-
aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipingPlanMapper.xml | 15 +++++++++++++--
aps-modules/aps-core/src/main/resources/bootstrap.yml | 2 +-
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipingPlan.java | 10 ++++++++++
4 files changed, 27 insertions(+), 4 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipingPlan.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipingPlan.java
index 9eec44c..cb82baa 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipingPlan.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipingPlan.java
@@ -161,6 +161,16 @@
@Excel(name = "椋庨櫓鏍囪瘑")
private Integer hasRisk;
+ public String getPlanType() {
+ return planType;
+ }
+
+ public void setPlanType(String planType) {
+ this.planType = planType;
+ }
+
+ private String planType;
+
public void setId(String id)
{
this.id = id;
diff --git a/aps-modules/aps-core/src/main/resources/bootstrap-int.yml b/aps-modules/aps-core/src/main/resources/bootstrap-int.yml
index 069ef63..1eea307 100644
--- a/aps-modules/aps-core/src/main/resources/bootstrap-int.yml
+++ b/aps-modules/aps-core/src/main/resources/bootstrap-int.yml
@@ -7,7 +7,9 @@
server-addr: 192.168.50.160:8848
namespace: aafcd57a-d0f7-43e3-a77d-1dc85aec1f0e
metadata:
- local: int
+ local: zhl
+
+ ip: 192.168.50.13
config:
# 閰嶇疆涓績鍦板潃
server-addr: 192.168.50.160:8848
diff --git a/aps-modules/aps-core/src/main/resources/bootstrap.yml b/aps-modules/aps-core/src/main/resources/bootstrap.yml
index 0df0b3e..662ab5d 100644
--- a/aps-modules/aps-core/src/main/resources/bootstrap.yml
+++ b/aps-modules/aps-core/src/main/resources/bootstrap.yml
@@ -9,4 +9,4 @@
name: aps-core
profiles:
# 鐜閰嶇疆
- active: dev
\ No newline at end of file
+ active: int
\ No newline at end of file
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipingPlanMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipingPlanMapper.xml
index 537e360..0955f47 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipingPlanMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipingPlanMapper.xml
@@ -40,10 +40,18 @@
<result property="isStockComplete" column="is_stock_complete" />
<result property="hasTurnback" column="has_turnback" />
<result property="hasRisk" column="has_risk" />
+ <result property="planType" column="plan_type" />
</resultMap>
<sql id="selectApsGasPipingPlanVo">
- select id, master_planner, week_day, week_cycle, main_part_number, main_part_drawing_number, customer, business_type, document_number, requirement_type, document_status, item_number, drawing_no, version_number, production_quantity, good_products_quantity, process_number, work_center, department, plan_start_day, plan_end_day, standby_number, standby_name, standby_stock, next_process_deparment, is_suspended, is_outsourcing, account, advanced_materials, advanced_document_number, advanced_requirement_day, is_plan_complete, is_stock_complete, has_turnback, has_risk from aps_gas_piping_plan
+ select id, master_planner, week_day, week_cycle, main_part_number, main_part_drawing_number, customer,
+ business_type, document_number, requirement_type, document_status, item_number, drawing_no,
+ version_number, production_quantity, good_products_quantity, process_number, work_center,
+ department, plan_start_day, plan_end_day, standby_number, standby_name, standby_stock,
+ next_process_deparment, is_suspended, is_outsourcing, account, advanced_materials,
+ advanced_document_number, advanced_requirement_day, is_plan_complete, is_stock_complete,
+ has_turnback, has_risk ,plan_type
+ from aps_gas_piping_plan
</sql>
<select id="selectApsGasPipingPlanList" parameterType="ApsGasPipingPlan" resultMap="ApsGasPipingPlanResult">
@@ -79,7 +87,7 @@
<if test="isStockComplete != null "> and is_stock_complete = #{isStockComplete}</if>
<if test="hasTurnback != null "> and has_turnback = #{hasTurnback}</if>
<if test="hasRisk != null "> and has_risk = #{hasRisk}</if>
-
+ <if test="planType != null "> and plan_type = #{planType}</if>
and del_flag ='0'
</where>
</select>
@@ -127,6 +135,7 @@
<if test="isStockComplete != null">is_stock_complete,</if>
<if test="hasTurnback != null">has_turnback,</if>
<if test="hasRisk != null">has_risk,</if>
+ <if test="planType != null">plan_type,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null and id != ''">#{id},</if>
@@ -164,6 +173,7 @@
<if test="isStockComplete != null">#{isStockComplete},</if>
<if test="hasTurnback != null">#{hasTurnback},</if>
<if test="hasRisk != null">#{hasRisk},</if>
+ <if test="planType != null">#{planType},</if>
</trim>
</insert>
@@ -204,6 +214,7 @@
<if test="isStockComplete != null">is_stock_complete = #{isStockComplete},</if>
<if test="hasTurnback != null">has_turnback = #{hasTurnback},</if>
<if test="hasRisk != null">has_risk = #{hasRisk},</if>
+ <if test="planType != null">plan_type = #{planType},</if>
</trim>
where id = #{id}
</update>
--
Gitblit v1.9.3