From 7d45e535800a60cc8994eefb7d619ee1dbe932e6 Mon Sep 17 00:00:00 2001
From: yf001217 <834502597@qq.com>
Date: Tue, 9 Jun 2026 17:04:28 +0800
Subject: [PATCH] =?UTF-8?q?pdi=E9=83=A8=E4=BB=B6=E7=BB=91=E5=AE=9A?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/QmsPdiComponentBindingControllerService.java | 5 ++++-
 .../wms/common/pojo/qo/QmsPdiComponentBindingSaveQO.java | 9 +++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPdiComponentBindingControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPdiComponentBindingControllerService.java
index cfd0059c..f0758b41 100644
--- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPdiComponentBindingControllerService.java
+++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPdiComponentBindingControllerService.java
@@ -129,7 +129,10 @@ public class QmsPdiComponentBindingControllerService {
             boundComponentStatusKeys.add(componentStatusKey(binding.getPdiComponentId(), binding.getStatus()));
         }
 
-        vo.setBoundList(new ArrayList<>(boundImageMap.values()));
+        vo.setBoundList(boundImageMap.values().stream()
+                .sorted(Comparator.comparing(QmsPdiComponentBindingSearchVO.ImageBindingVO::getUploadImageId,
+                        Comparator.nullsLast(Long::compareTo)))
+                .collect(Collectors.toList()));
 
         inspectionItemMap.forEach((key, inspectionItems) -> {
             if (boundComponentStatusKeys.contains(key)) {
diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsPdiComponentBindingSaveQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsPdiComponentBindingSaveQO.java
index 482c5014..ab65458b 100644
--- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsPdiComponentBindingSaveQO.java
+++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsPdiComponentBindingSaveQO.java
@@ -1,5 +1,7 @@
 package com.nflg.wms.common.pojo.qo;
 
+import com.fasterxml.jackson.annotation.JsonAlias;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
@@ -17,6 +19,7 @@ public class QmsPdiComponentBindingSaveQO {
      * PDI标准检测规则ID
      */
     @NotNull(message = "PDI标准检测规则ID不能为空")
+    @JsonAlias("pdi_detection_rules_id")
     private Long pdiDetectionRulesId;
 
     /**
@@ -33,6 +36,7 @@ public class QmsPdiComponentBindingSaveQO {
          * 上传图片的ID
          */
         @NotNull(message = "上传图片ID不能为空")
+        @JsonAlias("upload_image_id")
         private Long uploadImageId;
 
         /**
@@ -48,16 +52,21 @@ public class QmsPdiComponentBindingSaveQO {
         /**
          * 部件ID
          */
+        @JsonAlias("pdi_component_id")
         private Long pdiComponentId;
 
         /**
          * x轴坐标
          */
+        @JsonProperty("xCoordinatePoint")
+        @JsonAlias({"x_coordinate_point", "XCoordinatePoint"})
         private String xCoordinatePoint;
 
         /**
          * y轴坐标
          */
+        @JsonProperty("yCoordinatePoint")
+        @JsonAlias({"y_coordinate_point", "YCoordinatePoint"})
         private String yCoordinatePoint;
 
         /**