From 65ae6084f552c035eb5640afbd8f73e6054e3b6c Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 16 七月 2024 21:15:53 +0800
Subject: [PATCH] 1、大理片：fixbug:大理片出片逻辑修改，钢化版图是否到齐：sql逻辑问题，包含人工出片任务，造成钢化版图是否到齐需要获取已出片的玻璃，造成已出笼的玻璃会重复计算并准备生成钢化任务，但获取的玻璃信息为空，造成插入钢化表异常。且排除已出笼的钢化版图较复杂（暂不关联钢化小片表），目前解决方案：把所有到齐的钢化版图数据查出来，排除笼内玻璃为空的 2、移除已配置完mapperscan已扫描仍有@Mapper注解的
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/service/UpWorkstationService.java | 38 ++++++++++++++++++++++----------------
1 files changed, 22 insertions(+), 16 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 9d79c99..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,11 +1,9 @@
package com.mes.workstation.service;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.mes.pp.entity.OptimizeProject;
-import com.mes.pp.entity.request.OptimizeRequest;
+import com.mes.engineering.entity.Engineering;
+import com.mes.uppattenusage.entity.UpPattenUsage;
import com.mes.workstation.entity.UpWorkstation;
-
-import java.util.List;
/**
* <p>
@@ -16,21 +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