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

pdi检验管理功能修改 

新建工单功能添加
This commit is contained in:
funny 2026-04-28 18:34:46 +08:00
parent fa51777d6f
commit 20bb9b761a
6 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPdiDetectionRulesControllerService.java
View File

@ -228,8 +228,8 @@ public class QmsPdiDetectionRulesControllerService {
.setInspectionImage(item.getInspectionImage()) .setInspectionImage(item.getInspectionImage())
.setStatus(item.getStatus()) .setStatus(item.getStatus())
.setSort(item.getSort()) .setSort(item.getSort())
.setSetBy(operator) .setCreateBy(operator)
.setSetTime(now)) .setCreateTime(now))
.collect(java.util.stream.Collectors.toList()); .collect(java.util.stream.Collectors.toList());
statusItemService.saveBatch(newStatusItems); statusItemService.saveBatch(newStatusItems);
} }

16
nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPdiStatusItemControllerService.java
View File

@ -84,8 +84,8 @@ public class QmsPdiStatusItemControllerService {
.setInspectionImage(request.getInspectionImage()) .setInspectionImage(request.getInspectionImage())
.setStatus(request.getStatus()) .setStatus(request.getStatus())
.setSort(1) // 新数据sort=1 .setSort(1) // 新数据sort=1
.setSetBy(operator) .setCreateBy(operator)
.setSetTime(now); .setCreateTime(now);
statusItemService.save(entity); statusItemService.save(entity);
markMaintained(request.getDetectionRulesId()); markMaintained(request.getDetectionRulesId());
} }
@ -104,8 +104,8 @@ public class QmsPdiStatusItemControllerService {
String operator = UserUtil.getUserName(); String operator = UserUtil.getUserName();
var updateChain = statusItemService.lambdaUpdate() var updateChain = statusItemService.lambdaUpdate()
.eq(QmsPdiDetectionRulesStatusItem::getId, request.getId()) .eq(QmsPdiDetectionRulesStatusItem::getId, request.getId())
.set(QmsPdiDetectionRulesStatusItem::getSetBy, operator) .set(QmsPdiDetectionRulesStatusItem::getCreateBy, operator)
.set(QmsPdiDetectionRulesStatusItem::getSetTime, LocalDateTime.now()); .set(QmsPdiDetectionRulesStatusItem::getCreateTime, LocalDateTime.now());
if (StrUtil.isNotBlank(request.getComponentsDes())) { if (StrUtil.isNotBlank(request.getComponentsDes())) {
updateChain.set(QmsPdiDetectionRulesStatusItem::getComponentsDes, request.getComponentsDes()); updateChain.set(QmsPdiDetectionRulesStatusItem::getComponentsDes, request.getComponentsDes());
} }
@ -201,8 +201,8 @@ public class QmsPdiStatusItemControllerService {
.setInspectionImage(dto.getInspectionImage()) .setInspectionImage(dto.getInspectionImage())
.setSort(dto.getSort()) .setSort(dto.getSort())
.setStatus(status) .setStatus(status)
.setSetBy(operator) .setCreateBy(operator)
.setSetTime(now); .setCreateTime(now);
}) })
.collect(Collectors.toList()); .collect(Collectors.toList());
if (CollectionUtil.isEmpty(entities)) { if (CollectionUtil.isEmpty(entities)) {
@ -254,8 +254,8 @@ public class QmsPdiStatusItemControllerService {
vo.setInspectionImage(item.getInspectionImage()); vo.setInspectionImage(item.getInspectionImage());
vo.setStatus(item.getStatus()); vo.setStatus(item.getStatus());
vo.setSort(item.getSort()); vo.setSort(item.getSort());
vo.setSetBy(item.getSetBy()); vo.setCreateBy(item.getCreateBy());
vo.setSetTime(item.getSetTime()); vo.setCreateTime(item.getCreateTime());
return vo; return vo;
} }

8
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/QmsPdiStatusItemExportDTO.java
View File

@ -25,9 +25,9 @@ public class QmsPdiStatusItemExportDTO {
@ExcelColumn("状态") @ExcelColumn("状态")
private String statusName; private String statusName;
@ExcelColumn("设置人") @ExcelColumn("创建人")
private String setBy; private String createBy;
@ExcelColumn("设置时间") @ExcelColumn("创建时间")
private LocalDateTime setTime; private LocalDateTime createTime;
} }

8
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsPdiStatusItemGroupVO.java
View File

@ -63,13 +63,13 @@ public class QmsPdiStatusItemGroupVO {
private Integer sort; private Integer sort;
/** /**
* 设置人 * 创建人
*/ */
private String setBy; private String createBy;
/** /**
* 设置时间 * 创建时间
*/ */
private LocalDateTime setTime; private LocalDateTime createTime;
} }
} }

8
nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsPdiDetectionRulesStatusItem.java
View File

@ -57,12 +57,12 @@ public class QmsPdiDetectionRulesStatusItem implements Serializable {
private Integer sort; private Integer sort;
/** /**
* 设置人 * 创建人
*/ */
private String setBy; private String createBy;
/** /**
* 设置时间 * 创建时间
*/ */
private LocalDateTime setTime; private LocalDateTime createTime;
} }

4
nflg-wms-repository/src/main/resources/mapper/QmsPdiDetectionRulesStatusItemMapper.xml
View File

@ -9,8 +9,8 @@
s.inspection_content, s.inspection_content,
s.inspection_image, s.inspection_image,
CASE s.status WHEN 0 THEN '静态' WHEN 1 THEN '动态' WHEN 2 THEN '特殊' ELSE '' END AS status_name, CASE s.status WHEN 0 THEN '静态' WHEN 1 THEN '动态' WHEN 2 THEN '特殊' ELSE '' END AS status_name,
s.set_by, s.create_by,
s.set_time s.create_time
FROM qms_pdi_detection_rules_status_item s FROM qms_pdi_detection_rules_status_item s
WHERE s.detection_rules_id = #{detectionRulesId} WHERE s.detection_rules_id = #{detectionRulesId}
AND s.status IN AND s.status IN