From 7b89e2cf25b6d5a43ecc86bb64a6a245ae862c6e Mon Sep 17 00:00:00 2001 From: 严智鑫 <test> Date: 星期五, 17 五月 2024 11:12:25 +0800 Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes --- hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/service/UpWorkstationService.java | 29 +++++++++++++++++------------ 1 files changed, 17 insertions(+), 12 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..28547f4 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,22 +14,26 @@ * @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); -- Gitblit v1.8.0