From 651dfb24aa82ea28e6348907bc02dc8c84a6e13f Mon Sep 17 00:00:00 2001 From: jiazx0107@163.com <jiazx0107@163.com> Date: 星期四, 29 六月 2023 19:33:12 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- igds-inout/src/main/java/com/ld/igds/inout/service/InoutService.java | 36 +++++++++++++----------------------- 1 files changed, 13 insertions(+), 23 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 6997400..23e0fca 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,6 +1,5 @@ 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.InoutPrice; @@ -48,7 +47,7 @@ * @return * @throws Exception */ - String inoutStop(InoutParam param); + String inoutStop(InoutParam param) throws Exception; /** * 鏍规嵁鏁版嵁娣诲姞锛� @@ -135,14 +134,6 @@ /** - * 鏍规嵁鏁版嵁杩涜鎺ㄩ�� - * - * @param result - */ - void notifyWeb(InoutData result); - - - /** * 鎺ㄩ�佸ぇ灞� * * @param companyId @@ -179,11 +170,10 @@ /** * 鑾峰彇褰撳墠浠撳簱涓嬫渶鍚庝竴鏉¤褰曚俊鎭� * - * @param companyId - * @param depotId + * @param param * @return */ - InoutData getLastRecord(String companyId, String depotId); + InoutData getLastRecord(InoutParam param); /** * 鏍规嵁鎹熸孩璁板綍锛屾坊鍔犲嚭鍏ュ簱璁板綍淇℃伅 @@ -206,15 +196,6 @@ * @param data */ void setCheckCache(InoutData data); - - /** - * 鏍规嵁缁勭粐缂栫爜鍜屽寲楠岋缉锛よ幏鍙栧寲楠岀粨鏋滀俊鎭� - * - * @param companyId - * @param checkId - * @return - */ - List<CheckItemData> getCheckCache(String companyId, String checkId); /** * 鑾峰彇鍑哄叆搴撴祦姘碔D搴忓彿 @@ -273,13 +254,22 @@ * @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); } -- Gitblit v1.9.3