From dd8464903f71c5c17de0b6a14a238971570ffac2 Mon Sep 17 00:00:00 2001
From: gsz <fightgoo@qq.com>
Date: Fri, 20 Sep 2024 15:45:03 +0800
Subject: [PATCH] =?UTF-8?q?43172=20=E7=82=B9=E6=A3=80=E4=B8=BB=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E4=B8=BB=E8=A1=A8=E5=AF=BC=E5=85=A5=E5=92=8C=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=97=B6=EF=BC=8C=E5=9F=BA=E4=BA=8E=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../apiservice/serviceimpl/base/MesEquipmentSpotCheckService.java  | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesEquipmentSpotCheckService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesEquipmentSpotCheckService.java
index aeba880..1550550 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesEquipmentSpotCheckService.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesEquipmentSpotCheckService.java
@@ -23,7 +23,13 @@ public class MesEquipmentSpotCheckService extends BaseMesService<MesEquipmentSpo
         DdlPreparedPack.getStringLikerPack(bean.getSpotCheckName(), "spotCheckName", packBean);
         DdlPreparedPack.getStringEqualPack(bean.getWorkCenterCode(), "workCenterCode", packBean);
         DdlPreparedPack.getStringEqualPack(bean.getWorkCellCode(), "workCellCode", packBean);
+        DdlPreparedPack.getStringEqualPack(bean.getEquipCode(), "equipCode", packBean);
         DdlPreparedPack.getNumEqualPack(bean.getSpotCheckOrderType(), "spotCheckOrderType", packBean);
+        //43172 点检主数据主表导入和新增时，基于设备代码排序
+        DdlPreparedPack.getOrderByPack(
+                new Object[]{CommonEnumUtil.ASC_OR_DESC.ASC.getValue(), CommonEnumUtil.ASC_OR_DESC.DESC.getValue()},
+                new String[]{"equipCode", "createDatetime"}, packBean);
+
     }
 
     protected void onInsertBean(MesEquipmentSpotCheck item) {
@@ -60,6 +66,7 @@ public class MesEquipmentSpotCheckService extends BaseMesService<MesEquipmentSpo
                     .build();
         }
     }
+
     @Override
     public void validateImport(List<MesEquipmentSpotCheck> beanList) {