From eec41baec6003ec443129bd1ae53ea2b2e5df4f3 Mon Sep 17 00:00:00 2001
From: hdy <1105738590@qq.com>
Date: 星期六, 20 一月 2024 13:35:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-main/src/main/resources/mapper/bs/orderScheduling/BsOrderSchedulingMapper.xml | 29 ++++++++++++++++++++++++++---
1 files changed, 26 insertions(+), 3 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 f906af9..d64a55c 100644
--- a/jcdm-main/src/main/resources/mapper/bs/orderScheduling/BsOrderSchedulingMapper.xml
+++ b/jcdm-main/src/main/resources/mapper/bs/orderScheduling/BsOrderSchedulingMapper.xml
@@ -31,10 +31,12 @@
<result property="updateUser" column="update_user" />
<result property="updateTime" column="update_time" />
<result property="remarks" column="remarks" />
+ <result property="report30" column="report_30" />
+
</resultMap>
<sql id="selectBsOrderSchedulingVo">
- 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 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 from bs_order_scheduling
</sql>
<select id="selectBsOrderSchedulingList" parameterType="BsOrderScheduling" resultMap="BsOrderSchedulingResult">
@@ -63,6 +65,10 @@
<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>
+
+
</where>
</select>
@@ -70,7 +76,19 @@
<include refid="selectBsOrderSchedulingVo"/>
where id = #{id}
</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>
+
+
<insert id="insertBsOrderScheduling" parameterType="BsOrderScheduling" useGeneratedKeys="true" keyProperty="id">
insert into bs_order_scheduling
<trim prefix="(" suffix=")" suffixOverrides=",">
@@ -99,6 +117,7 @@
<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>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="orderNo != null">#{orderNo},</if>
@@ -126,7 +145,9 @@
<if test="updateUser != null">#{updateUser},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="remarks != null">#{remarks},</if>
- </trim>
+ <if test="report30 != null">#{report30},</if>
+
+ </trim>
</insert>
<update id="updateBsOrderScheduling" parameterType="BsOrderScheduling">
@@ -157,6 +178,8 @@
<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>
+
</trim>
where id = #{id}
</update>
--
Gitblit v1.9.3