rakor
/
wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pdi部件绑定修改

This commit is contained in:
yf001217 2026-06-09 17:04:28 +08:00
parent 7fa4af4b23
commit 7d45e53580
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPdiComponentBindingControllerService.java
View File

@ -129,7 +129,10 @@ public class QmsPdiComponentBindingControllerService {
boundComponentStatusKeys.add(componentStatusKey(binding.getPdiComponentId(), binding.getStatus())); 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) -> { inspectionItemMap.forEach((key, inspectionItems) -> {
if (boundComponentStatusKeys.contains(key)) { if (boundComponentStatusKeys.contains(key)) {

9
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsPdiComponentBindingSaveQO.java
View File

@ -1,5 +1,7 @@
package com.nflg.wms.common.pojo.qo; 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.Valid;
import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
@ -17,6 +19,7 @@ public class QmsPdiComponentBindingSaveQO {
* PDI标准检测规则ID * PDI标准检测规则ID
*/ */
@NotNull(message = "PDI标准检测规则ID不能为空") @NotNull(message = "PDI标准检测规则ID不能为空")
@JsonAlias("pdi_detection_rules_id")
private Long pdiDetectionRulesId; private Long pdiDetectionRulesId;
/** /**
@ -33,6 +36,7 @@ public class QmsPdiComponentBindingSaveQO {
* 上传图片的ID * 上传图片的ID
*/ */
@NotNull(message = "上传图片ID不能为空") @NotNull(message = "上传图片ID不能为空")
@JsonAlias("upload_image_id")
private Long uploadImageId; private Long uploadImageId;
/** /**
@ -48,16 +52,21 @@ public class QmsPdiComponentBindingSaveQO {
/** /**
* 部件ID * 部件ID
*/ */
@JsonAlias("pdi_component_id")
private Long pdiComponentId; private Long pdiComponentId;
/** /**
* x轴坐标 * x轴坐标
*/ */
@JsonProperty("xCoordinatePoint")
@JsonAlias({"x_coordinate_point", "XCoordinatePoint"})
private String xCoordinatePoint; private String xCoordinatePoint;
/** /**
* y轴坐标 * y轴坐标
*/ */
@JsonProperty("yCoordinatePoint")
@JsonAlias({"y_coordinate_point", "YCoordinatePoint"})
private String yCoordinatePoint; private String yCoordinatePoint;
/** /**