From 3f23422c13226ce37150afed0b4d8d0309da45d3 Mon Sep 17 00:00:00 2001
From: hdy <1105738590@qq.com>
Date: 星期二, 25 三月 2025 19:24:40 +0800
Subject: [PATCH] 修改
---
billion-main/src/main/resources/mapper/om/OmProductionOrderInfoMapper.xml | 120 +++++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 82 insertions(+), 38 deletions(-)
diff --git a/billion-main/src/main/resources/mapper/om/OmProductionOrderInfoMapper.xml b/billion-main/src/main/resources/mapper/om/OmProductionOrderInfoMapper.xml
index 25c5522..a4b609c 100644
--- a/billion-main/src/main/resources/mapper/om/OmProductionOrderInfoMapper.xml
+++ b/billion-main/src/main/resources/mapper/om/OmProductionOrderInfoMapper.xml
@@ -20,65 +20,105 @@
<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">
- select id, work_order_no, sales_order_code, product_code, line_code, plan_qty, plan_start_time, plan_end_time, order_status, create_time, update_time, create_by, update_by, remarks, del_flag from om_production_order_info
+ select id,body_status,head_status,pre_status,body_qty,head_qty,pre_qty,work_order_no, sales_order_code, product_code, line_code, plan_qty, plan_start_time, plan_end_time, order_status, create_time, update_time, create_by, update_by, remarks, del_flag from om_production_order_info
</sql>
<!-- 鏌ヨ order_status 涓� 1 涓� plan_start_time 鏈�鏃╃殑涓�鏉¤褰� -->
- <select id="selectEarliestOrder" resultType="OmProductionOrderInfo">
+ <select id="getBodyOrder" resultType="OmProductionOrderInfo">
SELECT TOP 1 *
FROM om_production_order_info
- WHERE order_status IN (1, 2)
+ WHERE body_status IN (0,1)
ORDER BY plan_start_time ASC
</select>
-
- <select id="selectEarliestOrder2" resultType="OmProductionOrderInfo">
+ <select id="updateBodyStatus1" resultType="OmProductionOrderInfo">
+ UPDATE o
+ SET body_status = 1, body_qty = body_qty + 1
+ FROM om_production_order_info AS o
+ INNER JOIN (
+ SELECT TOP 1 id
+ FROM om_production_order_info
+ WHERE body_status IN (0, 1)
+ ORDER BY plan_start_time ASC
+ ) AS sub ON o.id = sub.id;
+ </select>
+ <select id="updateBodyStatus2" resultType="OmProductionOrderInfo">
+ UPDATE om_production_order_info
+ SET body_status = 4
+ WHERE id = (
+ SELECT TOP 1 id
+ FROM om_production_order_info
+ WHERE body_status IN (0, 1)
+ ORDER BY plan_start_time ASC
+ );
+ </select>
+ <select id="getHeadOrder" resultType="OmProductionOrderInfo">
SELECT TOP 1 *
FROM om_production_order_info
- WHERE order_status IN (5)
+ WHERE head_status IN (0,1)
ORDER BY plan_start_time ASC
</select>
-
- <select id="updateOrderStatus" resultType="OmProductionOrderInfo">
+ <select id="updateHeadStatus1" resultType="OmProductionOrderInfo">
+ UPDATE o
+ SET head_status = 1, head_qty = head_qty + 1
+ FROM om_production_order_info AS o
+ INNER JOIN (
+ SELECT TOP 1 id
+ FROM om_production_order_info
+ WHERE head_status IN (0, 1)
+ ORDER BY plan_start_time ASC
+ ) AS sub ON o.id = sub.id;
+ </select>
+ <select id="updateHeadStatus2" resultType="OmProductionOrderInfo">
UPDATE om_production_order_info
- SET order_status = 5
+ SET head_status = 4
WHERE id = (
SELECT TOP 1 id
FROM om_production_order_info
- WHERE order_status IN (1, 2)
+ WHERE head_status IN (0, 1)
ORDER BY plan_start_time ASC
);
</select>
- <select id="updateOrderStatus2" resultType="OmProductionOrderInfo">
- UPDATE om_production_order_info
- SET order_status = 2
- WHERE id = (
- SELECT TOP 1 id
- FROM om_production_order_info
- WHERE order_status IN (1, 2)
- ORDER BY plan_start_time ASC
- );
- </select>
-
- <select id="getSerialNumber" resultType="OmProductionOrderInfo">
- SELECT *
+ <select id="getPreOrder" resultType="OmProductionOrderInfo">
+ SELECT TOP 1 *
FROM om_production_order_info
- WHERE id = 1
+ WHERE pre_status IN (0,1)
+ ORDER BY plan_start_time ASC
+ </select>
+ <select id="updatePreStatus1" resultType="OmProductionOrderInfo">
+ UPDATE o
+ SET pre_status = 1, pre_qty = pre_qty + 1
+ FROM om_production_order_info AS o
+ INNER JOIN (
+ SELECT TOP 1 id
+ FROM om_production_order_info
+ WHERE pre_status IN (0, 1)
+ ORDER BY plan_start_time ASC
+ ) AS sub ON o.id = sub.id;
+ </select>
+ <select id="updatePreStatus2" resultType="OmProductionOrderInfo">
+ UPDATE om_production_order_info
+ SET pre_status = 4
+ WHERE id = (
+ SELECT TOP 1 id
+ FROM om_production_order_info
+ WHERE pre_status IN (0, 1)
+ ORDER BY plan_start_time ASC
+ );
</select>
- <select id="updateSerialNumber" resultType="OmProductionOrderInfo">
- UPDATE om_production_order_info
- SET plan_qty = plan_qty + 1
- WHERE id = 1;
- </select>
- <select id="updateYear" resultType="OmProductionOrderInfo">
- UPDATE om_production_order_info
- SET remarks = remarks + 1,
- qty = 1
- WHERE id = 1;
- </select>
<select id="selectOmProductionOrderInfoList" parameterType="OmProductionOrderInfo" resultMap="OmProductionOrderInfoResult">
@@ -103,7 +143,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>
@@ -119,7 +158,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>
@@ -130,6 +168,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>
@@ -139,7 +178,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>
@@ -150,6 +188,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