From 6c0fd2cb801554f7999d14e45a94ef0f0d0dfb8d Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期五, 16 十月 2026 17:45:33 +0800
Subject: [PATCH] feat(mes): 二维码大批量导出改为后台任务，取消数量上限
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/bagcode/MesProBagCodeMapper.java | 89 ++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 85 insertions(+), 4 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/bagcode/MesProBagCodeMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/bagcode/MesProBagCodeMapper.java
index 7024430..bc35f78 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/bagcode/MesProBagCodeMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/bagcode/MesProBagCodeMapper.java
@@ -28,6 +28,18 @@
return selectOne(MesProBagCodeDO::getCode, code);
}
+ /** 鍐呴儴鎵爜鍏煎涓氬姟鐮佷笌鍘嗗彶杩芥函鐮侊紱鍏紬杩芥函缁х画鍙寜 code 鏌ヨ銆� */
+ default MesProBagCodeDO selectByScanCode(String code) {
+ return selectOne(new LambdaQueryWrapperX<MesProBagCodeDO>()
+ .and(q -> q.eq(MesProBagCodeDO::getBusinessCode, code).or().eq(MesProBagCodeDO::getCode, code)));
+ }
+
+ default MesProBagCodeDO selectByScanCodeForUpdate(String code) {
+ return selectOne(new LambdaQueryWrapperX<MesProBagCodeDO>()
+ .and(q -> q.eq(MesProBagCodeDO::getBusinessCode, code).or().eq(MesProBagCodeDO::getCode, code))
+ .last("FOR UPDATE"));
+ }
+
default MesProBagCodeDO selectByCodeForUpdate(String code) {
return selectOne(new LambdaQueryWrapperX<MesProBagCodeDO>()
.eq(MesProBagCodeDO::getCode, code).last("FOR UPDATE"));
@@ -39,13 +51,13 @@
/** 鎵规鏁存壒鍏ュ簱鏃舵壒閲忔爣璁板叾涓嬫湭鍏ュ簱琚嬬爜锛堝箓绛夛級锛屼繚鎸佽鐮佷笌搴撳瓨鐘舵�佷竴鑷� */
@Update("UPDATE mes_pro_bag_code SET inbound_time = NOW(), inbound_event_id = #{eventId}, inbound_line_code = #{lineCode}, update_time = NOW() "
- + "WHERE deleted = 0 AND inbound_event_id IS NULL AND batch_id = #{batchId}")
+ + "WHERE deleted = 0 AND status <> 30 AND inbound_event_id IS NULL AND batch_id = #{batchId}")
int markInboundByBatchId(@Param("batchId") Long batchId, @Param("eventId") Long eventId,
@Param("lineCode") String lineCode);
/** 鏁存墭鍏ュ簱鏃舵壒閲忔爣璁版墭鐩樹笅鏈叆搴撹鐮侊紙骞傜瓑锛� */
@Update("UPDATE mes_pro_bag_code SET inbound_time = NOW(), inbound_event_id = #{eventId}, inbound_line_code = #{lineCode}, update_time = NOW() "
- + "WHERE deleted = 0 AND inbound_event_id IS NULL AND pallet_id = #{palletId}")
+ + "WHERE deleted = 0 AND status <> 30 AND inbound_event_id IS NULL AND pallet_id = #{palletId}")
int markInboundByPalletId(@Param("palletId") Long palletId, @Param("eventId") Long eventId,
@Param("lineCode") String lineCode);
@@ -96,6 +108,58 @@
.orderByAsc(MesProBagCodeDO::getBagNo));
}
+ /**
+ * 缁熻鐢熸垚缁勪笅鍙嵃鍒风殑琚嬬爜鏁伴噺锛堜緵瀵煎嚭鍒嗘祦鍒ゆ柇锛岄伩鍏嶄负浜嗘嬁鏁伴噺鑰屽叏閲忓姞杞斤級
+ */
+ default Long selectPrintableCountByUuid(String uuid) {
+ return selectCount(new LambdaQueryWrapperX<MesProBagCodeDO>()
+ .eq(MesProBagCodeDO::getUuid, uuid)
+ .ne(MesProBagCodeDO::getStatus, MesProBagCodeStatusEnum.CANCELED.getStatus()));
+ }
+
+ /**
+ * 缁熻鎵规涓嬪彲鍗板埛鐨勮鐮佹暟閲忥紙渚涘鍑哄垎娴佸垽鏂級
+ */
+ default Long selectPrintableCountByBatchId(Long batchId) {
+ return selectCount(new LambdaQueryWrapperX<MesProBagCodeDO>()
+ .eq(MesProBagCodeDO::getBatchId, batchId)
+ .ne(MesProBagCodeDO::getStatus, MesProBagCodeStatusEnum.CANCELED.getStatus()));
+ }
+
+ /**
+ * 鍒嗛〉鏌ヨ鐢熸垚缁勪笅鍙嵃鍒风殑琚嬬爜锛堝悗鍙板鍑轰换鍔＄敤锛岄�愰〉鍙栦互鎺у埗鍐呭瓨锛�
+ * <p>
+ * 鎺掑簭涓庡叏閲忔煡璇繚鎸佷竴鑷达紙鎸夎搴忓彿鍗囧簭锛夛紝淇濊瘉 ZIP 鍐呯殑鏍囩椤哄簭涓嶅彉銆�
+ */
+ default List<MesProBagCodeDO> selectPrintablePageByUuid(String uuid, int pageNo, int pageSize) {
+ return selectPageByWrapper(new LambdaQueryWrapperX<MesProBagCodeDO>()
+ .eq(MesProBagCodeDO::getUuid, uuid)
+ .ne(MesProBagCodeDO::getStatus, MesProBagCodeStatusEnum.CANCELED.getStatus())
+ .orderByAsc(MesProBagCodeDO::getBagNo), pageNo, pageSize);
+ }
+
+ /**
+ * 鍒嗛〉鏌ヨ鎵规涓嬪彲鍗板埛鐨勮鐮侊紙鍚庡彴瀵煎嚭浠诲姟鐢級
+ */
+ default List<MesProBagCodeDO> selectPrintablePageByBatchId(Long batchId, int pageNo, int pageSize) {
+ return selectPageByWrapper(new LambdaQueryWrapperX<MesProBagCodeDO>()
+ .eq(MesProBagCodeDO::getBatchId, batchId)
+ .ne(MesProBagCodeDO::getStatus, MesProBagCodeStatusEnum.CANCELED.getStatus())
+ .orderByAsc(MesProBagCodeDO::getBagNo), pageNo, pageSize);
+ }
+
+ /**
+ * 鎸夋潯浠跺垎椤垫煡璇紝涓嶆墽琛� count 鏌ヨ锛堣皟鐢ㄦ柟閫氬父宸茬煡鎬绘暟锛�
+ */
+ private List<MesProBagCodeDO> selectPageByWrapper(
+ com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper<MesProBagCodeDO> wrapper,
+ int pageNo, int pageSize) {
+ com.baomidou.mybatisplus.extension.plugins.pagination.Page<MesProBagCodeDO> page =
+ new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(pageNo, pageSize);
+ page.setSearchCount(false);
+ return selectPage(page, wrapper).getRecords();
+ }
+
default Long selectCountByBatchId(Long batchId) {
return selectCount(MesProBagCodeDO::getBatchId, batchId);
}
@@ -107,10 +171,16 @@
default List<MesProBagCodeDO> selectListByPalletId(Long palletId) {
return selectList(MesProBagCodeDO::getPalletId, palletId);
}
+ default List<MesProBagCodeDO> selectListByPalletIdForUpdate(Long palletId) {
+ return selectList(new LambdaQueryWrapperX<MesProBagCodeDO>().eq(MesProBagCodeDO::getPalletId, palletId).orderByAsc(MesProBagCodeDO::getId).last("FOR UPDATE"));
+ }
+ default List<MesProBagCodeDO> selectListByBatchIdForUpdate(Long batchId) {
+ return selectList(new LambdaQueryWrapperX<MesProBagCodeDO>().eq(MesProBagCodeDO::getBatchId, batchId).orderByAsc(MesProBagCodeDO::getId).last("FOR UPDATE"));
+ }
default PageResult<MesProBagCodeDO> selectPage(MesProBagCodePageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<MesProBagCodeDO>()
- .likeIfPresent(MesProBagCodeDO::getCode, reqVO.getCode())
+ .likeIfPresent(MesProBagCodeDO::getBusinessCode, reqVO.getBusinessCode())
.eqIfPresent(MesProBagCodeDO::getBatchId, reqVO.getBatchId())
.likeIfPresent(MesProBagCodeDO::getBatchCode, reqVO.getBatchCode())
.eqIfPresent(MesProBagCodeDO::getUuid, reqVO.getUuid())
@@ -119,7 +189,10 @@
.eqIfPresent(MesProBagCodeDO::getStatus, reqVO.getStatus())
.betweenIfPresent(MesProBagCodeDO::getCreateTime, reqVO.getCreateTime())
.orderByDesc(MesProBagCodeDO::getCreateTime)
- .orderByDesc(MesProBagCodeDO::getId));
+ .orderByDesc(MesProBagCodeDO::getId)
+ .and(cn.hutool.core.util.StrUtil.isNotBlank(reqVO.getCode()), q ->
+ q.like(MesProBagCodeDO::getCode, reqVO.getCode()).or()
+ .like(MesProBagCodeDO::getBusinessCode, reqVO.getCode())));
}
/**
@@ -219,6 +292,14 @@
"AND deleted = 0 AND status <> 30")
int selectEffectiveCountByBatchId(@Param("batchId") Long batchId);
+ @Select("SELECT COUNT(*) FROM mes_pro_bag_code WHERE deleted = 0 AND status <> 30 "
+ + "AND inbound_event_id IS NULL AND batch_id = #{batchId}")
+ int selectPendingInboundCountByBatchId(@Param("batchId") Long batchId);
+
+ @Select("SELECT COUNT(*) FROM mes_pro_bag_code WHERE deleted = 0 AND status <> 30 "
+ + "AND inbound_event_id IS NULL AND pallet_id = #{palletId}")
+ int selectPendingInboundCountByPalletId(@Param("palletId") Long palletId);
+
/**
* 鎵归噺鏍囪涓哄凡瀵煎嚭鍗板埛锛堜粎鏇存柊澶勪簬鐩爣鍘熺姸鎬佺殑璁板綍锛�
*
--
Gitblit v1.9.3