From 81021cabe80842d66001b89ad8290cc42a2fcd16 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 06 五月 2025 17:47:09 +0800
Subject: [PATCH] 组拖筛选条件删除
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/PurchaseItemServiceImpl.java | 25 ++++++++++++++++++++++++-
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/PakinItem.java | 2 ++
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java | 5 +----
3 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
index 3edd8e4..6ad7541 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
@@ -867,11 +867,8 @@
} else {
List<String> list = pakinItems.stream().map(WaitPakinItem::getTrackCode).collect(Collectors.toList());
LambdaQueryWrapper<WarehouseAreasItem> queryWrapper = new QueryWrapper<WarehouseAreasItem>()
- .select("SUM(anfme) as anfme, track_code, asn_code, id, splr_batch, ispt_result, plat_item_id, batch, qty, work_qty, matnr_code, matnr_id, maktx")
.lambda()
- .in(WarehouseAreasItem::getTrackCode, list)
- .groupBy(WarehouseAreasItem::getSplrBatch,
- WarehouseAreasItem::getTrackCode);
+ .in(WarehouseAreasItem::getTrackCode, list);
List<WarehouseAreasItem> warehouseAreasItems = warehouseAreasItemService.list(queryWrapper);
for (int i = 0; i < warehouseAreasItems.size(); i++) {
for (WaitPakinItem pakinItem : pakinItems) {
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/PakinItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/PakinItem.java
index 3935df3..5828a44 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/PakinItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/PakinItem.java
@@ -12,6 +12,8 @@
public class PakinItem implements Serializable {
private String trackCode;
+ private Long id;
+
private Long matnrId;
private Double receiptQty;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/PurchaseItemServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/PurchaseItemServiceImpl.java
index 15131db..59905b3 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/PurchaseItemServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/PurchaseItemServiceImpl.java
@@ -2,9 +2,11 @@
import cn.afterturn.easypoi.excel.ExcelImportUtil;
import cn.afterturn.easypoi.excel.entity.result.ExcelImportResult;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.common.utils.ExcelUtil;
+import com.vincent.rsf.server.manager.entity.Purchase;
import com.vincent.rsf.server.manager.entity.excel.AsnOrderTemplate;
import com.vincent.rsf.server.manager.entity.excel.PurchaseTemplate;
import com.vincent.rsf.server.manager.mapper.PurchaseItemMapper;
@@ -16,9 +18,19 @@
import java.io.IOException;
import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
@Service("purchaseItemService")
public class PurchaseItemServiceImpl extends ServiceImpl<PurchaseItemMapper, PurchaseItem> implements PurchaseItemService {
+
+ private final PurchaseServiceImpl purchaseService;
+
+ public PurchaseItemServiceImpl(PurchaseServiceImpl purchaseService) {
+ this.purchaseService = purchaseService;
+ }
/**
* @author Ryan
@@ -35,9 +47,20 @@
if (result.getList().isEmpty()) {
throw new CoolException("琛ㄦ牸鍐呭涓嶈兘涓虹┖锛侊紒");
}
+ List<PurchaseTemplate> resultList = result.getList();
+ Map<String, List<PurchaseTemplate>> listMap = resultList.stream().collect(Collectors.groupingBy(PurchaseTemplate::getPoCode));
+ for (String key : listMap.keySet()) {
+ List<PurchaseTemplate> list = listMap.get(key);
+ Purchase serviceOne = purchaseService.getOne(new LambdaQueryWrapper<Purchase>().eq(Purchase::getCode, key));
+ if (!Objects.isNull(serviceOne)) {
+ continue;
+ }
+ PurchaseTemplate template = list.stream().findFirst().get();
+ Purchase purchase = new Purchase();
+ purchase.setCode(template.getPoCode()).set;
-
+ }
return null;
}
}
--
Gitblit v1.9.1