From 669fe984048785873c20fbd0ce8abb3cd52c1fce Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 29 四月 2025 15:22:24 +0800
Subject: [PATCH] 新增出库单优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java | 41 +++++++++++++++++++----------------------
1 files changed, 19 insertions(+), 22 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
index a6ea80f..fcc9fcb 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
@@ -54,16 +54,8 @@
private StockItemService stockItemService;
@Autowired
private DeviceSiteService deviceSiteService;
-
- @Autowired
- private OrderService orderService;
-
- @Autowired
- private OrderItemService orderItemService;
-
@Autowired
private LocItemService locItemService;
-
@Autowired
private DeviceBindService deviceBindService;
@Autowired
@@ -124,20 +116,25 @@
.setTargLoc(targetLoc)
.setBarcode(pakin.getBarcode())
.setOrgSite(deviceSite.getSite())
- .setTargSite(deviceSite.getDeviceCode())
+ .setTargSite(deviceSite.getDeviceSite())
.setCreateBy(loginUserId)
.setUpdateBy(loginUserId);
-
- if (!Objects.isNull(waitPakin.getLocCode()) && StringUtils.isNotBlank(waitPakin.getLocCode())) {
- List<Loc> locs = locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, waitPakin.getLocCode()));
-// if (!locs.isEmpty()) {
-// throw new CoolException("搴撲綅閿欒锛氱浉鍚屽簱浣嶅簲鍙竴鏉�")
-// }
- Loc loc = locs.stream().findFirst().get();
- task.setTargSite(loc.getCode());
- } else {
- task.setTargSite(LocManageUtil.getTargetSite());
- }
+// if (!Objects.isNull(waitPakin.getSiteId()) && waitPakin.getSiteId() > 0) {
+// DeviceSite site = deviceSiteService.getById(waitPakin.getSiteId());
+// task.setTargSite(site.getSite() + "");
+// } else {
+// task.setTargSite(LocManageUtil.getTargetSite());
+// }
+// if (!Objects.isNull(waitPakin.getLocCode()) && StringUtils.isNotBlank(waitPakin.getLocCode())) {
+// List<Loc> locs = locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, waitPakin.getLocCode()));
+//// if (!locs.isEmpty()) {
+//// throw new CoolException("搴撲綅閿欒锛氱浉鍚屽簱浣嶅簲鍙竴鏉�")
+//// }
+// Loc loc = locs.stream().findFirst().get();
+// task.setTargSite(loc.getCode());
+// } else {
+// task.setTargSite(LocManageUtil.getTargetSite());
+// }
if (!this.save(task)) {
throw new CoolException("浠诲姟淇濆瓨澶辫触锛侊紒");
@@ -247,7 +244,7 @@
* @time 2025/4/15 15:28
*/
@Transactional(rollbackFor = Exception.class)
- void saveLocItem(List<TaskItem> items, Long taskId) throws Exception {
+ public void saveLocItem(List<TaskItem> items, Long taskId) throws Exception {
Task task = this.getById(taskId);
if (Objects.isNull(task)) {
throw new CoolException("浠诲姟涓嶅瓨鍦�!!");
@@ -271,7 +268,7 @@
* @return
*/
@Transactional(rollbackFor = Exception.class)
- void saveStockItems(List<TaskItem> items, WaitPakinItem order) throws Exception {
+ public void saveStockItems(List<TaskItem> items, WaitPakinItem order) throws Exception {
Stock stock = new Stock();
// if (!Objects.isNull(order.getPoCode()) && StringUtils.isNotBlank(order.getPoCode())) {
// Purchase purchase = purchaseService.getOne(new LambdaQueryWrapper<Purchase>().eq(Purchase::getCode, order.getPoCode()));
--
Gitblit v1.9.1