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 | 53 +++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 45 insertions(+), 8 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 e672278..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,14 +20,36 @@
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)
+ .or().eq(MesProBatchDO::getTempCode, code)));
+ }
+
+ default MesProBatchDO selectByScanCodeForUpdate(String code) {
+ return selectOne(new LambdaQueryWrapperX<MesProBatchDO>().and(q ->
+ q.eq(MesProBatchDO::getBusinessCode, code).or().eq(MesProBatchDO::getCode, code)
+ .or().eq(MesProBatchDO::getTempCode, code)).last("FOR UPDATE"));
+ }
+
default MesProBatchDO selectByTempCode(String tempCode) {
return selectOne(MesProBatchDO::getTempCode, tempCode);
}
-
- /** 鐢熸垚涓存椂鎵规鐮佺敤鐨勫叏灞�搴忓彿锛氳В鏋� temp_code 鐨勬暟瀛楀悗缂�锛屼笉瀛樺湪鍒欒繑鍥� 0銆�
- * 涓嶈兘杩囨护 deleted锛屽敮涓�绱㈠紩 uk_temp_code 瀵归�昏緫鍒犻櫎琛屼粛鐢熸晥锛屽拷鐣ヨ蒋鍒犱細瀵艰嚧搴忓彿鍥為��銆佺爜鍊奸噸澶� */
- @Select("SELECT IFNULL(MAX(CAST(SUBSTRING(temp_code, 4) AS UNSIGNED)), 0) FROM mes_pro_batch")
- Integer selectMaxTempCodeSeq();
default Long selectCountByLineId(Long lineId) {
return selectCount(MesProBatchDO::getLineId, lineId);
@@ -46,19 +68,34 @@
int markBatchInbound(@org.apache.ibatis.annotations.Param("id") Long id, @org.apache.ibatis.annotations.Param("eventId") Long eventId,
@org.apache.ibatis.annotations.Param("lineCode") String lineCode, @org.apache.ibatis.annotations.Param("bagQuantity") Integer bagQuantity);
+ /** 浠ユ湁鏁堣鐮佺殑鍏ュ簱鏍囪涓哄噯锛涙贩鎵�侀噸璇曞拰浣滃簾琚嬩笉褰卞搷瀹屾垚鍒ゆ柇銆傝皟鐢ㄦ柟宸查攣瀹氭壒娆°�� */
+ @org.apache.ibatis.annotations.Update("UPDATE mes_pro_batch SET inbound_time = NOW(), inbound_event_id = #{eventId}, "
+ + "inbound_device_code = #{deviceCode}, inbound_line_code = #{lineCode}, "
+ + "inbound_bag_quantity = (SELECT COUNT(*) FROM mes_pro_bag_code b WHERE b.batch_id = #{id} "
+ + "AND b.deleted = 0 AND b.status <> 30 AND b.inbound_event_id IS NOT NULL), "
+ + "status = CASE WHEN EXISTS (SELECT 1 FROM mes_pro_bag_code b WHERE b.batch_id = #{id} AND b.deleted = 0 AND b.status <> 30) "
+ + "AND NOT EXISTS (SELECT 1 FROM mes_pro_bag_code b WHERE b.batch_id = #{id} AND b.deleted = 0 AND b.status <> 30 AND b.inbound_event_id IS NULL) "
+ + "THEN 30 ELSE status END, update_time = NOW() WHERE id = #{id} AND deleted = 0 AND status <> 40")
+ int refreshInboundProgress(@org.apache.ibatis.annotations.Param("id") Long id, @org.apache.ibatis.annotations.Param("eventId") Long eventId,
+ @org.apache.ibatis.annotations.Param("deviceCode") String deviceCode, @org.apache.ibatis.annotations.Param("lineCode") String lineCode);
+
default PageResult<MesProBatchDO> selectPage(MesProBatchPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<MesProBatchDO>()
- .likeIfPresent(MesProBatchDO::getCode, reqVO.getCode())
+ .likeIfPresent(MesProBatchDO::getBusinessCode, reqVO.getBusinessCode())
.likeIfPresent(MesProBatchDO::getTempCode, reqVO.getTempCode())
- .eqIfPresent(MesProBatchDO::getItemId, reqVO.getItemId())
.eqIfPresent(MesProBatchDO::getLineId, reqVO.getLineId())
.likeIfPresent(MesProBatchDO::getLineCode, reqVO.getLineCode())
.likeIfPresent(MesProBatchDO::getLineName, reqVO.getLineName())
+ .likeIfPresent(MesProBatchDO::getProcessingTeam, reqVO.getProcessingTeam())
.eqIfPresent(MesProBatchDO::getOwnerUserId, reqVO.getOwnerUserId())
.eqIfPresent(MesProBatchDO::getStatus, reqVO.getStatus())
.betweenIfPresent(MesProBatchDO::getProduceDate, reqVO.getProduceDate())
.betweenIfPresent(MesProBatchDO::getCreateTime, reqVO.getCreateTime())
- .orderByDesc(MesProBatchDO::getId));
+ .orderByDesc(MesProBatchDO::getId)
+ .and(cn.hutool.core.util.StrUtil.isNotBlank(reqVO.getCode()), q ->
+ q.like(MesProBatchDO::getCode, reqVO.getCode()).or()
+ .like(MesProBatchDO::getBusinessCode, reqVO.getCode()).or()
+ .like(MesProBatchDO::getTempCode, reqVO.getCode())));
}
}
--
Gitblit v1.9.3