From d645e0e3e3fa95e495037b4852ec7024f7387be5 Mon Sep 17 00:00:00 2001
From: lty <1179749281@qq.com>
Date: Mon, 27 Feb 2023 14:37:49 +0800
Subject: [PATCH] 优化入库单删除不了 盘点任务类型筛选改成搜索
---
ant-design-vue-jeecg/src/views/system/task/CircleTaskHeaderList.vue | 5 +----
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeaderHistory/service/impl/ReceiptHeaderHistoryServiceImpl.java | 4 +++-
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/ant-design-vue-jeecg/src/views/system/task/CircleTaskHeaderList.vue b/ant-design-vue-jeecg/src/views/system/task/CircleTaskHeaderList.vue
index 9c1c45d..3605624 100644
--- a/ant-design-vue-jeecg/src/views/system/task/CircleTaskHeaderList.vue
+++ b/ant-design-vue-jeecg/src/views/system/task/CircleTaskHeaderList.vue
@@ -230,10 +230,7 @@ export default {
title: '任务类型',
align: "center",
dataIndex: 'taskType_dictText',
- filters: [
- { text: '出库查看', value: 'male' },
- { text: '盘点', value: 'female' },
- ],
+ customFilterDropdown: true,
},
{
title: '容器号',
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeaderHistory/service/impl/ReceiptHeaderHistoryServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeaderHistory/service/impl/ReceiptHeaderHistoryServiceImpl.java
index 600f696..72bcd2f 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeaderHistory/service/impl/ReceiptHeaderHistoryServiceImpl.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeaderHistory/service/impl/ReceiptHeaderHistoryServiceImpl.java
@@ -97,6 +97,8 @@ public class ReceiptHeaderHistoryServiceImpl extends ServiceImpl<ReceiptHeaderHi
List<ReceiptDetailHistory> receiptDetailHistoryList = new ArrayList<>();
List<ReceiptDetail> receiptDetailList =
receiptDetailService.list(new LambdaQueryWrapper<ReceiptDetail>().eq(ReceiptDetail::getReceiptId, receiptHeader.getId()));
+ if (receiptDetailList.size() > 0)
+ {
for (ReceiptDetail detail : receiptDetailList) {
ReceiptDetailHistory receiptDetailHistory = new ReceiptDetailHistory();
BeanUtils.copyProperties(detail, receiptDetailHistory);
@@ -107,7 +109,7 @@ public class ReceiptHeaderHistoryServiceImpl extends ServiceImpl<ReceiptHeaderHi
if (!receiptDetailHistoryService.saveBatch(newList)) {
throw new ServiceException("批量新增失败");
}
-
+ }
}
}
--
libgit2 0.22.2