From cf4ee87f1a34bd76fd2ddfdc4d5123712a403c33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=B5=B7=E8=88=AA?=
 <11918452+yang-haihang@user.noreply.gitee.com>
Date: Wed, 26 Feb 2025 11:40:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E6=A3=80=E6=9D=90=E6=97=B6=E7=9A=84orderNum=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E9=87=8D=E6=96=B0=E6=8E=92=E5=BA=8F=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EntrustmentIdentificationMaterialServiceImpl.java    | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentIdentificationMaterialServiceImpl.java b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentIdentificationMaterialServiceImpl.java
index 84378e2..9c494d0 100644
--- a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentIdentificationMaterialServiceImpl.java
+++ b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentIdentificationMaterialServiceImpl.java
@@ -1095,10 +1095,17 @@ public class EntrustmentIdentificationMaterialServiceImpl extends ServiceImpl<En
         if (this.removeById(id)) {
             String entrustId = entrustmentIdentificationMaterial.getEntrustmentId();
             Entrustment entrustment = entrustmentService.getById(entrustId);
-            List<EntrustmentIdentificationMaterial> materialList = this.list(Wrappers.<EntrustmentIdentificationMaterial>lambdaQuery().eq(EntrustmentIdentificationMaterial::getEntrustmentId, entrustId));
+            List<EntrustmentIdentificationMaterial> materialList = this.list(Wrappers.<EntrustmentIdentificationMaterial>lambdaQuery()
+                    .eq(EntrustmentIdentificationMaterial::getEntrustmentId, entrustId)
+                    .orderByAsc(EntrustmentIdentificationMaterial::getOrderNo));
+
             if (materialList != null && materialList.size() > 0) {
                 entrustment.setEntrustRequirement(entrustmentService.buildEntrustReq(materialList));
                 entrustmentService.updateById(entrustment);
+                for (int i = 0; i < materialList.size(); i++) {
+                    materialList.get(i).setOrderNo(i + 1);
+                }
+                this.updateBatchById(materialList);
             }
             return entrustmentIdentificationMaterial;
         } else {