From cb921a68fe5f01012125fb522086acea2aa255ba Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 27 十二月 2024 14:43:40 +0800
Subject: [PATCH] 1、中空理片笼新增配方相关功能,用于用户自定义保存中空线相关参数,避免重复输入相同的参数 2、领取任务/强制出片改造:在流程卡、路线、数量基础上新增配方id,用于关联本地流程卡的中空的参数配方 3、增加限制:同一条线路的同个流程卡仅能存在一个未完成的任务 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