From 76110e19293027965ebade736b3870a6c1888804 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 09 八月 2025 16:18:34 +0800
Subject: [PATCH] Merge branch 'ycds-wms-dev' of http://47.97.1.152:5880/r/zy-asrs-master into ycds-wms-dev
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderController.java | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 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 acab6ee..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
@@ -6,23 +6,18 @@
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.R;
import com.zy.asrs.framework.exception.CoolException;
-import com.zy.asrs.wms.asrs.entity.MatField;
-import com.zy.asrs.wms.asrs.entity.OrderDetl;
-import com.zy.asrs.wms.asrs.entity.OrderType;
+import com.zy.asrs.wms.asrs.entity.*;
import com.zy.asrs.wms.asrs.entity.enums.OrderSettleType;
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.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.entity.Order;
-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 +42,10 @@
private MatFieldService matFieldService;
@Autowired
private OrderDetlServiceImpl orderDetlService;
+ @Autowired
+ private CacheSiteService cacheSiteService;
+ @Autowired
+ private WaveService waveService;
@PreAuthorize("hasAuthority('asrs:order:list')")
@PostMapping("/order/page")
@@ -157,6 +156,12 @@
Double sum = detls.stream().mapToDouble(OrderDetl::getAnfme).sum();
order.setWaitQty(sum);
}
+ 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