From dc97b71863725241ad02ea2692edfc9f076cf627 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 09 一月 2025 14:56:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
manage/src/main/java/com/jilongda/manage/service/impl/TWarehousingServiceImpl.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/manage/src/main/java/com/jilongda/manage/service/impl/TWarehousingServiceImpl.java b/manage/src/main/java/com/jilongda/manage/service/impl/TWarehousingServiceImpl.java
index c92b421..d018d24 100644
--- a/manage/src/main/java/com/jilongda/manage/service/impl/TWarehousingServiceImpl.java
+++ b/manage/src/main/java/com/jilongda/manage/service/impl/TWarehousingServiceImpl.java
@@ -54,12 +54,16 @@
.in(TStore::getId,storeIds));
}
for (TFrameWarehousingDetailVO tFrameWarehousingDetailVO : list) {
+ if (tFrameWarehousingDetailVO.getOrderId()!=null){
+ tFrameWarehousingDetailVO.setStatus(5);
+ }
if(CollectionUtils.isNotEmpty(stores)){
TStore store = stores.stream().filter(tStore -> tStore.getId().equals(tFrameWarehousingDetailVO.getStoreId())).findFirst().orElse(null);
if(Objects.nonNull(store)){
tFrameWarehousingDetailVO.setStoreName(store.getName());
}
}
+// tFrameWarehousingDetailVO.setStatus();
}
pageInfo.setRecords(list);
return pageInfo;
--
Gitblit v1.7.1