From 1a444b1dc206297ed3d7199c3c5fb557f580c9af Mon Sep 17 00:00:00 2001
From: yyt <306727702@qq.com>
Date: 星期日, 05 五月 2024 08:30:05 +0800
Subject: [PATCH] 更新过站
---
jcdm-main/src/main/resources/mapper/bs/orderScheduling/BsOrderSchedulingMapper.xml | 178 ++++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 151 insertions(+), 27 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 2dd716d..3afc5b3 100644
--- a/jcdm-main/src/main/resources/mapper/bs/orderScheduling/BsOrderSchedulingMapper.xml
+++ b/jcdm-main/src/main/resources/mapper/bs/orderScheduling/BsOrderSchedulingMapper.xml
@@ -5,7 +5,8 @@
<mapper namespace="com.jcdm.main.bs.orderScheduling.mapper.BsOrderSchedulingMapper">
<resultMap type="BsOrderScheduling" id="BsOrderSchedulingResult">
- <result property="orderNumber" column="order_number" />
+ <result property="id" column="id" />
+ <result property="orderNo" column="order_no" />
<result property="engineNo" column="engine_no" />
<result property="productType" column="product_type" />
<result property="model" column="model" />
@@ -16,20 +17,38 @@
<result property="whetherOrPrint" column="whether_or_print" />
<result property="report10" column="report_10" />
<result property="report20" column="report_20" />
- <result property="combinedBoxLaunch" column="combined_box_launch" />
- <result property="finalAssemblyOffline" column="final_assembly_offline" />
+ <result property="combinedBoxTime" column="combined_box_time" />
+ <result property="finalAssemblyTime" column="final_assembly_time" />
<result property="operator" column="operator" />
<result property="operateTime" column="operate_time" />
+ <result property="status" column="status" />
+ <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="createUser" column="create_user" />
+ <result property="createTime" column="create_time" />
+ <result property="updateUser" column="update_user" />
+ <result property="updateTime" column="update_time" />
+ <result property="remarks" column="remarks" />
+ <result property="report30" column="report_30" />
+ <result property="boxClosingOnlineTime" column="box_closing_online_time" />
+ <result property="closingBoxOfflineTime" column="closing_box_offline_time" />
+ <result property="finalAssemblyLaunchTime" column="final_assembly_launch_time" />
+ <result property="finalAssemblyOfflineTime" column="final_assembly_offline_time" />
+ <result property="cvtLaunchTime" column="cvt_launch_time" />
+ <result property="cvtOfflineTime" column="cvt_offline_time" />
+
</resultMap>
<sql id="selectBsOrderSchedulingVo">
- select order_number, engine_no, product_type, model, production_status, working_hours, current_workstation, quality_status, whether_or_print, report_10, report_20, combined_box_launch, final_assembly_offline, operator, operate_time from bs_order_scheduling
+ 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>
<select id="selectBsOrderSchedulingList" parameterType="BsOrderScheduling" resultMap="BsOrderSchedulingResult">
<include refid="selectBsOrderSchedulingVo"/>
<where>
- <if test="orderNumber != null and orderNumber != ''"> and order_number = #{orderNumber}</if>
+ <if test="orderNo != null and orderNo != ''"> and order_no = #{orderNo}</if>
<if test="engineNo != null and engineNo != ''"> and engine_no = #{engineNo}</if>
<if test="productType != null and productType != ''"> and product_type = #{productType}</if>
<if test="model != null and model != ''"> and model = #{model}</if>
@@ -40,22 +59,73 @@
<if test="whetherOrPrint != null and whetherOrPrint != ''"> and whether_or_print = #{whetherOrPrint}</if>
<if test="report10 != null and report10 != ''"> and report_10 = #{report10}</if>
<if test="report20 != null and report20 != ''"> and report_20 = #{report20}</if>
- <if test="combinedBoxLaunch != null and combinedBoxLaunch != ''"> and combined_box_launch = #{combinedBoxLaunch}</if>
- <if test="finalAssemblyOffline != null and finalAssemblyOffline != ''"> and final_assembly_offline = #{finalAssemblyOffline}</if>
+ <if test="combinedBoxTime != null and combinedBoxTime != ''"> and combined_box_time = #{combinedBoxTime}</if>
+ <if test="finalAssemblyTime != null and finalAssemblyTime != ''"> and final_assembly_time = #{finalAssemblyTime}</if>
<if test="operator != null and operator != ''"> and operator = #{operator}</if>
<if test="operateTime != null and operateTime != ''"> and operate_time = #{operateTime}</if>
+ <if test="status != null and status != ''"> and status = #{status}</if>
+ <if test="spareField1 != null and spareField1 != ''"> and spare_field_1 = #{spareField1}</if>
+ <if test="spareField2 != null and spareField2 != ''"> and spare_field_2 = #{spareField2}</if>
+ <if test="spareField3 != null and spareField3 != ''"> and spare_field_3 = #{spareField3}</if>
+ <if test="spareField4 != null and spareField4 != ''"> and spare_field_4 = #{spareField4}</if>
+ <if test="createUser != null and createUser != ''"> and create_user = #{createUser}</if>
+ <if test="updateUser != null and updateUser != ''"> and update_user = #{updateUser}</if>
+ <if test="remarks != null and remarks != ''"> and remarks = #{remarks}</if>
+ <if test="report30 != null and report30 != ''"> and report_30 = #{report30}</if>
+ <if test="dateConditions != null and dateConditions != ''"> and operate_time BETWEEN #{startTime} AND #{endTime}</if>
+ <if test="boxClosingOnlineTime != null and boxClosingOnlineTime != ''"> and box_closing_online_time = #{boxClosingOnlineTime}</if>
+ <if test="closingBoxOfflineTime != null and closingBoxOfflineTime != ''"> and closing_box_offline_time = #{closingBoxOfflineTime}</if>
+ <if test="finalAssemblyLaunchTime != null and finalAssemblyLaunchTime != ''"> and final_assembly_launch_time = #{finalAssemblyLaunchTime}</if>
+ <if test="finalAssemblyOfflineTime != null and finalAssemblyOfflineTime != ''"> and final_assembly_offline_time = #{finalAssemblyOfflineTime}</if>
+ <if test="cvtLaunchTime != null and cvtLaunchTime != ''"> and cvt_launch_time = #{cvtLaunchTime}</if>
+ <if test="cvtOfflineTime != null and cvtOfflineTime != ''"> and cvt_offline_time = #{cvtOfflineTime}</if>
+ <if test="startTime != null and startTime != '' and endTime != null and endTime != ''"> and cvt_offline_time between #{startTime} and #{endTime}</if>
+ <if test="engineNoList != null and engineNoList.size() > 0">
+ and engine_no in
+ <foreach collection="engineNoList" open="(" close=")" separator="," item="engine">
+ #{engine}
+ </foreach>
+ </if>
+ <if test="engineNoListExcel != null and engineNoListExcel.size() > 0">
+ and engine_no in
+ <foreach collection="engineNoListExcel" open="(" close=")" separator="," item="engine">
+ #{engine}
+ </foreach>
+ </if>
</where>
</select>
- <select id="selectBsOrderSchedulingByOrderNumber" parameterType="String" resultMap="BsOrderSchedulingResult">
+ <select id="selectBsOrderSchedulingById" parameterType="Long" resultMap="BsOrderSchedulingResult">
<include refid="selectBsOrderSchedulingVo"/>
- where order_number = #{orderNumber}
+ where id = #{id}
</select>
-
- <insert id="insertBsOrderScheduling" parameterType="BsOrderScheduling">
+
+ <select id="selectBsOrderSchedulingSNCode" parameterType="String" resultMap="BsOrderSchedulingResult">
+ <include refid="selectBsOrderSchedulingVo"/>
+ where engine_no = #{sncode}
+ </select>
+
+ <select id="getPrepareOnlineList" resultType="com.jcdm.main.bs.orderScheduling.domain.BsOrderScheduling">
+ select bos.* from bs_order_scheduling bos
+ <where>
+ <if test="prepareOnlineQuery.orderNo != null and prepareOnlineQuery.orderNo != '' ">
+ and bos.order_no = #{prepareOnlineQuery.orderNo}
+ </if>
+ <if test="prepareOnlineQuery.engineNo != null and prepareOnlineQuery.engineNo != '' ">
+ and bos.engine_no = #{prepareOnlineQuery.engineNo}
+ </if>
+ </where>
+ </select>
+ <select id="getProduceNumToday" resultType="java.lang.Integer">
+ select count(*) from bs_order_scheduling
+ where ${queryField} BETWEEN #{startTime} AND #{endTime}
+ </select>
+
+
+ <insert id="insertBsOrderScheduling" parameterType="BsOrderScheduling" useGeneratedKeys="true" keyProperty="id">
insert into bs_order_scheduling
<trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="orderNumber != null">order_number,</if>
+ <if test="orderNo != null">order_no,</if>
<if test="engineNo != null">engine_no,</if>
<if test="productType != null">product_type,</if>
<if test="model != null">model,</if>
@@ -66,13 +136,30 @@
<if test="whetherOrPrint != null">whether_or_print,</if>
<if test="report10 != null">report_10,</if>
<if test="report20 != null">report_20,</if>
- <if test="combinedBoxLaunch != null">combined_box_launch,</if>
- <if test="finalAssemblyOffline != null">final_assembly_offline,</if>
+ <if test="combinedBoxTime != null">combined_box_time,</if>
+ <if test="finalAssemblyTime != null">final_assembly_time,</if>
<if test="operator != null">operator,</if>
<if test="operateTime != null">operate_time,</if>
+ <if test="status != null">status,</if>
+ <if test="spareField1 != null">spare_field_1,</if>
+ <if test="spareField2 != null">spare_field_2,</if>
+ <if test="spareField3 != null">spare_field_3,</if>
+ <if test="spareField4 != null">spare_field_4,</if>
+ <if test="createUser != null">create_user,</if>
+ <if test="createTime != null">create_time,</if>
+ <if test="updateUser != null">update_user,</if>
+ <if test="updateTime != null">update_time,</if>
+ <if test="remarks != null">remarks,</if>
+ <if test="report30 != null">report_30,</if>
+ <if test="boxClosingOnlineTime != null">box_closing_online_time,</if>
+ <if test="closingBoxOfflineTime != null">closing_box_offline_time,</if>
+ <if test="finalAssemblyLaunchTime != null">final_assembly_launch_time,</if>
+ <if test="finalAssemblyOfflineTime != null">final_assembly_offline_time,</if>
+ <if test="cvtLaunchTime != null">cvt_launch_time,</if>
+ <if test="cvtOfflineTime != null">cvt_offline_time,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="orderNumber != null">#{orderNumber},</if>
+ <if test="orderNo != null">#{orderNo},</if>
<if test="engineNo != null">#{engineNo},</if>
<if test="productType != null">#{productType},</if>
<if test="model != null">#{model},</if>
@@ -83,16 +170,35 @@
<if test="whetherOrPrint != null">#{whetherOrPrint},</if>
<if test="report10 != null">#{report10},</if>
<if test="report20 != null">#{report20},</if>
- <if test="combinedBoxLaunch != null">#{combinedBoxLaunch},</if>
- <if test="finalAssemblyOffline != null">#{finalAssemblyOffline},</if>
+ <if test="combinedBoxTime != null">#{combinedBoxTime},</if>
+ <if test="finalAssemblyTime != null">#{finalAssemblyTime},</if>
<if test="operator != null">#{operator},</if>
<if test="operateTime != null">#{operateTime},</if>
- </trim>
+ <if test="status != null">#{status},</if>
+ <if test="spareField1 != null">#{spareField1},</if>
+ <if test="spareField2 != null">#{spareField2},</if>
+ <if test="spareField3 != null">#{spareField3},</if>
+ <if test="spareField4 != null">#{spareField4},</if>
+ <if test="createUser != null">#{createUser},</if>
+ <if test="createTime != null">#{createTime},</if>
+ <if test="updateUser != null">#{updateUser},</if>
+ <if test="updateTime != null">#{updateTime},</if>
+ <if test="remarks != null">#{remarks},</if>
+ <if test="report30 != null">#{report30},</if>
+ <if test="boxClosingOnlineTime != null">#{boxClosingOnlineTime},</if>
+ <if test="closingBoxOfflineTime != null">#{closingBoxOfflineTime},</if>
+ <if test="finalAssemblyLaunchTime != null">#{finalAssemblyLaunchTime},</if>
+ <if test="finalAssemblyOfflineTime != null">#{finalAssemblyOfflineTime},</if>
+ <if test="cvtLaunchTime != null">#{cvtLaunchTime},</if>
+ <if test="cvtOfflineTime != null">#{cvtOfflineTime},</if>
+
+ </trim>
</insert>
<update id="updateBsOrderScheduling" parameterType="BsOrderScheduling">
update bs_order_scheduling
<trim prefix="SET" suffixOverrides=",">
+ <if test="orderNo != null">order_no = #{orderNo},</if>
<if test="engineNo != null">engine_no = #{engineNo},</if>
<if test="productType != null">product_type = #{productType},</if>
<if test="model != null">model = #{model},</if>
@@ -103,22 +209,40 @@
<if test="whetherOrPrint != null">whether_or_print = #{whetherOrPrint},</if>
<if test="report10 != null">report_10 = #{report10},</if>
<if test="report20 != null">report_20 = #{report20},</if>
- <if test="combinedBoxLaunch != null">combined_box_launch = #{combinedBoxLaunch},</if>
- <if test="finalAssemblyOffline != null">final_assembly_offline = #{finalAssemblyOffline},</if>
+ <if test="combinedBoxTime != null">combined_box_time = #{combinedBoxTime},</if>
+ <if test="finalAssemblyTime != null">final_assembly_time = #{finalAssemblyTime},</if>
<if test="operator != null">operator = #{operator},</if>
<if test="operateTime != null">operate_time = #{operateTime},</if>
+ <if test="status != null">status = #{status},</if>
+ <if test="spareField1 != null">spare_field_1 = #{spareField1},</if>
+ <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="createUser != null">create_user = #{createUser},</if>
+ <if test="createTime != null">create_time = #{createTime},</if>
+ <if test="updateUser != null">update_user = #{updateUser},</if>
+ <if test="updateTime != null">update_time = #{updateTime},</if>
+ <if test="remarks != null">remarks = #{remarks},</if>
+ <if test="report30 != null">report_30 = #{report30},</if>
+ <if test="boxClosingOnlineTime != null">box_closing_online_time = #{boxClosingOnlineTime},</if>
+ <if test="closingBoxOfflineTime != null">closing_box_offline_time = #{closingBoxOfflineTime},</if>
+ <if test="finalAssemblyLaunchTime != null">final_assembly_launch_time = #{finalAssemblyLaunchTime},</if>
+ <if test="finalAssemblyOfflineTime != null">final_assembly_offline_time = #{finalAssemblyOfflineTime},</if>
+ <if test="cvtLaunchTime != null">cvt_launch_time = #{cvtLaunchTime},</if>
+ <if test="cvtOfflineTime != null">cvt_offline_time = #{cvtOfflineTime},</if>
+
</trim>
- where order_number = #{orderNumber}
+ where id = #{id}
</update>
- <delete id="deleteBsOrderSchedulingByOrderNumber" parameterType="String">
- delete from bs_order_scheduling where order_number = #{orderNumber}
+ <delete id="deleteBsOrderSchedulingById" parameterType="Long">
+ delete from bs_order_scheduling where id = #{id}
</delete>
- <delete id="deleteBsOrderSchedulingByOrderNumbers" parameterType="String">
- delete from bs_order_scheduling where order_number in
- <foreach item="orderNumber" collection="array" open="(" separator="," close=")">
- #{orderNumber}
+ <delete id="deleteBsOrderSchedulingByIds" parameterType="String">
+ delete from bs_order_scheduling where id in
+ <foreach item="id" collection="array" open="(" separator="," close=")">
+ #{id}
</foreach>
</delete>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3