From d62cbd8da3bd2422de2923a6e7d999822730d632 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期六, 16 九月 2023 11:55:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-inout/src/main/java/com/ld/igds/inout/service/InoutService.java | 114 +++++++++++++++++++++++++++++---------------------------
1 files changed, 59 insertions(+), 55 deletions(-)
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/service/InoutService.java b/igds-inout/src/main/java/com/ld/igds/inout/service/InoutService.java
index b35779e..091e600 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/service/InoutService.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/service/InoutService.java
@@ -1,8 +1,9 @@
package com.ld.igds.inout.service;
-import com.ld.igds.check.dto.CheckItemData;
import com.ld.igds.data.Page;
import com.ld.igds.inout.dto.*;
+import com.ld.igds.models.InoutLossOver;
+import com.ld.igds.models.InoutPrice;
import java.util.Date;
import java.util.List;
@@ -47,7 +48,7 @@
* @return
* @throws Exception
*/
- String inoutStop(InoutParam param);
+ String inoutStop(InoutParam param) throws Exception;
/**
* 鏍规嵁鏁版嵁娣诲姞锛�
@@ -66,6 +67,14 @@
* @throws Exception
*/
String updateData(InoutData data) throws Exception;
+
+ /**
+ * 鍊间粨鐜妭鎻愪氦鏁版嵁锛屽彧鏇存柊閮ㄥ垎淇℃伅
+ *
+ * @param data
+ * @return
+ */
+ String updateDataByHandle(InoutData data);
/**
* 鍒嗛〉鑾峰彇浣忎俊鎭�
@@ -101,28 +110,12 @@
String toComplete(InoutParam param) throws Exception;
/**
- * 灏嗗嚭鍏ュ簱淇℃伅瀛樻斁鍒颁复鏃剁紦瀛樹腑锛岃繖涓紦瀛橀粯璁ゅ彧淇濈暀2澶╂椂闂�
- *
- * @param data
- */
- void addInoutCache(InoutData data);
-
- /**
- * 鏇存柊鍑哄叆搴撶紦瀛樹俊鎭�
+ * 灏嗗嚭鍏ュ簱娴佹按淇℃伅鏀惧埌缂撳瓨涓紝鍖呮嫭杩涜涓殑鍜屽凡缁忓畬鎴愮殑
*
* @param data
*/
void updateInoutCache(InoutData data);
- /**
- * 浠庣紦瀛樹腑鍒犻櫎鍑哄叆搴撶紦瀛�
- *
- * @param deptId
- * @param type
- * @param id
- * @param addToComplete
- */
- void delInoutFromCache(String deptId, String type, String id, boolean addToComplete);
/**
* 鑾峰彇鍑哄叆搴撳垪琛ㄤ俊鎭紝缂撳瓨鏃堕棿鏄�48灏忔椂
@@ -141,28 +134,12 @@
InoutData getFromInoutCache(InoutParam param);
/**
- * 鍒濆鍖栧嚭鍏ュ簱澶у睆鏁版嵁锛屼粎浠呭彂閫�
- *
- * @param deptId
- */
- void initInoutScreen(String deptId);
-
-
- /**
- * 鏍规嵁鏁版嵁杩涜鎺ㄩ��
- *
- * @param result
- */
- void notifyWeb(InoutData result);
-
- /**
* 蹇�熷畬鎴愭祦绋嬩腑鐨勮鍗�
*
* @param data
* @return
*/
String quickComplete(InoutData data) throws Exception;
-
/**
* 缂撳瓨涓幏鍙栧畬鎴愮殑娴佹按
@@ -183,11 +160,10 @@
/**
* 鑾峰彇褰撳墠浠撳簱涓嬫渶鍚庝竴鏉¤褰曚俊鎭�
*
- * @param companyId
- * @param depotId
+ * @param param
* @return
*/
- InoutData getLastRecord(String companyId, String depotId);
+ InoutData getLastRecord(InoutParam param);
/**
* 鏍规嵁鎹熸孩璁板綍锛屾坊鍔犲嚭鍏ュ簱璁板綍淇℃伅
@@ -203,22 +179,6 @@
* @param param
*/
void delInoutDataByLossOver(InoutParam param);
-
- /**
- * 灏嗗寲楠岀粨鏋滃瓨鍏ョ紦瀛樹腑
- *
- * @param data
- */
- void setCheckCache(InoutData data);
-
- /**
- * 鏍规嵁缁勭粐缂栫爜鍜屽寲楠岋缉锛よ幏鍙栧寲楠岀粨鏋滀俊鎭�
- *
- * @param companyId
- * @param checkId
- * @return
- */
- List<CheckItemData> getCheckCache(String companyId, String checkId);
/**
* 鑾峰彇鍑哄叆搴撴祦姘碔D搴忓彿
@@ -255,6 +215,7 @@
/**
* 鏇存柊鎵︽牱淇℃伅
+ *
* @param data
* @return
* @throws Exception
@@ -271,9 +232,52 @@
/**
* 鏇存柊鍖栭獙淇℃伅
+ *
* @param data
* @return
* @throws Exception
*/
- String updateCheckData(InoutCheckData data);
+ String updateCheckData(InoutData data);
+
+ /**
+ * 鑾峰彇绮瀹氫环
+ *
+ * @param param
+ * @return
+ */
+ List<InoutPrice> getPrice(InoutCheckParam param);
+
+ /**
+ * 浠庣紦瀛樹腑鍒犻櫎
+ *
+ * @param deptId
+ * @param type
+ * @param id
+ */
+ void delFromCache(String deptId, String type, String id);
+
+ /**
+ * 鏍规嵁鍙傛暟鏌ヨ鏁版嵁锛屾祦绋嬩腑鐨勬暟鎹�
+ *
+ * @param param
+ * @return
+ * @throws Exception
+ */
+ InoutCheckData inoutDataByCheckId(InoutCheckParam param) throws Exception;
+
+ /**
+ * 鏍规嵁鏉′欢鑾峰彇鎹熺泭鍒楄〃锛岀敤浜庣粺璁″簱瀛樹娇鐢�
+ *
+ * @param param
+ * @return
+ */
+ List<InoutLossOver> listLossOver(InoutParam param);
+
+ /**
+ * 鑾峰彇鍑哄叆搴撲粠寮�濮嬪懆鏈熷埌缁撴潫鍛ㄦ湡鍐咃紝鍑哄叆搴撶殑鍏ュ簱閲嶉噺鍚堣
+ *
+ * @param param
+ * @return
+ */
+ double sumLossOverWeight(InoutParam param);
}
--
Gitblit v1.9.3