From 01e45371334efcf7f4ccf2fbf8343ec063aa1ff2 Mon Sep 17 00:00:00 2001
From: dy <dingyang@lnfxkj.tech>
Date: 星期六, 19 四月 2025 11:14:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-job/src/main/resources/mapper/job/ApsWorkOrderJobMapper.xml | 39 +++++++++++++++++++++++++++++++++++++--
1 files changed, 37 insertions(+), 2 deletions(-)
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 b8a6848..3ce7c26 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
@@ -283,8 +283,43 @@
</foreach>
</delete>
- <update id="updateApsWorkOrderJobPrccessStatus" parameterType="String">
- update aps_work_order_job set process_status='1' where doc_no = #{docNo}
+ <update id="updateApsWorkOrderJobPrccessStatus" parameterType="map">
+ update aps_work_order_job
+ set process_status = #{status}
+ where doc_no in
+ <foreach item="docNo" collection="docNos" open="(" separator="," close=")">
+ #{docNo}
+ </foreach>
</update>
+ <delete id="deleteAllPartPlan" >
+ delete from aps_part_plan where del_flag in ('0','1')
+ </delete>
+ <insert id="batchInsertPartPlan">
+ insert into aps_part_plan
+ (
+ document_number,main_part_number,main_part_drawing_number,
+ customer,business_type,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,next_process_deparment,
+ is_suspended,is_outsourcing,account,
+ id,create_time,del_flag,plant,order_status
+ )
+ select
+ doc_no,mainitem_code,mainitem_figure,
+ customer_name,business_type,demand_type,
+ doc_status,item_code,item_figure,
+ item_figure_version,pruduct_qty,work_qty,
+ op_num,work_center,dept,
+ start_date,complete_date,next_dept,
+ is_hold_release,is_out_source,org_code,
+ order_id,now(),'0',org_code,doc_status
+ 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%')
+ );
+ </insert>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3