diff --git a/src/main/java/com/gaotao/modules/check/entity/RfidCountHeader.java b/src/main/java/com/gaotao/modules/check/entity/RfidCountHeader.java index b61204b..7931b76 100644 --- a/src/main/java/com/gaotao/modules/check/entity/RfidCountHeader.java +++ b/src/main/java/com/gaotao/modules/check/entity/RfidCountHeader.java @@ -83,18 +83,23 @@ public class RfidCountHeader { private Date countTime; /** - * 标签数量(定时任务填充后更新) + * 标签数量(定时任务填充后更新,表示该次盘点的标签数量) */ @TableField("label_count") private Integer labelCount; /** - * 是否已使用(是否已生成盘点单) + * 是否已使用(是否已处理) *
枚举值说明:
*⚠️ 重要说明:
+ *+ * is_used='Y'表示定时任务已处理完成(填充了子表和快照表) + * 后续人工可以基于此数据生成正式盘点单(count_result) + **/ @TableField("is_used") private String isUsed; diff --git a/src/main/java/com/gaotao/modules/check/service/RfidCountHeaderService.java b/src/main/java/com/gaotao/modules/check/service/RfidCountHeaderService.java index ab8b9f7..4578996 100644 --- a/src/main/java/com/gaotao/modules/check/service/RfidCountHeaderService.java +++ b/src/main/java/com/gaotao/modules/check/service/RfidCountHeaderService.java @@ -25,14 +25,15 @@ public interface RfidCountHeaderService extends IService
业务逻辑:
*
- * 1. 查询rfid_count_header(is_used='N'且label_count=null的记录)
+ * 1. 查询rfid_count_header(is_used='N'的记录)
* 2. 遍历每条记录:
* - 从pallet_detail查询标签列表(site+pallet_id)
- * - 从mes_unit查询标签详细信息
+ * - 从handling_unit查询标签详细信息
* - 批量保存到rfid_count_detail
* - 更新或新增到rfid_count_snapshot
- * - 更新rfid_count_header的label_count
+ * - 更新rfid_count_header:label_count=标签数量,is_used='Y'
* 3. 事务处理:每条主表记录独立事务
+ * 4. label_count仅记录标签数量,is_used='Y'表示已处理
*
*
* @author rqrq
diff --git a/src/main/java/com/gaotao/modules/check/service/impl/RfidCountHeaderServiceImpl.java b/src/main/java/com/gaotao/modules/check/service/impl/RfidCountHeaderServiceImpl.java
index 9e4d502..df53358 100644
--- a/src/main/java/com/gaotao/modules/check/service/impl/RfidCountHeaderServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/check/service/impl/RfidCountHeaderServiceImpl.java
@@ -104,13 +104,13 @@ public class RfidCountHeaderServiceImpl extends ServiceImpl
- * 1. 查询未填充的主表记录(is_used='N' AND label_count IS NULL)
+ * 1. 查询未处理的主表记录(is_used='N')
* 2. 遍历每条记录:
* - 从pallet_detail查询标签列表
* - 从handling_unit查询标签详细信息
* - 批量保存到rfid_count_detail
* - 更新或新增到rfid_count_snapshot
- * - 更新rfid_count_header的label_count
+ * - 更新rfid_count_header:label_count=标签数量,is_used='Y'
* 3. 每条主表记录独立事务处理
*
*
@@ -122,24 +122,23 @@ public class RfidCountHeaderServiceImpl extends ServiceImpl