From 785ce007ce4b7b2119a99aacc95cefe9da09e32e Mon Sep 17 00:00:00 2001 From: jiazx0107@163.com <jiazx0107@163.com> Date: 星期二, 04 七月 2023 16:49:09 +0800 Subject: [PATCH] 优化出入库逻辑,调整节点事件 --- igds-inout/src/main/java/com/ld/igds/inout/service/InoutService.java | 118 ++++++++++++++++++++++++++++++++--------------------------- 1 files changed, 64 insertions(+), 54 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 791b08c..3d907db 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; @@ -47,7 +47,7 @@ * @return * @throws Exception */ - String inoutStop(InoutParam param); + String inoutStop(InoutParam param) throws Exception; /** * 鏍规嵁鏁版嵁娣诲姞锛� @@ -66,6 +66,14 @@ * @throws Exception */ String updateData(InoutData data) throws Exception; + + /** + * 鍊间粨鐜妭鎻愪氦鏁版嵁锛屽彧鏇存柊閮ㄥ垎淇℃伅 + * + * @param data + * @return + */ + String updateDataByHandle(InoutData data); /** * 鍒嗛〉鑾峰彇浣忎俊鎭� @@ -101,28 +109,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 +133,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 +159,10 @@ /** * 鑾峰彇褰撳墠浠撳簱涓嬫渶鍚庝竴鏉¤褰曚俊鎭� * - * @param companyId - * @param depotId + * @param param * @return */ - InoutData getLastRecord(String companyId, String depotId); + InoutData getLastRecord(InoutParam param); /** * 鏍规嵁鎹熸孩璁板綍锛屾坊鍔犲嚭鍏ュ簱璁板綍淇℃伅 @@ -203,22 +178,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搴忓彿 @@ -244,4 +203,55 @@ * @return */ int checkExist(InoutParam param); + + /** + * 鍒嗛〉鑾峰彇鎵︽牱鏁版嵁 + * + * @param param + * @return + */ + Page<InoutCheckData> pageSampleData(InoutCheckParam param); + + /** + * 鏇存柊鎵︽牱淇℃伅 + * + * @param data + * @return + * @throws Exception + */ + String updateSampleData(InoutCheckData data); + + /** + * 鍒嗛〉鑾峰彇鍖栭獙鏁版嵁 + * + * @param param + * @return + */ + Page<InoutCheckData> pageCheckData(InoutCheckParam param); + + /** + * 鏇存柊鍖栭獙淇℃伅 + * + * @param data + * @return + * @throws Exception + */ + 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