From 2bbb655dcb98b9d54083286825f14bf8aff7143b Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期二, 20 一月 2026 17:22:36 +0800
Subject: [PATCH] 1. 查询库存接口调整优化
---
src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java | 17 +++++++----------
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 11 ++++++++++-
2 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java b/src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java
index 865f9d7..aa2ecac 100644
--- a/src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java
+++ b/src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java
@@ -563,16 +563,13 @@
if (Objects.isNull(params) || params.isEmpty()) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
-
- Set<String> collect = params.stream().map(PageRequestParams::getPro_id).collect(Collectors.toSet());
-
- Set<String> komccodes = params.stream().map(PageRequestParams::getPro_komcode).collect(Collectors.toSet());
-
- EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
- wrapper.in(collect.isEmpty(), "pro_id", collect);
- wrapper.in(komccodes.isEmpty(), "komccode", komccodes);
-
- List<LocDetl> detls = locDetlService.selectList(wrapper);
+ List<LocDetl> detls = new ArrayList<>();
+ params.forEach(param -> {
+ List<LocDetl> selectList = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("supp_code", param.getPro_id()).eq("matnr", param.getPro_komcode()));
+ if (selectList != null && !selectList.isEmpty()) {
+ detls.addAll(selectList);
+ }
+ });
if (detls == null || detls.isEmpty()) {
return XSR.ok();
diff --git a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
index 83e07af..5b28ddd 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -458,6 +458,14 @@
if (Objects.isNull(material)) {
throw new CoolException("鐗╂枡涓嶅瓨鍦�");
}
+
+ TaskDetlLog detlLog = taskDetlLogService.selectOne(new EntityWrapper<TaskDetlLog>()
+ .eq("matnr", detl.getMatnr())
+ .eq("supp_code", detl.getStandby1())
+ .eq("order_no", detl.getOrderNo()));
+ if (Objects.isNull(detlLog)) {
+ throw new CoolException("鏁版嵁閿欒 锛岃妫�鏌GV浠诲姟妗ｆ槸鍚﹀凡瀹屾垚锛侊紒");
+ }
OrderItemsParam itemParam = new OrderItemsParam();
// 涓婃姤鏃讹紝榛樿浜у搧绫诲瀷鏄痭ull
itemParam.setPro_type(material.getProType());
@@ -466,9 +474,10 @@
// 涓婃姤鏃讹紝榛樿浜у搧id鏄緵搴斿晢缂栫爜
itemParam.setPro_id(detl.getSuppCode());
//todo 鍙拌溅缂栫爜
- itemParam.setTruck_no("TC310080014");
+ itemParam.setTruck_no(detlLog.getZpallet());
// 涓婃姤鏃讹紝榛樿涓婃姤鏃堕棿鏄洿鏂版椂闂�
itemParam.setPick_qty(detl.getQty().intValue());
+
reportOrderParams.add(itemParam);
});
pubOrderParams.setPartList(reportOrderParams);
--
Gitblit v1.9.1