From d52bab61f91056e75e60ddeda76a72cd1bd63615 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 07 八月 2025 14:40:00 +0800
Subject: [PATCH] no message
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderController.java | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderController.java
index 6641e2f..5826e9f 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderController.java
@@ -11,16 +11,13 @@
import com.zy.asrs.wms.asrs.entity.param.CreateOrderParam;
import com.zy.asrs.wms.asrs.entity.param.UpdateOrderParam;
import com.zy.asrs.wms.asrs.entity.template.OrderTemplate;
-import com.zy.asrs.wms.asrs.service.CacheSiteService;
-import com.zy.asrs.wms.asrs.service.MatFieldService;
-import com.zy.asrs.wms.asrs.service.OrderTypeService;
+import com.zy.asrs.wms.asrs.service.*;
import com.zy.asrs.wms.asrs.service.impl.OrderDetlServiceImpl;
import com.zy.asrs.wms.common.annotation.CacheData;
import com.zy.asrs.wms.common.annotation.OperationLog;
import com.zy.asrs.wms.common.domain.BaseParam;
import com.zy.asrs.wms.common.domain.KeyValVo;
import com.zy.asrs.wms.common.domain.PageParam;
-import com.zy.asrs.wms.asrs.service.OrderService;
import com.zy.asrs.wms.system.controller.BaseController;
import com.zy.asrs.wms.utils.ExcelUtil;
import com.zy.asrs.wms.utils.Utils;
@@ -47,6 +44,8 @@
private OrderDetlServiceImpl orderDetlService;
@Autowired
private CacheSiteService cacheSiteService;
+ @Autowired
+ private WaveService waveService;
@PreAuthorize("hasAuthority('asrs:order:list')")
@PostMapping("/order/page")
@@ -157,11 +156,11 @@
Double sum = detls.stream().mapToDouble(OrderDetl::getAnfme).sum();
order.setWaitQty(sum);
}
-
- CacheSite cacheSite = cacheSiteService.getOne(new LambdaQueryWrapper<CacheSite>()
- .eq(CacheSite::getOrderId, order.getId()), false);
- if (!Objects.isNull(cacheSite)) {
- order.setSite(cacheSite.getChannel());
+ if (!Objects.isNull(order.getWaveId())) {
+ Wave wave = waveService.getById(order.getWaveId());
+ if (!Objects.isNull(wave)) {
+ order.setSite(wave.getSite());
+ }
}
return R.ok().add(order);
}
--
Gitblit v1.9.1