From f414fdf1c64204218a666ad94f2baef7a3952383 Mon Sep 17 00:00:00 2001
From: pengcheng <1432755665@qq.com>
Date: Mon, 9 Dec 2019 17:40:27 +0800
Subject: [PATCH] 历史单修改
---
src/main/java/com/huaheng/pc/receipt/receiptHeaderHistory/service/ReceiptHeaderHistoryService.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/main/java/com/huaheng/pc/receipt/receiptHeaderHistory/service/ReceiptHeaderHistoryService.java b/src/main/java/com/huaheng/pc/receipt/receiptHeaderHistory/service/ReceiptHeaderHistoryService.java
index 255d00d..d9b02d8 100644
--- a/src/main/java/com/huaheng/pc/receipt/receiptHeaderHistory/service/ReceiptHeaderHistoryService.java
+++ b/src/main/java/com/huaheng/pc/receipt/receiptHeaderHistory/service/ReceiptHeaderHistoryService.java
@@ -70,12 +70,16 @@ public class ReceiptHeaderHistoryService extends ServiceImpl<ReceiptHeaderHistor
if (!receiptHeaderService.removeById(receiptHeader.getId())){
throw new ServiceException("删除头表失败");
}
+ if(!this.save(receiptHeaderHistory)){
+ throw new ServiceException("新增历史入库单失败");
+ }
// 当存在明细时删除
if (list.size()!= 0){
//删除入库明细
List<Integer> receiptDetailIds = new ArrayList<>();
for (int i=0; i<receiptDetailHistoryList.size();i++){
receiptDetailHistoryList.get(i).setLastUpdatedBy(ShiroUtils.getLoginName());
+ receiptDetailHistoryList.get(i).setReceiptId(receiptHeaderHistory.getId());
receiptDetailIds.add(receiptDetailHistoryList.get(i).getId());
}
if (!receiptDetailService.removeByIds(receiptDetailIds)) {
@@ -84,7 +88,7 @@ public class ReceiptHeaderHistoryService extends ServiceImpl<ReceiptHeaderHistor
if (!receiptDetailHistoryService.saveBatch(receiptDetailHistoryList)){
throw new ServiceException("新增明细失败");
} }
- this.save(receiptHeaderHistory);
+
}else {
return AjaxResult.success("入库单没有完成，无法删除");
}
--
libgit2 0.22.2