From 3990ae574c221e3764ce9cbc2e4e3eb71b7b1b52 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期六, 24 十月 2026 23:41:23 +0800
Subject: [PATCH] fix(mes): 修复批次正反向追溯链路
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pd/techconfirm/ProductTechConfirmMapper.java | 68 ++++++++++++++++++++++++++++++++++
1 files changed, 68 insertions(+), 0 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pd/techconfirm/ProductTechConfirmMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pd/techconfirm/ProductTechConfirmMapper.java
index befbb93..477e20b 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pd/techconfirm/ProductTechConfirmMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pd/techconfirm/ProductTechConfirmMapper.java
@@ -5,7 +5,11 @@
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.module.mes.controller.admin.pd.techconfirm.vo.ProductTechConfirmPageReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pd.techconfirm.ProductTechConfirmDO;
+import cn.iocoder.yudao.module.mes.enums.pd.MesPdTechConfirmStatusEnum;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import org.apache.ibatis.annotations.Mapper;
+
+import java.time.LocalDateTime;
@Mapper
public interface ProductTechConfirmMapper extends BaseMapperX<ProductTechConfirmDO> {
@@ -20,4 +24,68 @@
.orderByDesc(ProductTechConfirmDO::getId));
}
+ default ProductTechConfirmDO selectByConfirmNo(String confirmNo) {
+ return selectOne(ProductTechConfirmDO::getConfirmNo, confirmNo);
+ }
+
+ /**
+ * 鎻愪氦瀹℃牳锛氱疆涓哄緟瀹℃牳锛屽苟娓呯┖涓婁竴杞鏍哥粨鏋�
+ *
+ * 涔嬫墍浠ョ敤 UpdateWrapper 鑰岄潪 updateById锛歁yBatis-Plus 榛樿鐨勫瓧娈垫洿鏂扮瓥鐣ヤ細蹇界暐 null锛�
+ * 鐩存帴 updateById 鏃犳硶鎶婂鏍镐笉閫氳繃鍚庢畫鐣欑殑瀹℃牳浜恒�佸鏍告椂闂淬�佸鏍告剰瑙佺湡姝ｆ竻绌恒��
+ *
+ * @param id 缂栧彿
+ * @param status 鐩爣鐘舵�侊紙寰呭鏍革級
+ * @return 褰卞搷琛屾暟
+ */
+ default int submitAndResetAuditInfo(Long id, Integer status) {
+ return update(null, new LambdaUpdateWrapper<ProductTechConfirmDO>()
+ .eq(ProductTechConfirmDO::getId, id)
+ .set(ProductTechConfirmDO::getStatus, status)
+ .set(ProductTechConfirmDO::getReviewerId, null)
+ .set(ProductTechConfirmDO::getReviewerName, null)
+ .set(ProductTechConfirmDO::getReviewTime, null)
+ .set(ProductTechConfirmDO::getReviewRemark, null));
+ }
+
+ /**
+ * 瀹℃牳锛氬啓鍏ュ鏍哥粨鏋溿�佸鏍镐汉涓庡鏍告剰瑙�
+ *
+ * reviewRemark 鍏佽涓� null锛堝鏍搁�氳繃鏃舵剰瑙佸彲閫夛級锛屾晠鍚屾牱浣跨敤 UpdateWrapper 鐩村啓銆�
+ *
+ * @param id 缂栧彿
+ * @param status 鐩爣鐘舵�侊紙宸插鏍� / 瀹℃牳涓嶉�氳繃锛�
+ * @param reviewerId 瀹℃牳浜虹紪鍙�
+ * @param reviewerName 瀹℃牳浜哄鍚�
+ * @param reviewRemark 瀹℃牳鎰忚
+ * @return 褰卞搷琛屾暟
+ */
+ default int auditTechConfirm(Long id, Integer status, Long reviewerId,
+ String reviewerName, String reviewRemark) {
+ return update(null, new LambdaUpdateWrapper<ProductTechConfirmDO>()
+ .eq(ProductTechConfirmDO::getId, id)
+ .set(ProductTechConfirmDO::getStatus, status)
+ .set(ProductTechConfirmDO::getReviewerId, reviewerId)
+ .set(ProductTechConfirmDO::getReviewerName, reviewerName)
+ .set(ProductTechConfirmDO::getReviewTime, LocalDateTime.now())
+ .set(ProductTechConfirmDO::getReviewRemark, reviewRemark));
+ }
+
+ /**
+ * BPM 瀹℃壒缁撴灉鍥炲啓锛氫粎褰撳崟鎹粛澶勪簬寰呭鏍告椂鏇存柊锛岄伩鍏嶉噸澶� / 杩囨湡浜嬩欢瑕嗙洊浜哄伐瀹℃牳缁撴灉
+ *
+ * @param id 缂栧彿
+ * @param status 鐩爣鐘舵�侊紙宸插鏍� / 瀹℃牳涓嶉�氳繃锛�
+ * @param reviewRemark 瀹℃壒鎰忚
+ * @return 褰卞搷琛屾暟
+ */
+ default int updateAuditStatusByBpm(Long id, Integer status, String reviewRemark) {
+ return update(null, new LambdaUpdateWrapper<ProductTechConfirmDO>()
+ .eq(ProductTechConfirmDO::getId, id)
+ .eq(ProductTechConfirmDO::getStatus, MesPdTechConfirmStatusEnum.PENDING_AUDIT.getStatus())
+ .set(ProductTechConfirmDO::getStatus, status)
+ .set(ProductTechConfirmDO::getReviewTime, LocalDateTime.now())
+ .set(ProductTechConfirmDO::getReviewRemark, reviewRemark));
+ }
+
}
--
Gitblit v1.9.3