From 8891898a6ae6229ede66c8005f2912c75ddc6d90 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 05 三月 2025 22:32:26 +0800
Subject: [PATCH] 1、fixbug:中空任务领取部分对数玻璃后继续领任务，任务显示异常bug解决 2、大理片笼/中空理片笼显示异常bug:进片任务计算目标格子后，预先将笼子插入一条记录，界面相同判断时显示存在歧义，修改数据返回逻辑：在没有目标格子前提下，如果笼内存在玻璃显示相同，有目标格子后笼内有数据不显示 3、中空理片笼进片任务优化：中空可能存在脏数据，原因人为操作或订单多补片造成中空关系订单数量与实际数据不匹配，实际数量大于订单数量，系统会重新生成一份关系造成关系进笼玻璃数据顺序存在重复而无法进笼。
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/service/UpWorkstationService.java | 35 ++++++++++++++++++++++-------------
1 files changed, 22 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 f489ca1..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,6 +1,8 @@
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.UpWorkstation;
/**
@@ -12,22 +14,29 @@
* @since 2024-04-07
*/
public interface UpWorkstationService extends IService<UpWorkstation> {
- //PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
- //鍒犻櫎浜哄伐鎼蛋鐨勭幓鐠冧俊鎭�
-// public void deleteGlass(int id);
- //鍒ゆ柇鏄惁鍙互鍚哥墖杩涜浠诲姟
-
- //鍒ゆ柇浼樺厛鍚哥墖浣嶇疆鍚庡彂閫佸嚭鐗囦换鍔�
- public void selectPriority();
-
- //鏌ヨ姝ｅ湪杩涜鐨勫伐绋�
-
-
+ //鍒ゆ柇浼樺厛鍚哥墖鐜荤拑
+ /**
+ * 鍒ゆ柇浼樺厛鍚哥墖浣嶇疆
+ * @return UpPattenUsage
+ */
+ UpPattenUsage selectPriority(Engineering engineering);
+ /**
+ * 鏌ヨ姝ｅ湪杩涜鐨勫崟鐗囦俊鎭�
+ * @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