From e2670e7912ea7316d1f9fb518d980b8a4ef94055 Mon Sep 17 00:00:00 2001
From: hdy <1105738590@qq.com>
Date: 星期四, 18 四月 2024 10:23:28 +0800
Subject: [PATCH] 点位订阅
---
jcdm-main/src/main/resources/mapper/om/productionOrde/OmProductionOrdeInfoMapper.xml | 52 +++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 45 insertions(+), 7 deletions(-)
diff --git a/jcdm-main/src/main/resources/mapper/om/productionOrde/OmProductionOrdeInfoMapper.xml b/jcdm-main/src/main/resources/mapper/om/productionOrde/OmProductionOrdeInfoMapper.xml
index 5aee192..0f1d9bf 100644
--- a/jcdm-main/src/main/resources/mapper/om/productionOrde/OmProductionOrdeInfoMapper.xml
+++ b/jcdm-main/src/main/resources/mapper/om/productionOrde/OmProductionOrdeInfoMapper.xml
@@ -39,14 +39,22 @@
<result property="marketAreaCode" column="market_area_code" />
<result property="softwareVersionCode" column="software_version_code" />
<result property="productCompanyCode" column="product_company_code" />
- <result property="spareField1" column="spare_field_1" />
- <result property="spareField2" column="spare_field_2" />
- <result property="spareField3" column="spare_field_3" />
- <result property="spareField4" column="spare_field_4" />
+ <result property="spareField1" column="spare_field1" />
+ <result property="spareField2" column="spare_field2" />
+ <result property="spareField3" column="spare_field3" />
+ <result property="spareField4" column="spare_field4" />
+ <result property="siteCode" column="site_code" />
+ <result property="productNum" column="product_num" />
+ <result property="stationCode" column="station_code" />
+ <result property="resultCode" column="result_code" />
+ <result property="resultText" column="result_text" />
+ <result property="sfResult" column="sf_result" />
+ <result property="productModel" column="product_model" />
+
</resultMap>
<sql id="selectOmProductionOrdeInfoVo">
- select id, work_order_no, sales_order_code, product_code, product_name, workshop_code, line_code, route_code, bom_code, recipe_code, plan_qty, actual_qty, bad_qty, scrap_qty, repair_qty, actual_online_qty, online_completion_mark, demand_date, plan_start_time, plan_end_time, actual_start_time, actual_end_time, serial_number, order_status, create_time, update_time, create_user, update_user, remarks, stream_number, custom, market_area_code, software_version_code, product_company_code, spare_field_1, spare_field_2, spare_field_3, spare_field_4 from om_production_orde_info
+ select id,site_code,product_num,station_code, product_model,result_code,result_text,sf_result ,work_order_no, sales_order_code, product_code, product_name, workshop_code, line_code, route_code, bom_code, recipe_code, plan_qty, actual_qty, bad_qty, scrap_qty, repair_qty, actual_online_qty, online_completion_mark, demand_date, plan_start_time, plan_end_time, actual_start_time, actual_end_time, serial_number, order_status, create_time, update_time, create_user, update_user, remarks, stream_number, custom, market_area_code, software_version_code, product_company_code, spare_field1, spare_field2, spare_field3, spare_field4 from om_production_orde_info
</sql>
<select id="selectOmProductionOrdeInfoList" parameterType="OmProductionOrdeInfo" resultMap="OmProductionOrdeInfoResult">
@@ -67,6 +75,12 @@
<if test="marketAreaCode != null and marketAreaCode != ''"> and market_area_code like concat('%', #{marketAreaCode}, '%')</if>
<if test="softwareVersionCode != null and softwareVersionCode != ''"> and software_version_code like concat('%', #{softwareVersionCode}, '%')</if>
<if test="productCompanyCode != null and productCompanyCode != ''"> and product_company_code like concat('%', #{productCompanyCode}, '%')</if>
+ <if test="siteCode != null and siteCode != ''"> and site_code = #{siteCode}</if>
+ <if test="productNum != null and productNum != ''"> and product_num = #{productNum}</if>
+ <if test="stationCode != null and stationCode != ''"> and station_code = #{stationCode}</if>
+ <if test="resultText != null and resultText != ''"> and result_text = #{resultText}</if>
+ <if test="resultCode != null and resultCode != ''"> and result_code = #{resultCode}</if>
+ <if test="sfResult != null and sfResult != ''"> and sf_result = #{sfResult}</if>
</where>
ORDER BY stream_number DESC
</select>
@@ -117,7 +131,15 @@
<if test="spareField2 != null">spare_field_2,</if>
<if test="spareField3 != null">spare_field_3,</if>
<if test="spareField4 != null">spare_field_4,</if>
- </trim>
+ <if test="siteCode != null">site_code,</if>
+ <if test="productNum != null">product_num,</if>
+ <if test="stationCode != null">station_code,</if>
+ <if test="resultText != null">result_text,</if>
+ <if test="resultCode != null">result_code,</if>
+ <if test="sfResult != null">sf_result,</if>
+ <if test="productModel != null">product_model,</if>
+
+ </trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
<if test="workOrderNo != null">#{workOrderNo},</if>
@@ -157,7 +179,15 @@
<if test="spareField2 != null">#{spareField2},</if>
<if test="spareField3 != null">#{spareField3},</if>
<if test="spareField4 != null">#{spareField4},</if>
- </trim>
+ <if test="siteCode != null">#{siteCode},</if>
+ <if test="productNum != null">#{productNum},</if>
+ <if test="stationCode != null">#{stationCode},</if>
+ <if test="resultText != null">#{resultText},</if>
+ <if test="resultCode != null">#{resultCode},</if>
+ <if test="sfResult != null">#{sfResult},</if>
+ <if test="productModel != null">#{productModel},</if>
+
+ </trim>
</insert>
<update id="updateOmProductionOrdeInfo" parameterType="OmProductionOrdeInfo">
@@ -200,6 +230,14 @@
<if test="spareField2 != null">spare_field_2 = #{spareField2},</if>
<if test="spareField3 != null">spare_field_3 = #{spareField3},</if>
<if test="spareField4 != null">spare_field_4 = #{spareField4},</if>
+ <if test="siteCode != null">site_code = #{siteCode},</if>
+ <if test="productNum != null">product_num = #{productNum},</if>
+ <if test="stationCode != null">station_code = #{stationCode},</if>
+ <if test="resultText != null">result_text = #{resultText},</if>
+ <if test="resultCode != null">result_code = #{resultCode},</if>
+ <if test="sfResult != null">sf_result = #{sfResult},</if>
+ <if test="productModel != null">product_model = #{productModel},</if>
+
</trim>
where id = #{id}
</update>
--
Gitblit v1.9.3