From 87733eb3623593da247c051593d64b8ff9e1d3a4 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 06 十一月 2026 19:00:39 +0800
Subject: [PATCH] feat(crm,mes): 扩展客户字段与重构批次号生成逻辑
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/batch/MesProBatchMapper.java | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/batch/MesProBatchMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/batch/MesProBatchMapper.java
index 4767842..199e91e 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/batch/MesProBatchMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/batch/MesProBatchMapper.java
@@ -20,6 +20,21 @@
return selectOne(MesProBatchDO::getCode, code);
}
+ /**
+ * 鎸夋壒娆″彿鏌ヨ锛堝寘鍚凡閫昏緫鍒犻櫎璁板綍锛�
+ * <p>
+ * 鎵规鍙峰瓨鍦ㄥ敮涓�绱㈠紩锛岄�昏緫鍒犻櫎鐨勮褰曚粛鍗犵敤鐮佸�硷紝鏍￠獙閲嶅鏃跺繀椤讳竴骞剁撼鍏ャ��
+ */
+ @Select("SELECT * FROM mes_pro_batch WHERE code = #{code} LIMIT 1")
+ MesProBatchDO selectByCodeIgnoreDeleted(@org.apache.ibatis.annotations.Param("code") String code);
+
+ /**
+ * 鏌ヨ鎸囧畾骞翠唤宸蹭娇鐢ㄧ殑鏈�澶ф壒娆℃祦姘村彿锛堟壒娆″彿鏍煎紡涓� 4 浣嶅勾浠� + 3 浣嶆祦姘达級
+ */
+ @Select("SELECT COALESCE(MAX(CAST(SUBSTRING(code, 5) AS UNSIGNED)), 0) FROM mes_pro_batch "
+ + "WHERE code LIKE CONCAT(#{year}, '%') AND code REGEXP '^[0-9]{7}$'")
+ Integer selectMaxCodeSerialByYear(@org.apache.ibatis.annotations.Param("year") String year);
+
default MesProBatchDO selectByScanCode(String code) {
return selectOne(new LambdaQueryWrapperX<MesProBatchDO>().and(q ->
q.eq(MesProBatchDO::getBusinessCode, code).or().eq(MesProBatchDO::getCode, code)
--
Gitblit v1.9.3