From d1099b48aecf383fcefbe7b5a7ac3c2de0f0793f Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 06 十一月 2024 23:22:03 +0800
Subject: [PATCH] 1、卧理进出片功能已完成开发,与电气调试中,新增磨边队列表 2、卧理新增历史任务表,记录卧理两台设备执行过的历史数据 3、大理片笼opc任务,新增玻璃进笼计算方式:在笼内存储同炉的多片玻璃,笼内玻璃顺序可不按照固定的顺序进笼 4、上片任务初步完成开发,新增历史任务表记录上片的历史信息

---
 hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/service/UpWorkstationService.java |   32 +++++++++++++++++++-------------
 1 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/service/UpWorkstationService.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/service/UpWorkstationService.java
index 4c2638b..9a7be55 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/service/UpWorkstationService.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/service/UpWorkstationService.java
@@ -1,7 +1,8 @@
 package com.mes.workstation.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.mes.workstation.entity.UpWorkSequence;
+import com.mes.engineering.entity.Engineering;
+import com.mes.uppattenusage.entity.UpPattenUsage;
 import com.mes.workstation.entity.UpWorkstation;
 
 /**
@@ -13,24 +14,29 @@
  * @since 2024-04-07
  */
 public interface UpWorkstationService extends IService<UpWorkstation> {
-    //PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
 
-
-
-    //鍒ゆ柇浼樺厛鍚哥墖浣嶇疆鍚庡彂閫佸嚭鐗囦换鍔�
-    UpWorkSequence selectPriority();
-
-    //鏌ヨ姝e湪杩涜鐨勫伐绋�
-
-
+    //鍒ゆ柇浼樺厛鍚哥墖鐜荤拑
+    /**
+     * 鍒ゆ柇浼樺厛鍚哥墖浣嶇疆
+     * @return UpPattenUsage
+     */
+    UpPattenUsage selectPriority(Engineering engineering);
+    /**
+     * 鏌ヨ姝e湪杩涜鐨勫崟鐗囦俊鎭�
+     * @return UpWorkstation
+     */
+    UpWorkstation selectWorkstation(UpPattenUsage upPattenUsage);
+    /**
+     * 鍑忓皯宸ヤ綅鏁伴噺
+     */
+    void reduceWorkstationNumber(Integer upworkId);
     /**
      * 澧炲姞浜哄伐杈撳叆鐨勫伐浣嶇幓鐠冧俊鎭�
-     *
      * @param upwork
      */
-    //淇敼宸ヤ綅琛ㄥ鍔犵幓鐠冧俊鎭垨鑰呭垹闄ょ幓鐠冧俊鎭�
-    void updateGlassMessage(UpWorkstation upwork);
+    Boolean updateGlassMessage(UpWorkstation upwork);
 
 
+    String updateMesInkageLoad(short inKageWord);
 }
 

--
Gitblit v1.8.0