From 55a52ebc929a3ebf2e8dbae450c0c241abf7ff02 Mon Sep 17 00:00:00 2001
From: 懒羊羊 <15939171744@163.com>
Date: 星期四, 28 三月 2024 16:31:06 +0800
Subject: [PATCH] -

---
 jcdm-main/src/main/resources/mapper/om/productionOrde/OmProductionOrdeInfoMapper.xml |   22 +++++++++++++++-------
 1 files changed, 15 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 f35131e..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,20 +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,site_code,product_num,station_code,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_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">
@@ -135,7 +137,9 @@
             <if test="resultText != null">result_text,</if>
             <if test="resultCode != null">result_code,</if>
             <if test="sfResult != null">sf_result,</if>
-         </trim>
+            <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>
@@ -181,7 +185,9 @@
             <if test="resultText != null">#{resultText},</if>
             <if test="resultCode != null">#{resultCode},</if>
             <if test="sfResult != null">#{sfResult},</if>
-         </trim>
+            <if test="productModel != null">#{productModel},</if>
+
+        </trim>
     </insert>
 
     <update id="updateOmProductionOrdeInfo" parameterType="OmProductionOrdeInfo">
@@ -230,6 +236,8 @@
             <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