From 0caed17a984ea21a0b92478f52cf90c101d1085e Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 08 七月 2024 16:08:38 +0800
Subject: [PATCH] Merge branch 'tzhneasrs' of http://47.97.1.152:5880/r/zy-asrs into tzhneasrs
---
src/main/java/com/zy/asrs/service/OpenService.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/OpenService.java b/src/main/java/com/zy/asrs/service/OpenService.java
index afd90b1..a6c4229 100644
--- a/src/main/java/com/zy/asrs/service/OpenService.java
+++ b/src/main/java/com/zy/asrs/service/OpenService.java
@@ -1,9 +1,11 @@
package com.zy.asrs.service;
+import com.alibaba.fastjson.JSONObject;
+import com.core.common.R;
import com.zy.asrs.entity.param.*;
-import com.zy.asrs.entity.result.OpenOrderCompeteResult;
import com.zy.asrs.entity.result.StockVo;
+import java.text.ParseException;
import java.util.List;
public interface OpenService {
@@ -16,7 +18,7 @@
/**
* 鍏ュ簱鍗曞洖鍐�
*/
- List<OpenOrderCompeteResult> pakinOrderComplete(OpenOrderCompleteParam param);
+// List<OpenOrderCompeteResult> pakinOrderComplete(OpenOrderCompleteParam param);
/**
* 娣诲姞鍏ュ簱鍗�
@@ -26,12 +28,12 @@
/**
* 鍏ュ簱鍗曞洖鍐�
*/
- List<OpenOrderCompeteResult> pakoutOrderComplete(OpenOrderCompleteParam param);
+// List<OpenOrderCompeteResult> pakoutOrderComplete(OpenOrderCompleteParam param);
/**
* 搴撳瓨缁熻
*/
- List<StockVo> queryStock();
+ List<StockVo> queryStock(StockVo stockVo);
// ------------------------------------------
@@ -43,4 +45,9 @@
* @param param
*/
void syncMat(MatSyncParam param);
+
+ R getInOutDetl();
+ DigitalTwin inventoryQuantity();
+
+ int pakinReportErp(JSONObject jsonObject) throws ParseException;
}
--
Gitblit v1.9.1