From 20956b0f05f81ca47cf6c3e8f9b3b426e9cfd035 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期日, 24 九月 2023 21:54:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
production-server/src/main/resources/mapper/ManufactureOrderMapper.xml | 46 +++++++++-------------------------------------
1 files changed, 9 insertions(+), 37 deletions(-)
diff --git a/production-server/src/main/resources/mapper/ManufactureOrderMapper.xml b/production-server/src/main/resources/mapper/ManufactureOrderMapper.xml
index 945a533..c566229 100644
--- a/production-server/src/main/resources/mapper/ManufactureOrderMapper.xml
+++ b/production-server/src/main/resources/mapper/ManufactureOrderMapper.xml
@@ -12,12 +12,12 @@
specifications,
unit,
number,
- DATE_FORMAT(downTime, '%Y-%m-%d') '涓嬪崟鏃ユ湡',
- DATE_FORMAT(delTime, '%Y-%m-%d') '浜よ揣鏃ユ湡',
- go_state,
- type
+ scheduled_production,
+ DATE_FORMAT(downTime, '%Y-%m-%d') downTime,
+ DATE_FORMAT(delTime, '%Y-%m-%d') delTime,
+ go_state
from mom_ocean.manufacture_order
- where state=1
+ where state = 1
<if test="downTime!=null and downTime!=''">
and downTime=#{downTime}
</if>
@@ -28,38 +28,9 @@
and customer_code like concat('%',#{customerCode},'%')
</if>
<if test="type!=null">
- and type=#{type}
+ and go_state=#{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
+ ORDER BY create_time DESC
</select>
<update id="deleteManufacture">
@@ -85,11 +56,12 @@
SELECT m.`order_code`, m.`name`, m.`id`
FROM manufacture_order m
WHERE m.`state` = 1
+ ORDER BY m.`create_time` DESC
</select>
<update id="updateManufacture">
UPDATE manufacture_order m
- SET m.`type` = 1, m.`go_state` = 0, m.`scheduled_production` = m.`scheduled_production` + #{schedulingNumber}
+ SET m.`go_state` = 0, m.`scheduled_production` = IFNULL(m.`scheduled_production`, 0) + #{schedulingNumber}
where m.id = #{manufactureOrderId}
</update>
</mapper>
--
Gitblit v1.9.3