From 53208c36cf9eea25de2b020df633fecedd9ffb1f Mon Sep 17 00:00:00 2001
From: zt <seesawgzz@gmail.com>
Date: Wed, 29 Oct 2025 11:21:47 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=80=83=E5=8B=A4=E6=9C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/org/dromara/job/attendance/AttendanceJob.java  | 5 +++--
 .../project/controller/BusAttendanceDeviceController.java    | 1 +
 .../main/java/org/dromara/project/domain/BusAttendance.java  | 5 +++++
 .../dto/attendance/BusAttendancePunchCardByFaceReq.java      | 2 ++
 .../project/service/impl/BusAttendanceServiceImpl.java       | 4 ++++
 5 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/job/attendance/AttendanceJob.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/job/attendance/AttendanceJob.java
index 7b1f6248..98baffef 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/job/attendance/AttendanceJob.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/job/attendance/AttendanceJob.java
@@ -87,8 +87,7 @@ public class AttendanceJob {
                     .lt(BusAttendanceRule::getClockInResultTime, end));
             }
 
-            //获取当前日期
-            LocalDate date = LocalDate.now();
+
 
             //管理员关联多个项目，需要记录是否已生成缺卡记录
 //            HashSet<Long> manageUserIds = new HashSet<>();
@@ -97,6 +96,8 @@ public class AttendanceJob {
             for (BusAttendanceRule rule : list) {
                 LocalTime clockInTime = rule.getClockInTime();
                 LocalTime clockInResultTime = rule.getClockInResultTime();
+                //获取当前日期
+                LocalDate date = LocalDate.now();
 
                 //计算考勤日期
                 if (start.isAfter(end)) {  // 跨天情况
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusAttendanceDeviceController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusAttendanceDeviceController.java
index 640f11c5..ac9ce24e 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusAttendanceDeviceController.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusAttendanceDeviceController.java
@@ -78,6 +78,7 @@ public class BusAttendanceDeviceController extends BaseController {
         req.setUserId(userId);
         req.setPunchTime(localDateTime);
         req.setSource("1");
+        req.setSn(dto.getSn());
         //打印req
         log.info("请求参数：{}", req);
         //base64转MultipartFile
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusAttendance.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusAttendance.java
index aef885a8..3494f8ba 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusAttendance.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusAttendance.java
@@ -118,4 +118,9 @@ public class BusAttendance extends BaseEntity {
      * 来源
      */
     private String source;
+
+    /**
+     * 设备序列号
+     */
+    private String sn;
 }
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/attendance/BusAttendancePunchCardByFaceReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/attendance/BusAttendancePunchCardByFaceReq.java
index 3f295f09..2e4479cd 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/attendance/BusAttendancePunchCardByFaceReq.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/attendance/BusAttendancePunchCardByFaceReq.java
@@ -53,4 +53,6 @@ public class BusAttendancePunchCardByFaceReq implements Serializable {
      */
     private String source;
 
+    private String sn;
+
 }
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusAttendanceServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusAttendanceServiceImpl.java
index 7cdd4a61..958e8fa7 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusAttendanceServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusAttendanceServiceImpl.java
@@ -420,6 +420,7 @@ public class BusAttendanceServiceImpl extends ServiceImpl<BusAttendanceMapper, B
                     attendance.setReplaceId(replaceId);
                     if(req.getSource() != null){
                         attendance.setSource(req.getSource());
+                        attendance.setSn(req.getSn());
                     }
                     // 记录打卡坐标
                     attendance.setLat(req.getLat());
@@ -465,6 +466,7 @@ public class BusAttendanceServiceImpl extends ServiceImpl<BusAttendanceMapper, B
                     }
 
                     busAttendance.setSource(req.getSource());
+                    busAttendance.setSn(req.getSn());
                     //如果是缺卡需要上传人脸
                     if(oldStatus.equals(BusAttendanceClockStatusEnum.UNCLOCK.getValue())){
                         SysOssVo upload = ossService.upload(file);
@@ -480,6 +482,7 @@ public class BusAttendanceServiceImpl extends ServiceImpl<BusAttendanceMapper, B
                     BusAttendance busAttendance = outAttendances.getFirst();
                     if("1".equals(req.getSource())){
                         busAttendance.setSource(req.getSource());
+                        busAttendance.setSn(req.getSn());
                         if(busAttendance.getClockStatus().equals(BusAttendanceClockStatusEnum.UNCLOCK.getValue())){
                             SysOssVo upload = ossService.upload(file);
                             busAttendance.setFacePic(upload.getOssId().toString());
@@ -532,6 +535,7 @@ public class BusAttendanceServiceImpl extends ServiceImpl<BusAttendanceMapper, B
                     attendance.setReplaceId(replaceId);
                     if(req.getSource() != null){
                         attendance.setSource(req.getSource());
+                        attendance.setSn(req.getSn());
                     }
                     // 记录打卡坐标
                     attendance.setLat(req.getLat());

From e4132ea5409ed963d6ebe641097ce7c595414edc Mon Sep 17 00:00:00 2001
From: dfdg <2710245601@qq.com>
Date: Wed, 29 Oct 2025 11:33:13 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=A4=84=E7=90=86=E9=95=BF=E9=A1=BA?=
 =?UTF-8?q?=E7=9A=84=E8=80=81=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/BusMrpBaseServiceImpl.java            | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/service/impl/BusMrpBaseServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/service/impl/BusMrpBaseServiceImpl.java
index 720f9284..a4341045 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/service/impl/BusMrpBaseServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/service/impl/BusMrpBaseServiceImpl.java
@@ -318,11 +318,13 @@ public class BusMrpBaseServiceImpl extends ServiceImpl<BusMrpBaseMapper, BusMrpB
                 .reduce(BigDecimal.ZERO, BigDecimal::add);
         }
         map.put("remainingQuantity",quantity.subtract(reduce));
-        map.put("specification",busBillofquantities.getSpecification());
         map.put("suppliespriceId",limitListId);
-        map.put("unit",busBillofquantities.getUnit());
-        map.put("remark",busBillofquantities.getRemark());
-        map.put("name",busBillofquantities.getName());
+        if (busBillofquantities != null) {
+            map.put("specification",busBillofquantities.getSpecification());
+            map.put("unit",busBillofquantities.getUnit());
+            map.put("remark",busBillofquantities.getRemark());
+            map.put("name",busBillofquantities.getName());
+        }
         return map;
     }