From 202157cf81af12aaa9cf1b8e860a02dbb55bfe2a Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期四, 22 十月 2026 20:28:25 +0800
Subject: [PATCH] feat: 完善直绑模板设备初始化与审批人权限校验
---
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
index 40dcb48..dcd6d1e 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
@@ -1659,7 +1659,7 @@
refreshed.setRemark(standardTemplate == null ? oldSnapshot.getRemark() : standardTemplate.getRemark());
refreshed.setThing(standardTemplate == null ? oldSnapshot.getThing() : standardTemplate.getThing());
refreshed.setRecordValues(templateRecordValuesMap.get(templateId));
- refreshed.setDeviceDefaultsInitialized(oldSnapshot == null ? 1
+ refreshed.setDeviceDefaultsInitialized(oldSnapshot == null ? 0
: oldSnapshot.getDeviceDefaultsInitialized());
refreshed.setTemperature(templateTemperatureMap.get(templateId));
refreshed.setHumidity(templateHumidityMap.get(templateId));
@@ -1947,6 +1947,11 @@
* 鍏煎淇涓婄嚎鍓嶅凡缁忎笅鍙戙�佷絾鍥犳病鏈� ins_product 鑰岀己灏戜换鍔＄姸鎬佺殑鐩寸粦妯℃澘璁㈠崟銆�
*/
private void ensureDirectTemplateOrderState(Integer orderId) {
+ InsOrder order = insOrderMapper.selectById(orderId);
+ // 鏈笅鍙戠殑鍗曡繕娌¤繘鍏ユ楠屼换鍔★紝鏌ョ湅鍘熷璁板綍涓嶈兘鎻愬墠鍒涘缓浠诲姟鐘舵�併��
+ if (order == null || order.getSendTime() == null) {
+ return;
+ }
if (!isDirectTemplateOrder(orderId)) {
return;
}
--
Gitblit v1.9.3