From 04914a9997afbbead6f8adbb9d9c40e05b2edbd1 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期三, 17 十二月 2025 17:04:34 +0800
Subject: [PATCH] 修复调用导入工程失败 重复保存；修复分批出片逻辑
---
mes-processes/mes-plcSend/src/main/java/com/mes/device/service/GlassInfoService.java | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 51 insertions(+), 0 deletions(-)
diff --git a/mes-processes/mes-plcSend/src/main/java/com/mes/device/service/GlassInfoService.java b/mes-processes/mes-plcSend/src/main/java/com/mes/device/service/GlassInfoService.java
index 202de49..2095c13 100644
--- a/mes-processes/mes-plcSend/src/main/java/com/mes/device/service/GlassInfoService.java
+++ b/mes-processes/mes-plcSend/src/main/java/com/mes/device/service/GlassInfoService.java
@@ -75,5 +75,56 @@
* 鎵归噺鏇存柊鐜荤拑鐘舵��
*/
boolean updateGlassStatus(List<String> glassIds, String status);
+
+ /**
+ * 鑾峰彇 MES 宸ョ▼瀵煎叆 URL
+ *
+ * @return MES 宸ョ▼瀵煎叆 URL
+ */
+ String getMesEngineeringImportUrl();
+
+ /**
+ * 灏嗗墠绔笂浼犵殑 Excel 琛屾暟鎹浆鎹负 MES 瀵煎叆宸ョ▼鎵�闇�鐨� JSON 缁撴瀯
+ *
+ * @param excelRows 鍓嶇瑙ｆ瀽鍚庣殑琛屾暟鎹紝瀛楁绀轰緥锛�
+ * glassId,width,height,thickness,quantity,orderNumber,filmsId,flowCardId,productName,customerName
+ * @return 绗﹀悎 MES 鎺ュ彛瑕佹眰鐨勮姹備綋 Map
+ */
+ Map<String, Object> buildEngineerImportPayload(List<Map<String, Object>> excelRows);
+
+ /**
+ * 鏍规嵁宸ョ▼鍙锋煡璇㈢幓鐠冧俊鎭垪琛�
+ *
+ * @param engineeringId 宸ョ▼鍙�
+ * @return 鐜荤拑淇℃伅鍒楄〃
+ */
+ List<GlassInfo> getGlassInfosByEngineeringId(String engineeringId);
+
+ /**
+ * 浠嶦xcel鏁版嵁淇濆瓨鐜荤拑淇℃伅鍒版湰鍦版暟鎹簱锛屽苟鍏宠仈engineering_id
+ *
+ * @param excelRows Excel琛屾暟鎹�
+ * @param engineeringId 宸ョ▼鍙�
+ */
+ void saveGlassInfosFromExcel(List<Map<String, Object>> excelRows, String engineeringId);
+
+ /**
+ * 鎵爜浜や簰鍚庢洿鏂扮幓鐠冧俊鎭姸鎬侊紙灏唖tate浠�0鏀逛负1锛�
+ *
+ * @param glassId 鐜荤拑ID
+ * @param width 瀹藉害锛堝彲閫夛級
+ * @param height 楂樺害锛堝彲閫夛級
+ * @param workLine 浜х嚎缂栧彿锛堝彲閫夛級
+ * @return 鏄惁鏇存柊鎴愬姛
+ */
+ boolean updateGlassStateAfterScan(String glassId, Integer width, Integer height, Integer workLine);
+
+ /**
+ * 鏍规嵁宸ョ▼鍙峰垹闄ょ幓鐠冧俊鎭�
+ *
+ * @param engineeringId 宸ョ▼鍙�
+ * @return 鍒犻櫎鐨勭幓鐠冩暟閲�
+ */
+ int deleteGlassInfosByEngineeringId(String engineeringId);
}
--
Gitblit v1.8.0