From 4afa387b237899d5f841a3070d04739772c22551 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 30 五月 2025 11:17:47 +0800
Subject: [PATCH] 规范二维码生成
---
pms-parent/pms-global/src/main/resources/mapper/PrAssemblyPlanMapper.xml | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/pms-parent/pms-global/src/main/resources/mapper/PrAssemblyPlanMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/PrAssemblyPlanMapper.xml
index 0fbe098..7c0bbe5 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/PrAssemblyPlanMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/PrAssemblyPlanMapper.xml
@@ -236,8 +236,8 @@
from pr_assembly_plan
where id = #{id,jdbcType=BIGINT}
</delete>
- <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPr.PrAssemblyPlan"
- useGeneratedKeys="true">
+ <insert id="insert" parameterType="com.dy.pmsGlobal.pojoPr.PrAssemblyPlan"
+ >
insert into pr_assembly_plan
( id,order_id, pro_id, batch_id
, process_id, name, number
@@ -251,8 +251,8 @@
, #{deleted,jdbcType=TINYINT}, #{content,jdbcType=VARCHAR}, #{inputNumber,jdbcType=INTEGER}
, #{outputNumber,jdbcType=INTEGER})
</insert>
- <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPr.PrAssemblyPlan"
- useGeneratedKeys="true">
+ <insert id="insertSelective" parameterType="com.dy.pmsGlobal.pojoPr.PrAssemblyPlan"
+ >
insert into pr_assembly_plan
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
@@ -423,12 +423,18 @@
</select>
<select id="selectByPlanName" resultType="cn.hutool.json.JSONObject">
- select ap.id planId,ap.name planName,ap.`status`,pn.id nodeId,pn.content from pr_assembly_plan ap
+ select ap.id planId,
+ ap.name planName,
+ ap.`status`,
+ pn.id nodeId,
+ pn.content
+ from pr_assembly_plan ap
left join pr_production_node pn on ap.process_id = pn.process_id
where status != -1
<if test="planName != null and planName!= ''">
and ap.name like concat('%', #{planName}, '%')
</if>
+ order by ap.id desc, pn.id asc
</select>
<select id="queryPlanList" resultType="cn.hutool.json.JSONObject">
--
Gitblit v1.8.0