From bcd9cb83cbbb36217cb99ced7bf1fa3cb26bd53c Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 28 四月 2025 16:59:51 +0800
Subject: [PATCH] #wms端生成任务优化

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java |   31 ++++++++++++++++++-------------
 1 files changed, 18 insertions(+), 13 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..6835446 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
@@ -127,17 +127,22 @@
                     .setTargSite(deviceSite.getDeviceCode())
                     .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 +252,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 +276,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