From 403915beb25beccaffecce835cd4a61732dbc611 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期五, 18 四月 2025 14:08:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-job/src/main/resources/mapper/job/ApsWorkOrderProcessMapper.xml | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 56 insertions(+), 1 deletions(-)
diff --git a/aps-modules/aps-job/src/main/resources/mapper/job/ApsWorkOrderProcessMapper.xml b/aps-modules/aps-job/src/main/resources/mapper/job/ApsWorkOrderProcessMapper.xml
index 366a651..981eb19 100644
--- a/aps-modules/aps-job/src/main/resources/mapper/job/ApsWorkOrderProcessMapper.xml
+++ b/aps-modules/aps-job/src/main/resources/mapper/job/ApsWorkOrderProcessMapper.xml
@@ -40,7 +40,7 @@
<if test="scrapQty != null "> and scrap_qty = #{scrapQty}</if>
<if test="opStatus != null and opStatus != ''"> and op_status = #{opStatus}</if>
<if test="org != null and org != ''"> and org = #{org}</if>
- <if test="org_code != null and opStatus != ''"> and op_status = #{opStatus}</if>
+ <if test="org_code != null and org_code != ''"> and org_code = #{orgCode}</if>
</where>
</select>
@@ -123,4 +123,59 @@
and op_id = #{opId}
</select>
+ <update id="updateApsWorkOrderProcessBatch">
+ <foreach collection="list" item="item" separator=";">
+ UPDATE aps_work_order_process
+ SET item_code = #{item.itemCode},
+ doc_no = #{item.docNo},
+ op_num = #{item.opNum},
+ op_id = #{item.opId},
+ process_name = #{item.processName},
+ standard_time = #{item.standardTime},
+ plan_start_date = #{item.palnStartDate},
+ plan_complete_date = #{item.planCompleteDate},
+ process_qty = #{item.processQty},
+ scrap_qty = #{item.scrapQty},
+ op_status = #{item.opStatus},
+ org = #{item.org},
+ org_code = #{item.orgCode}
+ WHERE id = #{item.id}
+ </foreach>
+ </update>
+
+ <insert id="insertApsWorkOrderProcessBatch">
+ INSERT INTO aps_work_order_process (
+ item_code,
+ doc_no,
+ op_num,
+ op_id,
+ process_name,
+ standard_time,
+ plan_start_date,
+ plan_complete_date,
+ process_qty,
+ scrap_qty,
+ op_status,
+ org,
+ org_code
+ ) VALUES
+ <foreach collection="list" item="item" separator=",">
+ (
+ #{item.itemCode},
+ #{item.docNo},
+ #{item.opNum},
+ #{item.opId},
+ #{item.processName},
+ #{item.standardTime},
+ #{item.palnStartDate},
+ #{item.planCompleteDate},
+ #{item.processQty},
+ #{item.scrapQty},
+ #{item.opStatus},
+ #{item.org},
+ #{item.orgCode}
+ )
+ </foreach>
+ </insert>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3