From 1e2d55b9f92cebfc9909e83e09478c864fa11ca0 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 09 一月 2025 11:47:13 +0800
Subject: [PATCH] bug修改
---
manage/src/main/java/com/jilongda/manage/service/impl/TWarehousingServiceImpl.java | 3 +++
optometrist/src/main/java/com/jilongda/optometrist/controller/TOptometristController.java | 4 ++--
2 files changed, 5 insertions(+), 2 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 6a960eb..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,6 +54,9 @@
.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)){
diff --git a/optometrist/src/main/java/com/jilongda/optometrist/controller/TOptometristController.java b/optometrist/src/main/java/com/jilongda/optometrist/controller/TOptometristController.java
index d20b079..79b470b 100644
--- a/optometrist/src/main/java/com/jilongda/optometrist/controller/TOptometristController.java
+++ b/optometrist/src/main/java/com/jilongda/optometrist/controller/TOptometristController.java
@@ -187,11 +187,11 @@
@GetMapping(value = "/cancelLineUp")
public ApiResult cancelLineUp(Integer id) {
TLineUp lineUp = tLineUpService.getById(id);
- lineUp.setStatus(5);
+ lineUp.setStatus(4);
tLineUpService.updateById(lineUp);
TOptometry one = optometryService.lambdaQuery().eq(TOptometry::getLineUpId, lineUp.getId()).one();
if (one!=null){
- one.setStatus(5);
+ one.setStatus(4);
optometryService.updateById(one);
}
return ApiResult.success();
--
Gitblit v1.7.1