From 3b7f72ee9c450955ecef1897d10d27e547f20476 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期五, 01 九月 2023 17:07:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
production-server/src/main/resources/mapper/ManufactureOrderMapper.xml | 67 +++++++++++++++++----------------
1 files changed, 34 insertions(+), 33 deletions(-)
diff --git a/production-server/src/main/resources/mapper/ManufactureOrderMapper.xml b/production-server/src/main/resources/mapper/ManufactureOrderMapper.xml
index 1e10873..3cbca96 100644
--- a/production-server/src/main/resources/mapper/ManufactureOrderMapper.xml
+++ b/production-server/src/main/resources/mapper/ManufactureOrderMapper.xml
@@ -12,10 +12,10 @@
specifications,
unit,
number,
- DATE_FORMAT(downTime, '%Y-%m-%d') '涓嬪崟鏃ユ湡',
- DATE_FORMAT(delTime, '%Y-%m-%d') '浜よ揣鏃ユ湡',
+ scheduled_production,
+ DATE_FORMAT(downTime, '%Y-%m-%d') downTime,
+ DATE_FORMAT(delTime, '%Y-%m-%d') delTime,
go_state,
- type
from mom_ocean.manufacture_order
where state=1
<if test="downTime!=null and downTime!=''">
@@ -31,34 +31,35 @@
and type=#{type}
</if>
</select>
- <!--鏌ョ湅鐢熶骇璁″垝-->
- <select id="selectAllPlan" resultType="java.util.Map">
- select order_code,
- name,
- specifications,
- unit,
- number,
- proname,
- saleman,
- downman,
- techname,
- DATE_FORMAT(start_time, '%Y-%m-%d') '璁″垝寮�濮嬫棩鏈�',
- DATE_FORMAT(end_time, '%Y-%m-%d') '璁″垝缁撴潫鏃ユ湡'
- from mom_ocean.manual_technology mt
- left join mom_ocean.manufacture_order mo
- on mt.manufacture_order_id = mo.id
- where mo.state=1
- and go_state=1
- and device_id=#{deviceId}
- <if test="orderCode!=null and orderCode!=''">
- and order_code like concat('%',#{orderCode},'%')
- </if>
- <if test="startTime!=null and startTime!=''">
- and DATE_FORMAT(start_time, '%Y-%m-%d')=#{startTime}
- </if>
- <if test="endTime!=null and endTime!=''">
- and DATE_FORMAT(end_time, '%Y-%m-%d')=#{endTime}
- </if>
- order by start_time
+
+ <update id="deleteManufacture">
+ UPDATE manufacture_order m
+ SET m.`state` = 0
+ WHERE m.id IN
+ <foreach collection="list" index="index" item="item" open="(" separator="," close=")">
+ #{item}
+ </foreach>
+ </update>
+
+ <resultMap id="towTreeFirstMap" type="map">
+ <id property="orderCode" column="order_code"/>
+ <collection property="children" javaType="list" resultMap="towTreeSecondMap"/>
+ </resultMap>
+
+ <resultMap id="towTreeSecondMap" type="map">
+ <id property="manufactureId" column="id"/>
+ <result property="manufactureName" column="name"/>
+ </resultMap>
+
+ <select id="towTree" resultMap="towTreeFirstMap">
+ SELECT m.`order_code`, m.`name`, m.`id`
+ FROM manufacture_order m
+ WHERE m.`state` = 1
</select>
-</mapper>
\ No newline at end of file
+
+ <update id="updateManufacture">
+ UPDATE manufacture_order m
+ SET m.`go_state` = 0, m.`scheduled_production` = IFNULL(m.`scheduled_production`, 0) + #{schedulingNumber}
+ where m.id = #{manufactureOrderId}
+ </update>
+</mapper>
--
Gitblit v1.9.3