Commit d645e0e3e3fa95e495037b4852ec7024f7387be5

Authored by 李泰瑜
1 parent e477d798

优化入库单删除不了 盘点任务类型筛选改成搜索

ant-design-vue-jeecg/src/views/system/task/CircleTaskHeaderList.vue
... ... @@ -230,10 +230,7 @@ export default {
230 230 title: '任务类型',
231 231 align: "center",
232 232 dataIndex: 'taskType_dictText',
233   - filters: [
234   - { text: '出库查看', value: 'male' },
235   - { text: '盘点', value: 'female' },
236   - ],
  233 + customFilterDropdown: true,
237 234 },
238 235 {
239 236 title: '容器号',
... ...
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
97 97 List<ReceiptDetailHistory> receiptDetailHistoryList = new ArrayList<>();
98 98 List<ReceiptDetail> receiptDetailList =
99 99 receiptDetailService.list(new LambdaQueryWrapper<ReceiptDetail>().eq(ReceiptDetail::getReceiptId, receiptHeader.getId()));
  100 + if (receiptDetailList.size() > 0)
  101 + {
100 102 for (ReceiptDetail detail : receiptDetailList) {
101 103 ReceiptDetailHistory receiptDetailHistory = new ReceiptDetailHistory();
102 104 BeanUtils.copyProperties(detail, receiptDetailHistory);
... ... @@ -107,7 +109,7 @@ public class ReceiptHeaderHistoryServiceImpl extends ServiceImpl&lt;ReceiptHeaderHi
107 109 if (!receiptDetailHistoryService.saveBatch(newList)) {
108 110 throw new ServiceException("批量新增失败");
109 111 }
110   -
  112 + }
111 113 }
112 114  
113 115 }
... ...