From 5382d30827792f6cf3fb044297b74bc78db8dae7 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期五, 14 三月 2025 09:45:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/rawglassdetails/service/RawGlassStorageDetailsService.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/rawglassdetails/service/RawGlassStorageDetailsService.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/rawglassdetails/service/RawGlassStorageDetailsService.java
index e5955cf..9f83829 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/rawglassdetails/service/RawGlassStorageDetailsService.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/rawglassdetails/service/RawGlassStorageDetailsService.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.mes.rawglassdetails.entity.RawGlassStorageDetails;
+import com.mes.rawglassdetails.entity.dto.RawGlassStorageDetailsDTO;
import com.mes.rawglassdetails.entity.request.RawGlassRequest;
import java.util.List;
@@ -29,17 +30,23 @@
*/
String patternWarehousing(RawGlassRequest request);
- String UpdateQuantity(RawGlassRequest request);
+ String updateQuantity(RawGlassRequest request);
String deleteWarehousing(Long slotId);
String outWarehousing(Long slotId);
- List<Integer> listBySlotState(List<Integer> liftingStation, List<Integer> state);
+ List<RawGlassStorageDetails> listBySlotState(List<Integer> liftingStation, List<Integer> state);
String warehousingRequest(int leftingStation);
String outWarehousingRequest(int leftingStation);
boolean generateTask(int startSlot, int endSlot, int shelf, int patternQuantity, int taskType) throws Exception;
+
+ String shelfReset(Long slot);
+
+ List<RawGlassStorageDetailsDTO> patternUsage(String width, String height, String thickness, String films);
+
+ RawGlassStorageDetails generateDetails(RawGlassStorageDetails details, Integer targetSlot);
}
\ No newline at end of file
--
Gitblit v1.8.0