From ab389a5a6b329b15a655340ba7b87bce7fd7871d Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期三, 24 十二月 2025 17:16:19 +0800
Subject: [PATCH] 添加新增设备自动生成编码

---
 mes-processes/mes-plcSend/src/main/java/com/mes/device/controller/GlassInfoImportController.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/mes-processes/mes-plcSend/src/main/java/com/mes/device/controller/GlassInfoImportController.java b/mes-processes/mes-plcSend/src/main/java/com/mes/device/controller/GlassInfoImportController.java
index 191d48c..d18d94f 100644
--- a/mes-processes/mes-plcSend/src/main/java/com/mes/device/controller/GlassInfoImportController.java
+++ b/mes-processes/mes-plcSend/src/main/java/com/mes/device/controller/GlassInfoImportController.java
@@ -1,5 +1,6 @@
 package com.mes.device.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.mes.device.entity.EngineeringSequence;
 import com.mes.device.entity.GlassInfo;
 import com.mes.device.service.EngineeringSequenceService;
@@ -10,6 +11,7 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.client.ResourceAccessException;
 import org.springframework.web.client.RestTemplate;
 
 import java.util.*;
@@ -116,7 +118,7 @@
 
             // 7. 杩斿洖MES鐨勫搷搴�
             return ResponseEntity.status(mesResp.getStatusCode()).body(mesBody);
-        } catch (org.springframework.web.client.ResourceAccessException e) {
+        } catch (ResourceAccessException e) {
             // 杩炴帴瓒呮椂鎴栨棤娉曡繛鎺�
             log.error("杞彂 MES 瀵煎叆鎺ュ彛澶辫触锛堣繛鎺ラ棶棰橈級 url={}, error={}", glassInfoService.getMesEngineeringImportUrl(), e.getMessage(), e);
             errorResponse.put("code", 500);
@@ -204,7 +206,7 @@
             
             // 2. 鍒犻櫎engineering_sequence琛ㄤ腑鐨勫伐绋嬪彿璁板綍锛堥�昏緫鍒犻櫎锛�
             EngineeringSequence sequence = engineeringSequenceService.getOne(
-                new com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper<EngineeringSequence>()
+                new LambdaQueryWrapper<EngineeringSequence>()
                     .eq(EngineeringSequence::getEngineeringId, engineeringId)
                     .eq(EngineeringSequence::getIsDeleted, 0) // 鍙煡璇㈡湭鍒犻櫎鐨勮褰�
                     .last("LIMIT 1")

--
Gitblit v1.8.0