From a13dc56f0ba6760a448ef19d72ee6db84bc84c6f Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期四, 23 七月 2026 10:19:51 +0800
Subject: [PATCH] feat: 优化领料项过滤逻辑，排除与订单成品同规格物料
---
src/main/java/com/ruoyi/safe/service/impl/SafeLineInspectionRecordServiceImpl.java | 48 ------------------------------------------------
1 files changed, 0 insertions(+), 48 deletions(-)
diff --git a/src/main/java/com/ruoyi/safe/service/impl/SafeLineInspectionRecordServiceImpl.java b/src/main/java/com/ruoyi/safe/service/impl/SafeLineInspectionRecordServiceImpl.java
index 5032ec7..89da3f0 100644
--- a/src/main/java/com/ruoyi/safe/service/impl/SafeLineInspectionRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/safe/service/impl/SafeLineInspectionRecordServiceImpl.java
@@ -1,17 +1,11 @@
package com.ruoyi.safe.service.impl;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.safe.pojo.SafeLineInspection;
import com.ruoyi.safe.pojo.SafeLineInspectionRecord;
import com.ruoyi.safe.mapper.SafeLineInspectionRecordMapper;
import com.ruoyi.safe.service.SafeLineInspectionRecordService;
-import com.ruoyi.safe.service.SafeLineInspectionService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import java.time.LocalDateTime;
import java.util.List;
/**
@@ -25,53 +19,11 @@
@Service
public class SafeLineInspectionRecordServiceImpl extends ServiceImpl<SafeLineInspectionRecordMapper, SafeLineInspectionRecord> implements SafeLineInspectionRecordService {
- @Autowired
- private SafeLineInspectionService safeLineInspectionService;
-
@Override
public List<SafeLineInspectionRecord> listByInspectionId(Integer inspectionId) {
return this.lambdaQuery()
.eq(SafeLineInspectionRecord::getInspectionId, inspectionId)
.orderByDesc(SafeLineInspectionRecord::getCheckTime)
.list();
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public boolean save(SafeLineInspectionRecord entity) {
- // 淇濆瓨宸℃璁板綍
- boolean result = super.save(entity);
-
- if (result && entity.getInspectionId() != null) {
- // 鏇存柊宸℃浠诲姟鐘舵�佷负"宸℃涓�"锛屽苟璁剧疆宸℃浜轰负褰撳墠鐧诲綍鐢ㄦ埛
- updateInspectionStatus(entity.getInspectionId());
- }
-
- return result;
- }
-
- /**
- * 鏇存柊宸℃浠诲姟鐘舵�佷负"宸℃涓�"锛屽苟娣诲姞褰撳墠鐢ㄦ埛鍒板贰妫�浜哄垪琛�
- */
- private void updateInspectionStatus(Integer inspectionId) {
- SafeLineInspection inspection = safeLineInspectionService.getById(inspectionId);
- if (inspection != null && "寰呭贰妫�".equals(inspection.getStatus())) {
- Long currentUserId = SecurityUtils.getUserId();
- String currentUserIdStr = String.valueOf(currentUserId);
-
- // 娣诲姞褰撳墠鐢ㄦ埛鍒板贰妫�浜哄垪琛紙濡傛灉涓嶅瓨鍦級
- String inspectorId = inspection.getInspectorId();
- if (inspectorId == null || inspectorId.isEmpty()) {
- inspectorId = currentUserIdStr;
- } else if (!inspectorId.contains(currentUserIdStr)) {
- inspectorId = inspectorId + "," + currentUserIdStr;
- }
-
- inspection.setStatus("宸℃涓�");
- inspection.setInspectorId(inspectorId);
- inspection.setUpdateTime(LocalDateTime.now());
- inspection.setUpdateUser(currentUserId.intValue());
- safeLineInspectionService.updateById(inspection);
- }
}
}
--
Gitblit v1.9.3