From a080d67b9964cd632f52c481c0f20ef2e3e7073a Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期五, 09 五月 2025 10:19:07 +0800
Subject: [PATCH] 放开权限
---
aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipingPlanMapper.xml | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
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 6273868..2dfe64a 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
@@ -41,6 +41,8 @@
<result property="hasTurnback" column="has_turnback" />
<result property="hasRisk" column="has_risk" />
<result property="planType" column="plan_type" />
+ <result property="opStatus" column="op_status" />
+ <result property="nextOpName" column="next_op_name" />
<!-- <collection property="apsProcessRoutes" javaType="java.util.ArrayList" ofType="com.aps.core.domain.ApsProcessRoute">-->
<!-- <result property="id" column="id" />-->
<!-- <result property="itemNo" column="item_no" />-->
@@ -75,10 +77,13 @@
<result property="productionQuantity" column="production_quantity" />
<result property="processNumber" column="process_number" />
<result property="planType" column="plan_type" />
+ <result property="planEndDay" column="plan_end_day" />
+ <result property="stdOp" column="std_op" />
<collection property="apsProcessRoutes" javaType="java.util.ArrayList" ofType="com.aps.core.domain.ApsProcessRoute">
<result property="processNumber" column="process_number_sub" />
<result property="processName" column="process_name" />
<result property="processPlanStartDay" column="process_plan_start_day" />
+ <result property="processPlanEndDay" column="process_plan_end_day" />
<result property="standardTime" column="standard_time" />
</collection>
</resultMap>
@@ -90,7 +95,7 @@
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
+ has_turnback, has_risk ,plan_type, op_status, next_op_name
from aps_gas_piping_plan
</sql>
@@ -128,6 +133,8 @@
<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>
+ <if test="opStatus != null "> and op_status = #{opStatus}</if>
+ <if test="nextOpName != null "> and next_op_name = #{nextOpName}</if>
and del_flag ='0'
</where>
</select>
@@ -176,6 +183,8 @@
<if test="hasTurnback != null">has_turnback,</if>
<if test="hasRisk != null">has_risk,</if>
<if test="planType != null">plan_type,</if>
+ <if test="opStatus != null">op_status,</if>
+ <if test="nextOpName != null">next_op_name,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null and id != ''">#{id},</if>
@@ -214,6 +223,8 @@
<if test="hasTurnback != null">#{hasTurnback},</if>
<if test="hasRisk != null">#{hasRisk},</if>
<if test="planType != null">#{planType},</if>
+ <if test="opStatus != null">#{opStatus},</if>
+ <if test="nextOpName != null">#{nextOpName},</if>
</trim>
</insert>
@@ -255,6 +266,8 @@
<if test="hasTurnback != null">has_turnback = #{hasTurnback},</if>
<if test="hasRisk != null">has_risk = #{hasRisk},</if>
<if test="planType != null">plan_type = #{planType},</if>
+ <if test="opStatus != null">op_status = #{opStatus},</if>
+ <if test="nextOpName != null">next_op_name = #{nextOpName},</if>
</trim>
where id = #{id}
</update>
@@ -275,9 +288,9 @@
</update>
<select id="selectApsGasPipingPlanWithProcess" parameterType="ApsGasPipingPlan" resultMap="ApsGasPipingPlanResultWithProcess">
- select c.* from (select a.document_number,a.item_number,a.process_number,a.production_quantity,a.plan_type,b.process_name,b.process_number as process_number_sub,b.standard_time,b.process_plan_start_day from aps_gas_piping_plan a
- left join aps_process_route b on a.document_number = b.work_order_no
- where a.document_status in ('0','1','2','4') and b.process_plan_start_day is not null ORDER BY a.document_number,b.process_number) c GROUP BY c.document_number,c.item_number,c.process_number,c.production_quantity,c.process_name,c.process_number_sub,c.standard_time,c.process_plan_start_day,c.plan_type
+ select c.* from (select a.document_number,a.item_number,a.process_number,a.production_quantity,a.plan_type,a.plan_end_day,a.std_op,b.process_name,b.process_number as process_number_sub,b.standard_time,b.process_plan_start_day,b.process_plan_end_day from aps_gas_piping_plan a
+ left join aps_process_route b on a.document_number = b.work_order_no
+ where a.document_status in ('0','1','2','4') and a.op_status!='瀹屽伐' and b.process_plan_start_day is not null and b.process_name in(select process_name from aps_standard_process where major='姘旀煖' or major='绠¤矾') ORDER BY a.document_number,b.process_number) c GROUP BY c.document_number,c.item_number,c.process_number,c.production_quantity,c.process_name,c.process_number_sub,c.standard_time,c.process_plan_start_day,c.plan_type,c.process_plan_end_day,c.plan_end_day,c.std_op
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3