From 91ab1a15515c4c213b2ac4f777a7f20c3d0d59ad Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 28 三月 2025 13:49:53 +0800
Subject: [PATCH] 一个订单在每个站点检验都需要扫码入库报检,在中间站点复核继续试验之后默认自动将样品出库,且在列表中也不需要再展示出来,到最后一步复核结束反而是需要手动去出库不能自动出库,且出库之后也不需要在页面展示
---
cnas-process/src/main/java/com/yuanchu/mom/service/impl/QualitySuperviseServiceImpl.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/cnas-process/src/main/java/com/yuanchu/mom/service/impl/QualitySuperviseServiceImpl.java b/cnas-process/src/main/java/com/yuanchu/mom/service/impl/QualitySuperviseServiceImpl.java
index 9463f93..c4defcb 100644
--- a/cnas-process/src/main/java/com/yuanchu/mom/service/impl/QualitySuperviseServiceImpl.java
+++ b/cnas-process/src/main/java/com/yuanchu/mom/service/impl/QualitySuperviseServiceImpl.java
@@ -17,6 +17,7 @@
import com.yuanchu.mom.dto.QualitySuperviseDetailsAccordingDto;
import com.yuanchu.mom.dto.QualitySuperviseDetailsCorrectDto;
import com.yuanchu.mom.dto.QualitySuperviseDetailsDto;
+import com.yuanchu.mom.dto.QualitySuperviseDto;
import com.yuanchu.mom.excel.QualitySuperviseDetailsUpload;
import com.yuanchu.mom.exception.ErrorException;
import com.yuanchu.mom.mapper.*;
@@ -114,8 +115,7 @@
StringUtils.isNotBlank(detailsUpload.getSupervisePurpose()) &&
StringUtils.isNotBlank(detailsUpload.getSuperviseProject()) &&
StringUtils.isNotBlank(detailsUpload.getSupervisee()) &&
- StringUtils.isNotBlank(detailsUpload.getSuperviseReason()) &&
- StringUtils.isNotBlank(detailsUpload.getRemark())) {
+ StringUtils.isNotBlank(detailsUpload.getSuperviseReason())) {
// 瀵硅薄澶嶅埗
QualitySuperviseDetails superviseDetails = new QualitySuperviseDetails();
BeanUtils.copyProperties(detailsUpload, superviseDetails);
@@ -146,9 +146,11 @@
public boolean ratifyQualitySupervise(QualitySupervise qualitySupervise) {
// 褰撳墠鐧诲綍鐢ㄦ埛
Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
+ User user = userMapper.selectById(userId);
baseMapper.update(null, Wrappers.<QualitySupervise>lambdaUpdate()
.eq(QualitySupervise::getSuperviseId, qualitySupervise.getSuperviseId())
.set(QualitySupervise::getRatifyUserId, userId)
+ .set(QualitySupervise::getRatifyUserName, user.getName())
.set(QualitySupervise::getRatifyRemark, qualitySupervise.getRatifyRemark())
.set(QualitySupervise::getRatifyStatus, qualitySupervise.getRatifyStatus())
.set(QualitySupervise::getRatifyTime, LocalDateTime.now())
@@ -163,7 +165,7 @@
* @return
*/
@Override
- public IPage<QualitySupervise> pageQualitySupervise(Page page, QualitySupervise qualitySupervise) {
+ public IPage<QualitySuperviseDto> pageQualitySupervise(Page page, QualitySupervise qualitySupervise) {
return baseMapper.pageQualitySupervise(page, QueryWrappers.queryWrappers(qualitySupervise));
}
--
Gitblit v1.9.3