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/ManufactureSchedulingMapper.xml | 2 +-
1 files changed, 1 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..c837fdb 100644
--- a/production-server/src/main/resources/mapper/ManufactureSchedulingMapper.xml
+++ b/production-server/src/main/resources/mapper/ManufactureSchedulingMapper.xml
@@ -30,7 +30,7 @@
</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`
--
Gitblit v1.9.3