From d8047152e563ba7816208a3fe9cf1ffdc9cddc83 Mon Sep 17 00:00:00 2001 From: jiazx0107@163.com <jiazx0107@163.com> Date: 星期三, 21 六月 2023 23:36:37 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- igds-inout/src/main/java/com/ld/igds/inout/service/InoutService.java | 39 ++++++++++++++++++--------------------- 1 files changed, 18 insertions(+), 21 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 82f981e..774ea94 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,8 @@ 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; import java.util.Date; import java.util.List; @@ -134,14 +134,6 @@ /** - * 鏍规嵁鏁版嵁杩涜鎺ㄩ�� - * - * @param result - */ - void notifyWeb(InoutData result); - - - /** * 鎺ㄩ�佸ぇ灞� * * @param companyId @@ -178,11 +170,10 @@ /** * 鑾峰彇褰撳墠浠撳簱涓嬫渶鍚庝竴鏉¤褰曚俊鎭� * - * @param companyId - * @param depotId + * @param param * @return */ - InoutData getLastRecord(String companyId, String depotId); + InoutData getLastRecord(InoutParam param); /** * 鏍规嵁鎹熸孩璁板綍锛屾坊鍔犲嚭鍏ュ簱璁板綍淇℃伅 @@ -205,15 +196,6 @@ * @param data */ void setCheckCache(InoutData data); - - /** - * 鏍规嵁缁勭粐缂栫爜鍜屽寲楠岋缉锛よ幏鍙栧寲楠岀粨鏋滀俊鎭� - * - * @param companyId - * @param checkId - * @return - */ - List<CheckItemData> getCheckCache(String companyId, String checkId); /** * 鑾峰彇鍑哄叆搴撴祦姘碔D搴忓彿 @@ -274,5 +256,20 @@ */ String updateCheckData(InoutCheckData 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