From ea3c33c8561df39d4f123d1424fda99dd0f0c51d Mon Sep 17 00:00:00 2001
From: wujian <14790700720@163.com>
Date: 星期四, 14 十一月 2024 08:15:41 +0800
Subject: [PATCH] add - panel
---
jcdm-main/src/main/resources/mapper/bs/orderScheduling/BsOrderSchedulingMapper.xml | 43 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 42 insertions(+), 1 deletions(-)
diff --git a/jcdm-main/src/main/resources/mapper/bs/orderScheduling/BsOrderSchedulingMapper.xml b/jcdm-main/src/main/resources/mapper/bs/orderScheduling/BsOrderSchedulingMapper.xml
index 9ccd8f1..d484f39 100644
--- a/jcdm-main/src/main/resources/mapper/bs/orderScheduling/BsOrderSchedulingMapper.xml
+++ b/jcdm-main/src/main/resources/mapper/bs/orderScheduling/BsOrderSchedulingMapper.xml
@@ -45,6 +45,23 @@
select id, order_no, engine_no, product_type, model, production_status, working_hours, current_workstation, quality_status, whether_or_print, report_10, report_20, combined_box_time, final_assembly_time, operator, operate_time, status, spare_field_1, spare_field_2, spare_field_3, spare_field_4, create_user, create_time, update_user, update_time, remarks, report_30, box_closing_online_time, closing_box_offline_time, final_assembly_launch_time, final_assembly_offline_time, cvt_launch_time, cvt_offline_time from bs_order_scheduling
</sql>
+ <sql id="selectBsOrderSchedulingForReport">
+ select id, engine_no, report_20, remarks from bs_order_scheduling
+ </sql>
+
+ <select id="selectBsOrderSchedulingForReport"
+ parameterType="BsOrderScheduling" resultMap="BsOrderSchedulingResult">
+ <include refid="selectBsOrderSchedulingForReport"/>
+ <where>
+ <if test="engineNoList != null and engineNoList.size() > 0">
+ and engine_no in
+ <foreach collection="engineNoList" open="(" close=")" separator="," item="engine">
+ #{engine}
+ </foreach>
+ </if>
+ </where>
+ </select>
+
<select id="selectBsOrderSchedulingList" parameterType="BsOrderScheduling" resultMap="BsOrderSchedulingResult">
<include refid="selectBsOrderSchedulingVo"/>
<where>
@@ -89,7 +106,7 @@
<if test="engineNoListExcel != null and engineNoListExcel.size() > 0">
and engine_no in
<foreach collection="engineNoListExcel" open="(" close=")" separator="," item="engine">
- #{engine} order by order_no,engine_no
+ #{engine}
</foreach>
</if>
</where>
@@ -171,6 +188,28 @@
<select id="getProduceNumToday" resultType="java.lang.Integer">
select count(*) from bs_order_scheduling
where ${queryField} BETWEEN #{startTime} AND #{endTime}
+ </select>
+ <select id="getProductNum" resultType="com.jcdm.main.da.passingStationCollection.domain.ProductNumVO">
+ SELECT model,count(*) as num FROM bs_order_scheduling
+ <where>
+ <if test="queryDate != null and queryDate != ''">
+ final_assembly_offline_time between #{queryDate} and #{addQueryDate}
+ </if>
+ </where>
+ GROUP BY model
+ </select>
+
+ <select id="selectBsOrderSchedulingListForNum"
+ parameterType="BsOrderScheduling" resultMap="BsOrderSchedulingResult">
+ select model,final_assembly_offline_time,final_assembly_launch_time,box_closing_online_time
+ from bs_order_scheduling
+ <where>
+ <if test="queryDate != null and queryDate != ''">
+ final_assembly_offline_time between #{queryDate} and #{addQueryDate}
+ or final_assembly_launch_time between #{queryDate} and #{addQueryDate}
+ or box_closing_online_time between #{queryDate} and #{addQueryDate}
+ </if>
+ </where>
</select>
@@ -297,4 +336,6 @@
#{id}
</foreach>
</delete>
+
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3