From f96c2adc8d6bab6a4ee67a50ecfc9e6c7e435efd Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期一, 24 四月 2023 08:50:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/stasrs' into stasrs
---
src/main/java/com/zy/asrs/service/OpenService.java | 28 +++++++++++++++++++++-------
1 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/OpenService.java b/src/main/java/com/zy/asrs/service/OpenService.java
index df294c2..be4655c 100644
--- a/src/main/java/com/zy/asrs/service/OpenService.java
+++ b/src/main/java/com/zy/asrs/service/OpenService.java
@@ -1,9 +1,8 @@
package com.zy.asrs.service;
-import com.zy.asrs.entity.param.OpenOrderCompleteParam;
-import com.zy.asrs.entity.param.OpenOrderPakinParam;
-import com.zy.asrs.entity.param.OpenOrderPakoutParam;
-import com.zy.asrs.entity.result.OpenOrderCompeteResult;
+import com.alibaba.fastjson.JSONObject;
+import com.core.common.R;
+import com.zy.asrs.entity.param.*;
import com.zy.asrs.entity.result.StockVo;
import java.util.List;
@@ -18,7 +17,7 @@
/**
* 鍏ュ簱鍗曞洖鍐�
*/
- List<OpenOrderCompeteResult> pakinOrderComplete(OpenOrderCompleteParam param);
+// List<OpenOrderCompeteResult> pakinOrderComplete(OpenOrderCompleteParam param);
/**
* 娣诲姞鍏ュ簱鍗�
@@ -28,12 +27,27 @@
/**
* 鍏ュ簱鍗曞洖鍐�
*/
- List<OpenOrderCompeteResult> pakoutOrderComplete(OpenOrderCompleteParam param);
+// List<OpenOrderCompeteResult> pakoutOrderComplete(OpenOrderCompleteParam param);
/**
* 搴撳瓨缁熻
*/
- List<StockVo> queryStock();
+ List<StockVo> queryStock(StockVo stockVo);
+ // ------------------------------------------
+ // 鎵撳寘涓婄嚎
+ void packageUp(PackParam param);
+
+ /**
+ * 鍚屾鍟嗗搧淇℃伅
+ * @param param
+ */
+ void syncMat(MatSyncParam param);
+
+ R getInOutDetl();
+
+ R manDetlIn(JSONObject json);
+
+ R manDetlOut(JSONObject json);
}
--
Gitblit v1.9.1