From a76e1d17d67641993dea6335cb8e1465a94df58d Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 21 五月 2026 15:39:05 +0800
Subject: [PATCH] feat(stock): 优化库存管理和成品树结构功能 1- 为ApproveProcessMapper.xml和ProductBomMapper.xml添加排序功能 2- 在ProductionProductMainDto中新增bomInputQty字段用于产品结构投入数量 3- 修改ProductionProductMainServiceImpl中投入数量计算逻辑，使用前端传入的bomInputQty值 4- 在ProductWorkOrderDto中添加bomInputQty字段并在服务实现中计算标准投入数量 5- 更新SalesLedgerMapper.xml查询逻辑，从product_summary获取电压信息 6- 为SalesLedgerProduct添加stockId字段并修改库存扣减逻辑使用具体库存ID 7- 重构StockInventoryController中的成品库存树查询接口和导入导出功能 8- 新增成品和非成品库存导入导出的数据模型和Excel工具类 9- 优化StockInventoryServiceImpl中的库存扣减逻辑，支持按特定库存ID操作 10- 更新库存导入导出功能，区分成品和非成品类型并提供相应模板
---
src/main/java/com/ruoyi/staff/task/PersonalAttendanceRecordsTask.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/task/PersonalAttendanceRecordsTask.java b/src/main/java/com/ruoyi/staff/task/PersonalAttendanceRecordsTask.java
index b44b659..9730df6 100644
--- a/src/main/java/com/ruoyi/staff/task/PersonalAttendanceRecordsTask.java
+++ b/src/main/java/com/ruoyi/staff/task/PersonalAttendanceRecordsTask.java
@@ -35,32 +35,32 @@
* 瀹氭椂浠诲姟锛氭瘡澶╁噷鏅�1鐐规墽琛�
* 鎺掗櫎浠婂ぉ鍒氬叆鑱岀殑鍛樺伐
*/
-// @Scheduled(cron = "0 0 1 * * ?")
- @Scheduled(cron = "0/30 * * * * ?")
+ @Scheduled(cron = "0 0 1 * * ?")
public void generateAbsenceRecords() {
-
try {
// 鑾峰彇鏄ㄦ棩鏃ユ湡
LocalDate yesterday = LocalDate.now().minusDays(1);
- log.info("鐢熸垚鏃ユ湡锛歿} 鐨勭己鍕よ褰�", yesterday);
// 鐩存帴鏌ヨ鏄ㄥぉ娌℃湁鑰冨嫟璁板綍鐨勫湪鑱屽憳宸ワ紙鎺掗櫎浠婂ぉ鍒氬叆鑱岀殑锛�
- List<StaffOnJob> staffWithoutAttendance = personalAttendanceRecordsMapper.selectStaffWithoutAttendanceRecord(yesterday);
+ LocalDateTime todayStart = LocalDate.now().atStartOfDay();
+ List<StaffOnJob> staffWithoutAttendance = personalAttendanceRecordsMapper.selectStaffWithoutAttendanceRecordBeforeTime(yesterday, todayStart);
// 閬嶅巻娌℃湁鑰冨嫟璁板綍鐨勫憳宸ワ紝鐢熸垚缂哄嫟璁板綍
for (StaffOnJob staff : staffWithoutAttendance) {
try {
+ boolean exists = personalAttendanceRecordsMapper.existsAttendanceRecord(staff.getId(), yesterday);
+ if (exists) {
+ continue;
+ }
+
PersonalAttendanceRecords absenceRecord = new PersonalAttendanceRecords();
absenceRecord.setStaffOnJobId(staff.getId());
absenceRecord.setDate(yesterday);
- absenceRecord.setWorkStartAt(null);
- absenceRecord.setWorkEndAt(null);
- absenceRecord.setWorkHours(BigDecimal.ZERO);
absenceRecord.setStatus(4); // 璁剧疆鐘舵�佷负缂哄嫟
absenceRecord.setRemark("绯荤粺鑷姩鐢熸垚-缂哄嫟");
- absenceRecord.setTenantId(staff.getTenantId());
absenceRecord.setCreateTime(LocalDateTime.now());
absenceRecord.setUpdateTime(LocalDateTime.now());
+ absenceRecord.setTenantId(staff.getTenantId());
personalAttendanceRecordsService.save(absenceRecord);
} catch (Exception e) {
--
Gitblit v1.9.3