From 69e3dd71185b1cdaf524a4d2a25bf9648bd02ff4 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 10 五月 2024 17:01:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/service/UpWorkstationService.java | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 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 f489ca1..ca6f827 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,6 +1,9 @@
package com.mes.workstation.service;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.mes.engineering.entity.Engineering;
+import com.mes.uppattenusage.entity.UpPattenUsage;
+import com.mes.workstation.entity.UpWorkSequence;
import com.mes.workstation.entity.UpWorkstation;
/**
@@ -14,14 +17,14 @@
public interface UpWorkstationService extends IService<UpWorkstation> {
//PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
- //鍒犻櫎浜哄伐鎼蛋鐨勭幓鐠冧俊鎭�
-// public void deleteGlass(int id);
- //鍒ゆ柇鏄惁鍙互鍚哥墖杩涜浠诲姟
- //鍒ゆ柇浼樺厛鍚哥墖浣嶇疆鍚庡彂閫佸嚭鐗囦换鍔�
- public void selectPriority();
- //鏌ヨ姝ｅ湪杩涜鐨勫伐绋�
+ //鍒ゆ柇浼樺厛鍚哥墖鐜荤拑
+ UpPattenUsage selectPriority(Engineering engineering);
+ //鏌ヨ姝ｅ湪杩涜鐨勫崟鐗囦俊鎭�
+ UpWorkstation selectworkstation(UpPattenUsage upPattenUsage);
+ //鍑忓皯宸ヤ綅鏁伴噺
+ void reduceWorkstationNumber(UpWorkstation upwork);
/**
@@ -29,5 +32,9 @@
*
* @param upwork
*/
+ //淇敼宸ヤ綅琛ㄥ鍔犵幓鐠冧俊鎭垨鑰呭垹闄ょ幓鐠冧俊鎭�
void updateGlassMessage(UpWorkstation upwork);
+
+
}
+
--
Gitblit v1.8.0