From 261698358e2b756a61e992bc1651e01b3f45290b Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 23 十月 2025 16:50:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/resources/mapper/OptimizeProjectMapper.xml | 29 +++++++++++++++++++++++------
1 files changed, 23 insertions(+), 6 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/resources/mapper/OptimizeProjectMapper.xml b/hangzhoumesParent/common/servicebase/src/main/resources/mapper/OptimizeProjectMapper.xml
index 4cfc94a..da44ded 100644
--- a/hangzhoumesParent/common/servicebase/src/main/resources/mapper/OptimizeProjectMapper.xml
+++ b/hangzhoumesParent/common/servicebase/src/main/resources/mapper/OptimizeProjectMapper.xml
@@ -22,7 +22,13 @@
</resultMap>
<select id="saveProject" parameterType="com.mes.pp.entity.request.OptimizeRequest" resultMap="sequenceMap">
- select a.project_no, 1 as glass_type, a.width, a.height, REGEXP_REPLACE(b.glass_thickness, '\\D', '')as glass_thickness, a.heat_layout_sort, 0 as state
+ select a.project_no,
+ 1 as glass_type,
+ a.width,
+ a.height,
+ REGEXP_REPLACE(b.glass_thickness, '\\D', '') as glass_thickness,
+ a.heat_layout_sort,
+ 0 as state
from optimize_detail a
left join optimize_project b on a.project_no = b.project_no
where a.project_no = #{projectNo}
@@ -33,18 +39,18 @@
p.project_name
from pp.optimize_project p
where p.state = 100
- and p.project_no not in (
+ and p.project_no not in (
select es.project_no
from north_glass_mes.engineer_scheduling es
where es.project_no is not null
- )
+ )
order by p.id
</select>
<select id="engineerScheduling" parameterType="com.mes.pp.entity.request.OptimizeRequest" resultMap="resultMap">
select es.project_no,
- es.project_name,
- es.type
+ es.project_name,
+ es.type
from north_glass_mes.engineer_scheduling es
where es.state = 100
<if test="type != null and type != ''">
@@ -55,9 +61,20 @@
<!-- 鏍规嵁绫诲瀷鍒犻櫎engineer_scheduling琛ㄤ腑鐨勬暟鎹� -->
<delete id="deleteByType">
- DELETE FROM north_glass_mes.engineer_scheduling
+ DELETE
+ FROM north_glass_mes.engineer_scheduling
WHERE type = #{type}
</delete>
+ <delete id="deleteByScheduling">
+ DELETE
+ FROM north_glass_mes.engineer_scheduling
+ WHERE project_no = #{engineerId}
+ and type in (
+ <foreach collection="types" item="item" separator=",">
+ #{item}
+ </foreach>
+ )
+ </delete>
<!-- 鎵归噺鎻掑叆鏁版嵁鍒癳ngineer_scheduling琛� -->
<insert id="batchInsert">
--
Gitblit v1.8.0