From e2c14ffb0a6237bb5c397f5d0baaa4fa70cfe3b0 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期一, 11 九月 2023 11:20:01 +0800
Subject: [PATCH] MOM系统-9-11
---
production-server/src/main/resources/mapper/ManufactureSchedulingMapper.xml | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/production-server/src/main/resources/mapper/ManufactureSchedulingMapper.xml b/production-server/src/main/resources/mapper/ManufactureSchedulingMapper.xml
index 0e292c0..e946e8a 100644
--- a/production-server/src/main/resources/mapper/ManufactureSchedulingMapper.xml
+++ b/production-server/src/main/resources/mapper/ManufactureSchedulingMapper.xml
@@ -9,6 +9,7 @@
FROM manufacture_scheduling m
WHERE m.`manufacture_order_id` = 3
AND m.`state` = 1
+ ORDER BY m.`create_time` DESC
</select>
<select id="selectProduceTable" resultType="map">
@@ -18,6 +19,7 @@
WHERE m.`manufacture_order_id` = #{manOrdId}
AND m.`manufacture_order_id` = o.`id`
AND m.`state` = 1
+ AND m.`go_state` = 1
<if test="productName != null and productName != ''">
AND o.`name` LIKE CONCAT('%', #{productName}, '%')
</if>
@@ -27,13 +29,24 @@
<if test="endTime != null and endTime != ''">
AND m.`end_time` <![CDATA[ <= ]]> #{endTime}
</if>
+ ORDER BY m.`create_time` DESC
</select>
<select id="sePros" resultType="map">
- SELECT s.`scheduled`, o.`order_code`, o.`customer_code`, o.`name`, o.`specifications`, o.`unit`,
+ SELECT o.`id`, s.`scheduled`, o.`order_code`, o.`customer_code`, o.`name`, o.`specifications`, o.`unit`,
DATE_FORMAT(o.`downTime`, '%Y-%m-%d') downTime, DATE_FORMAT(o.`delTime`, '%Y-%m-%d') delTime
FROM manufacture_scheduling s, manufacture_order o
WHERE s.`manufacture_order_id` = o.`id`
AND s.`id` = #{schedulingId}
+ ORDER BY s.`create_time` DESC
+ </select>
+
+ <select id="reportSelectScheduling" resultType="map">
+ SELECT m.`id`, o.`customer_code`, o.`proname`, o.`name`, o.`specifications`, o.`unit`, m.`scheduled`
+ FROM manufacture_scheduling m, manufacture_order o
+ WHERE m.`state` = 1
+ AND m.`manufacture_order_id` = o.`id`
+ AND m.`go_state` = 1
+ ORDER BY m.`create_time` DESC
</select>
</mapper>
--
Gitblit v1.9.3