From 8785b6b5ee9298308752b53bf546953ae49b8c88 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期一, 21 十月 2024 09:56:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/service/RawGlassStorageDetailsService.java |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/service/RawGlassStorageDetailsService.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/service/RawGlassStorageDetailsService.java
index cd7ad71..3fea420 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/service/RawGlassStorageDetailsService.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/service/RawGlassStorageDetailsService.java
@@ -14,15 +14,12 @@
 
     List<RawGlassStorageDetails> selectDetails();
 
-
     /**
      * 鍒犻櫎琛�  鍏堝湪杩欓噷鍒�  鐒跺悗鐐归偅涓浉鍏抽棶棰�
      *
      * @return boolean
      */
     boolean deleteRawGlassStorageDetails(String device_id);
-
-
 
     /**
      * 鍘熺墖鍏ュ簱
@@ -38,5 +35,11 @@
 
     String outWarehousing(Long slotId);
 
-    List<Integer> listBySlotState(List<String> liftingStation, List<Integer> state);
+    List<Integer> 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);
 }
\ No newline at end of file

--
Gitblit v1.8.0