From cf65d0a608b21f07dc50a98b864dfe47def4f86b Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期一, 23 三月 2026 17:12:37 +0800
Subject: [PATCH] fix:1.产品删除 2.原材料展示 3.菜单优化 4.区分角色编辑删除
---
src/main/java/com/ruoyi/quality/service/impl/RawMaterialServiceImpl.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/service/impl/RawMaterialServiceImpl.java b/src/main/java/com/ruoyi/quality/service/impl/RawMaterialServiceImpl.java
index d3ce5cd..218bf50 100644
--- a/src/main/java/com/ruoyi/quality/service/impl/RawMaterialServiceImpl.java
+++ b/src/main/java/com/ruoyi/quality/service/impl/RawMaterialServiceImpl.java
@@ -44,6 +44,8 @@
import java.util.*;
import java.util.stream.Collectors;
+import static com.ruoyi.home.service.impl.HomeServiceImpl.formatDate;
+
/**
* <p>
@@ -148,7 +150,7 @@
if (rawMaterial.getCheckResult().equals(RawMaterialCheckResult.RawMaterialCheckResultUnqualified.getCode())) {
QualityUnqualified qualityUnqualified = new QualityUnqualified();
qualityUnqualified.setInspectId(rawMaterial.getId());//妫�楠宨d
- qualityUnqualified.setInspectType(rawMaterial.getCheckType());//妫�楠岀被鍨�
+ qualityUnqualified.setCheckType(rawMaterial.getCheckType());//妫�楠岀被鍨�
qualityUnqualified.setInspectState(0);//寰呭鐞�
qualityUnqualified.setCheckName(rawMaterial.getCheckUserName());//妫�楠屽憳鍚嶇О
qualityUnqualified.setCheckTime(rawMaterial.getCheckTime());//妫�楠屾棩鏈�
@@ -311,6 +313,7 @@
inspect.setProductName(product.getProductName());
inspect.setCheckTypeText(RawMaterialCheckType.fromValue(rawMaterial.getCheckType()) == null ? "" : RawMaterialCheckType.fromValue(rawMaterial.getCheckType()).getValue());
inspect.setCheckResultText(RawMaterialCheckResult.fromValue(rawMaterial.getCheckResult()) == null ? "" : RawMaterialCheckResult.fromValue(rawMaterial.getCheckResult()).getValue());
+ inspect.setCheckTimeText(formatDate(rawMaterial.getCheckTime()));
List<RawMaterialQualityInspectItem> paramList = rawMaterialQualityInspectItemService.list(
new LambdaQueryWrapper<RawMaterialQualityInspectItem>()
--
Gitblit v1.9.3