From ae6879a7575f79d814c70781e6efc1b6218f3732 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期五, 14 三月 2025 14:10:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
billion-main/src/main/resources/mapper/om/OmProductionOrderInfoMapper.xml | 30 +++++++++++++++++++++++-------
1 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/billion-main/src/main/resources/mapper/om/OmProductionOrderInfoMapper.xml b/billion-main/src/main/resources/mapper/om/OmProductionOrderInfoMapper.xml
index 6dd5de1..6cabb0e 100644
--- a/billion-main/src/main/resources/mapper/om/OmProductionOrderInfoMapper.xml
+++ b/billion-main/src/main/resources/mapper/om/OmProductionOrderInfoMapper.xml
@@ -20,6 +20,16 @@
<result property="updateBy" column="update_by" />
<result property="remarks" column="remarks" />
<result property="delFlag" column="del_flag" />
+ <result property="engineType" column="engine_type" />
+ <result property="engineName" column="engine_name" />
+ <result property="flag" column="flag" />
+ <result property="bodyQty" column="body_qty" />
+ <result property="headQty" column="head_qty" />
+ <result property="preQty" column="pre_qty" />
+ <result property="bodyStatus" column="body_status" />
+ <result property="headStatus" column="head_status" />
+ <result property="preStatus" column="pre_status" />
+
</resultMap>
<sql id="selectOmProductionOrderInfoVo">
@@ -31,6 +41,7 @@
SELECT TOP 1 *
FROM om_production_order_info
WHERE body_status IN (0,1)
+ AND body_qty != plan_qty
ORDER BY plan_start_time ASC
</select>
<select id="updateBodyStatus1" resultType="OmProductionOrderInfo">
@@ -46,7 +57,7 @@
</select>
<select id="updateBodyStatus2" resultType="OmProductionOrderInfo">
UPDATE om_production_order_info
- SET body_status = 2
+ SET body_status = 4
WHERE id = (
SELECT TOP 1 id
FROM om_production_order_info
@@ -58,6 +69,7 @@
SELECT TOP 1 *
FROM om_production_order_info
WHERE head_status IN (0,1)
+ AND head_qty != plan_qty
ORDER BY plan_start_time ASC
</select>
<select id="updateHeadStatus1" resultType="OmProductionOrderInfo">
@@ -73,7 +85,7 @@
</select>
<select id="updateHeadStatus2" resultType="OmProductionOrderInfo">
UPDATE om_production_order_info
- SET head_status = 2
+ SET head_status = 4
WHERE id = (
SELECT TOP 1 id
FROM om_production_order_info
@@ -85,6 +97,7 @@
SELECT TOP 1 *
FROM om_production_order_info
WHERE pre_status IN (0,1)
+ AND pre_qty != plan_qty
ORDER BY plan_start_time ASC
</select>
<select id="updatePreStatus1" resultType="OmProductionOrderInfo">
@@ -100,7 +113,7 @@
</select>
<select id="updatePreStatus2" resultType="OmProductionOrderInfo">
UPDATE om_production_order_info
- SET pre_status = 2
+ SET pre_status = 4
WHERE id = (
SELECT TOP 1 id
FROM om_production_order_info
@@ -108,7 +121,6 @@
ORDER BY plan_start_time ASC
);
</select>
-
@@ -134,7 +146,6 @@
<if test="workOrderNo != null and workOrderNo != ''">work_order_no,</if>
<if test="salesOrderCode != null and salesOrderCode != ''">sales_order_code,</if>
<if test="productCode != null and productCode != ''">product_code,</if>
- <if test="lineCode != null and lineCode != ''">line_code,</if>
<if test="planQty != null">plan_qty,</if>
<if test="planStartTime != null">plan_start_time,</if>
<if test="planEndTime != null">plan_end_time,</if>
@@ -150,7 +161,6 @@
<if test="workOrderNo != null and workOrderNo != ''">#{workOrderNo},</if>
<if test="salesOrderCode != null and salesOrderCode != ''">#{salesOrderCode},</if>
<if test="productCode != null and productCode != ''">#{productCode},</if>
- <if test="lineCode != null and lineCode != ''">#{lineCode},</if>
<if test="planQty != null">#{planQty},</if>
<if test="planStartTime != null">#{planStartTime},</if>
<if test="planEndTime != null">#{planEndTime},</if>
@@ -161,6 +171,7 @@
<if test="updateBy != null">#{updateBy},</if>
<if test="remarks != null">#{remarks},</if>
<if test="delFlag != null">#{delFlag},</if>
+ set del_flag = 0,
</trim>
</insert>
@@ -170,7 +181,6 @@
<if test="workOrderNo != null and workOrderNo != ''">work_order_no = #{workOrderNo},</if>
<if test="salesOrderCode != null and salesOrderCode != ''">sales_order_code = #{salesOrderCode},</if>
<if test="productCode != null and productCode != ''">product_code = #{productCode},</if>
- <if test="lineCode != null and lineCode != ''">line_code = #{lineCode},</if>
<if test="planQty != null">plan_qty = #{planQty},</if>
<if test="planStartTime != null">plan_start_time = #{planStartTime},</if>
<if test="planEndTime != null">plan_end_time = #{planEndTime},</if>
@@ -181,6 +191,12 @@
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="remarks != null">remarks = #{remarks},</if>
<if test="delFlag != null">del_flag = #{delFlag},</if>
+ <if test="bodyQty != null">body_qty = #{bodyQty},</if>
+ <if test="headQty != null">head_qty = #{headQty},</if>
+ <if test="preQty != null">pre_qty = #{preQty},</if>
+ <if test="bodyStatus != null">body_status = #{bodyStatus},</if>
+ <if test="headStatus != null">head_status = #{headStatus},</if>
+ <if test="preStatus != null">pre_status = #{preStatus},</if>
</trim>
where id = #{id}
</update>
--
Gitblit v1.9.3