From 585e878b169bdeb2bc8cc452b9d2e640d00caa6d Mon Sep 17 00:00:00 2001 From: YYC <1833023622@qq.com> Date: 星期二, 04 七月 2023 09:00:35 +0800 Subject: [PATCH] 质检报告 --- igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java | 24 +++++++++++++++++------- 1 files changed, 17 insertions(+), 7 deletions(-) diff --git a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java index db7a478..9373ae5 100644 --- a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java +++ b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java @@ -199,9 +199,12 @@ * @param data * @return */ - private InoutData updateCheckItems(InoutData data) throws Exception { + private InoutData updateCheckItems(InoutData data, boolean toSave) throws Exception { if (null == data.getCheckItems()) return data; + + //璁剧疆娌℃湁璐ㄦID锛屽彇娑堟墽琛屾寔涔呭寲 + if (!toSave) data.setCheckId(null); // 鏇存柊妫�楠岄」鏁版嵁 CheckUpdateResult checkUpdateResult = checkStandardManager.updateCheckItems(data.getCheckId(), data.getCompanyId(), data.getCheckItems()); @@ -424,7 +427,7 @@ data.setEmptyWeightTime(DateUtil.getNewByMinute(new Date(), -10)); } - data = this.updateCheckItems(data); + data = this.updateCheckItems(data, false); } else { if (null == data.getEmptyWeightTime()) { data.setEmptyWeightTime(DateUtil.getNewByMinute(new Date(), -50)); @@ -434,8 +437,15 @@ } } - // 娣诲姞琛ュ崟鏁版嵁 - return inoutService.insertData(data); + + //鍏堜繚瀛樹富琛紝鍚庢墽琛屽瓙琛� + inoutService.insertData(data); + + if (InoutConstant.TYPE_IN.equals(data.getType())) { + this.updateCheckItems(data, true); + } + + return null; } /** @@ -459,7 +469,7 @@ // 淇濆瓨妫�娴嬮」鐩� if (InoutConstant.TYPE_IN.equals(data.getType())) { - data = updateCheckItems(data); + data = updateCheckItems(data, true); } return inoutService.updateData(data); @@ -621,7 +631,7 @@ data = updateBasicInfo(data, curProgress, nextProgress); // 鍏ュ簱绉伴噸鍙兘璋冩暣璐ㄦ鍗� - data = updateCheckItems(data); + data = updateCheckItems(data, true); // 鎵ц鏁版嵁鏇存柊 String msg = inoutService.updateData(data); @@ -898,7 +908,7 @@ try { List<CheckItemData> result = checkStandardManager.listCheckItem( - param.getCheckId(), param.getCompanyId(), + param.getCompanyId(),param.getCheckId(), param.getFoodVariety()); return new PageResponse<>(RespCodeEnum.CODE_0000, result); -- Gitblit v1.9.3