From 9b8cb7dc456009d9cf25699bc97834479d9396a4 Mon Sep 17 00:00:00 2001
From: wws <18630710203@163.com>
Date: Tue, 5 Dec 2023 09:28:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E6=98=BE=E7=A4=BA=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=A2=9E=E5=8A=A0=E8=AE=A1=E5=88=92=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/op/device/service/impl/EquOrderServiceImpl.java     | 6 ++++++
 .../src/main/resources/mapper/device/EquOrderMapper.xml     | 1 +
 2 files changed, 7 insertions(+)

diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquOrderServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquOrderServiceImpl.java
index c982cff2..a559228e 100644
--- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquOrderServiceImpl.java
+++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquOrderServiceImpl.java
@@ -149,6 +149,7 @@ public class EquOrderServiceImpl implements IEquOrderService {
 
         List<WorkCenter> workCenters = equPlanMapper.selectWorkCenter(factory);
 
+        // 设置工作中心
         for (EquOrder order : orderList) {
             for (WorkCenter center : workCenters) {
                 if (center.getFactoryCode().equals(order.getPlanWorkshop())) {
@@ -156,6 +157,11 @@ public class EquOrderServiceImpl implements IEquOrderService {
                 }
             }
             order.setEquipmentName(equOrderMapper.selectEquipmentNameByEquCode(order.getEquipmentCode()));
+            // 设置计划名称
+            String planName = equOrderMapper.selectPlanNameByPlanCode(order.getPlanCode());
+            if (planName!=null) {
+                order.setPlanName(planName);
+            }
         }
         return orderList;
     }
diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml
index 3a437cbd..ec811201 100644
--- a/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml
+++ b/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml
@@ -106,6 +106,7 @@
 			<if test="orderEndArrayEnd != null "> and #{orderEndArrayEnd} >= CONVERT(date,order_end)</if>
 			and del_flag = '0'
 		</where>
+		order by create_time desc
 	</select>
 
 	<select id="selectEquOrderByOrderCode" parameterType="String" resultMap="EquOrderResult">