From 0f9771f826d82b6a3bcd47011495be0915ebad0e Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期日, 27 四月 2025 13:24:56 +0800
Subject: [PATCH] 钣金计划数据同步
---
aps-modules/aps-core/src/main/resources/mapper/core/ApsPartRouteStatMapper.xml | 4 +---
aps-modules/aps-job/src/main/resources/mapper/job/ApsWorkOrderJobMapper.xml | 11 ++++++-----
aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateProcessStatMapper.xml | 3 +--
3 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPartRouteStatMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPartRouteStatMapper.xml
index a1b6918..75d31fb 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPartRouteStatMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPartRouteStatMapper.xml
@@ -123,9 +123,7 @@
from aps_part_plan as pl
left join aps_process_route as rt on pl.document_number=rt.work_order_no
left join aps_resource_group as rs on rs.resource_group_name=rt.process_name
- where pl.del_flag='0' and rt.del_flag='0'
- /*闆朵欢璁″垝鐘舵�佷负锛氶潪瀹屽伐 */
- and document_status in (0,1,2,4)
+ where document_status in (0,1,2,4)
/*宸ュ簭璁″垝寮�宸ユ棩 灏忎簬绛変簬 璧勬簮缁勭殑鎴鏃ユ湡*/
and rt.process_plan_start_day <= rs.request_date
order by rt.work_order_no,process_plan_start_day
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateProcessStatMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateProcessStatMapper.xml
index 238db8f..19bbd76 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateProcessStatMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateProcessStatMapper.xml
@@ -145,8 +145,7 @@
pl.plan_end_day as order_plan_end_day
from aps_plate_plan as pl
left join aps_process_route as rt on pl.document_number = rt.work_order_no
- where pl.del_flag = '0' and rt.del_flag = '0'
- and (pl.document_status is not null and (pl.document_status != '3'))
+ where pl.document_status in (0,1,2,4)
order by rt.work_order_no asc , rt.process_number desc
</select>
<update id="removeOtherStat" parameterType="String">
diff --git a/aps-modules/aps-job/src/main/resources/mapper/job/ApsWorkOrderJobMapper.xml b/aps-modules/aps-job/src/main/resources/mapper/job/ApsWorkOrderJobMapper.xml
index 73a3c08..1a77528 100644
--- a/aps-modules/aps-job/src/main/resources/mapper/job/ApsWorkOrderJobMapper.xml
+++ b/aps-modules/aps-job/src/main/resources/mapper/job/ApsWorkOrderJobMapper.xml
@@ -323,9 +323,10 @@
is_hold_release,is_out_source,org_code,
order_id,now(),'0',org_code,doc_status,std_op
from aps_work_order_job
- where ( doc_status in (0,1,2,4) and
- (mainitem_code like 'M01%' or mainitem_code like 'M02%'or mainitem_code like 'M05%' or mainitem_code like 'M10%'
- or mainitem_code like 'M14%'or mainitem_code like 'M15%' or mainitem_code like 'F%' or mainitem_code like 'Z%')
+ where ( doc_status in (0,1,2,4) and is_hold_release='0'
+ and (mainitem_code like 'M01%' or mainitem_code like 'M02%'or mainitem_code like 'M05%' or mainitem_code like 'M10%'
+ or mainitem_code like 'M14%'or mainitem_code like 'M15%' or mainitem_code like 'F%' or mainitem_code like 'Z%'
+ )
);
</insert>
<delete id="deleteAllPlatePlan" >
@@ -353,7 +354,7 @@
is_hold_release,is_out_source,org_code,
order_id,now(),'0',org_code,doc_status,std_op
from aps_work_order_job
- where ( doc_status in (0,1,2,4)
+ where ( doc_status in (0,1,2,4) and is_hold_release='0'
and (mainitem_code like 'M03%' or mainitem_code like 'M04%'or mainitem_code like 'A75%')
);
</insert>
@@ -384,7 +385,7 @@
order_id,now(),'0',org_code,doc_status,std_op,
case when substr(mainitem_code,3)='A65' then 'gas' else 'piping' end as plan_type
from aps_work_order_job
- where ( doc_status in (0,1,2,4)
+ where ( doc_status in (0,1,2,4) and is_hold_release='0'
and (mainitem_code like 'A65%' or mainitem_code like 'W%'));
</insert>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3