From bfc43ca0e4683c1c0322a6cad5d5be2bc07decc3 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 24 七月 2025 15:00:44 +0800
Subject: [PATCH] 新增调拔单功能 盘点功能优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java
index 62b4973..58b8709 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java
@@ -7,6 +7,7 @@
import com.vincent.rsf.server.api.service.WcsService;
import com.vincent.rsf.server.api.utils.LocUtils;
import com.vincent.rsf.server.common.constant.Constants;
+import com.vincent.rsf.server.manager.controller.params.CheckLocQueryParams;
import com.vincent.rsf.server.manager.controller.params.LocToTaskParams;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.enums.*;
@@ -73,11 +74,11 @@
String siteNo = map.getSiteNo();
List<LocItem> items = map.getItems();
Map<Long, List<LocItem>> listMap = items.stream().collect(Collectors.groupingBy(LocItem::getLocId));
- AsnOrder order;
+ WkOrder order;
Wave wave;
if (!Objects.isNull(map.getSourceId())) {
if (map.getType().equals(Constants.TASK_TYPE_WAVE_OUT_STOCK)) {
- order = new AsnOrder();
+ order = new WkOrder();
wave = waveService.getById(map.getSourceId());
} else {
wave = new Wave();
@@ -85,7 +86,7 @@
}
} else {
wave = new Wave();
- order = new AsnOrder();
+ order = new WkOrder();
}
listMap.keySet().forEach(key -> {
@@ -218,6 +219,7 @@
.setSourceId(order.getId());
} else if (map.getType().equals(Constants.TASK_TYPE_WAVE_OUT_STOCK)) {
taskItem.setSourceId(wave.getId())
+ .setWkType(Short.parseShort(OrderWorkType.ORDER_WORK_TYPE_OTHER.type))
.setSourceCode(wave.getCode())
.setSource(item.getSource());
} else if (map.getType().equals(Constants.TASK_TYPE_OUT_CHECK) || map.getType().equals(Constants.TASK_TYPE_OUT_STOCK)) {
@@ -362,4 +364,19 @@
}
return task;
}
+
+ /**
+ * @author Ryan
+ * @date 2025/7/16
+ * @description: 鑾峰彇褰撳墠鐗╂枡鎵�鏈夊簱瀛樹俊鎭�
+ * @version 1.0
+ */
+ @Override
+ public List<LocItem> listByMatnr(CheckLocQueryParams matnr) {
+ LambdaQueryWrapper<LocItem> wrapper = new LambdaQueryWrapper<LocItem>()
+ .eq(StringUtils.isNotBlank(matnr.getLocCode()), LocItem::getLocCode, matnr.getLocCode())
+// .eq(StringUtils.isNotBlank(matnr.getChannel()), LocItem::getChannel, matnr.getChannel())
+ .in(!matnr.getMatnrCode().isEmpty(), LocItem::getMatnrCode, matnr.getMatnrCode());
+ return this.baseMapper.listByMatnr(LocStsType.LOC_STS_TYPE_F.type, matnr.getChannel(), wrapper);
+ }
}
--
Gitblit v1.9.1