From 6d313a4a6f9f9d7ea65ec50ab0d4491e595edb97 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期二, 15 十月 2024 09:47:26 +0800
Subject: [PATCH] -打印bug修改
---
jcdm-main/src/main/resources/mapper/om/productionOrde/OmProductionOrdeInfoMapper.xml | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 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 a8698ef..4f1daa3 100644
--- a/jcdm-main/src/main/resources/mapper/om/productionOrde/OmProductionOrdeInfoMapper.xml
+++ b/jcdm-main/src/main/resources/mapper/om/productionOrde/OmProductionOrdeInfoMapper.xml
@@ -50,11 +50,15 @@
<result property="resultText" column="result_text" />
<result property="sfResult" column="sf_result" />
<result property="productModel" column="product_model" />
+ <result property="automaticNgFlag" column="automatic_ng_flag" />
+ <result property="automaticNgStation" column="automatic_ng_station" />
+ <result property="automaticNgScrewNumber" column="automatic_ng_screw_number" />
+ <result property="artificialNgFlag" column="artificial_ng_flag" />
</resultMap>
<sql id="selectOmProductionOrdeInfoVo">
- 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, material_code, software_version_code, product_company_code, trolley_yard, spare_field2, spare_field3, spare_field4 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, material_code, software_version_code, product_company_code, trolley_yard, spare_field2, spare_field3, spare_field4, automatic_ng_flag, automatic_ng_station, automatic_ng_screw_number, artificial_ng_flag from om_production_orde_info
</sql>
<select id="selectOmProductionOrdeInfoList" parameterType="OmProductionOrdeInfo" resultMap="OmProductionOrdeInfoResult">
@@ -81,6 +85,8 @@
<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>
+ <if test="onlineCompletionMark != null and sfResult != ''"> and online_completion_mark = #{onlineCompletionMark}</if>
+
</where>
ORDER BY stream_number DESC
</select>
@@ -138,6 +144,10 @@
<if test="resultCode != null">result_code,</if>
<if test="sfResult != null">sf_result,</if>
<if test="productModel != null">product_model,</if>
+ <if test="automaticNgFlag != null">automatic_ng_flag,</if>
+ <if test="automaticNgStation != null">automatic_ng_station,</if>
+ <if test="automaticNgScrewNumber != null">automatic_ng_screw_number,</if>
+ <if test="artificialNgFlag != null">artificial_ng_flag,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -186,6 +196,10 @@
<if test="resultCode != null">#{resultCode},</if>
<if test="sfResult != null">#{sfResult},</if>
<if test="productModel != null">#{productModel},</if>
+ <if test="automaticNgFlag != null">#{automaticNgFlag},</if>
+ <if test="automaticNgStation != null">#{automaticNgStation},</if>
+ <if test="automaticNgScrewNumber != null">#{automaticNgScrewNumber},</if>
+ <if test="artificialNgFlag != null">#{artificialNgFlag},</if>
</trim>
</insert>
@@ -237,7 +251,10 @@
<if test="resultCode != null">result_code = #{resultCode},</if>
<if test="sfResult != null">sf_result = #{sfResult},</if>
<if test="productModel != null">product_model = #{productModel},</if>
-
+ <if test="automaticNgFlag != null">automatic_ng_flag = #{automaticNgFlag},</if>
+ <if test="automaticNgStation != null">automatic_ng_station = #{automaticNgStation},</if>
+ <if test="automaticNgScrewNumber != null">automatic_ng_screw_number = #{automaticNgScrewNumber},</if>
+ <if test="artificialNgFlag != null">artificial_ng_flag = #{artificialNgFlag},</if>
</trim>
where id = #{id}
</update>
--
Gitblit v1.9.3