From 1b83ecb362f34b1d971acc9660faf3e2f7f60458 Mon Sep 17 00:00:00 2001
From: icewint <icewint@qq.com>
Date: Fri, 28 Feb 2025 08:52:10 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A9=BA=E6=8B=96=E5=87=BA=E5=BA=93=E8=AF=B7?=
 =?UTF-8?q?=E6=B1=82=E4=BD=93=E6=B7=BB=E5=8A=A0=E5=87=BA=E5=BA=93=E7=AB=99?=
 =?UTF-8?q?=E5=8F=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/AppPendingStorageController.java         |  4 +++-
 .../com/ruoyi/web/domain/TaskOutRequest.java     | 10 ++++++++++
 .../java/com/ruoyi/quartz/task/TaskExecutor.java |  2 +-
 .../impl/AppPendingStorageServiceImpl.java       | 16 ++++++++--------
 4 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppPendingStorageController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppPendingStorageController.java
index ccd5e170..dc08a49e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppPendingStorageController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppPendingStorageController.java
@@ -21,7 +21,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 
 /**
  * 入库码盘Controller
- * 
+ *
  * @author ruoyi
  * @date 2025-02-22
  */
@@ -114,6 +114,8 @@ public class AppPendingStorageController extends BaseController
         return toAjax(appPendingStorageService.addAppEmptyPmsOrderIn(vehicleNo));
     }
 
+
+
     @PostMapping("/addOtherList")
     public AjaxResult addOtherList(@RequestBody OtherStockInRequest otherStockInRequest) {
         return toAjax(appPendingStorageService.addAppListPmsOrderIn(otherStockInRequest));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/domain/TaskOutRequest.java b/ruoyi-admin/src/main/java/com/ruoyi/web/domain/TaskOutRequest.java
index 9747e64f..ba19c3a4 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/domain/TaskOutRequest.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/domain/TaskOutRequest.java
@@ -19,6 +19,16 @@ public class TaskOutRequest {
      */
     private String remark;
 
+    private String stand;
+
+    public String getStand() {
+        return stand;
+    }
+
+    public void setStand(String stand) {
+        this.stand = stand;
+    }
+
     public String getGoodsId() {
         return goodsId;
     }
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/TaskExecutor.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/TaskExecutor.java
index 8032cec7..2a9387a5 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/TaskExecutor.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/TaskExecutor.java
@@ -225,7 +225,7 @@ public class TaskExecutor {
                 AppTaskBak appTaskBak = new AppTaskBak();
                 appTaskBak.setTaskId(task.getTaskId());
                 appTaskBak.setTaskStatus(task.getTaskStatus());
-                appTaskBak.setRemark(task.getRemark());
+                appTaskBak.setRemark(updateRemark.getRemark());
                 appTaskBak.setTaskType(task.getTaskType());
                 appTaskBak.setTaskPriority(task.getTaskPriority());
                 appTaskBak.setVehicleId(task.getVehicleId());
diff --git a/ruoyi-system/src/main/java/com/ruoyi/app/service/impl/AppPendingStorageServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/app/service/impl/AppPendingStorageServiceImpl.java
index 7b123214..82f0ea14 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/app/service/impl/AppPendingStorageServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/app/service/impl/AppPendingStorageServiceImpl.java
@@ -19,7 +19,7 @@ import org.springframework.stereotype.Service;
 
 /**
  * 入库码盘Service业务层处理
- * 
+ *
  * @author ruoyi
  * @date 2025-02-22
  */
@@ -31,7 +31,7 @@ public class AppPendingStorageServiceImpl implements IAppPendingStorageService
 
     /**
      * 查询入库码盘
-     * 
+     *
      * @param recordId 入库码盘主键
      * @return 入库码盘
      */
@@ -43,7 +43,7 @@ public class AppPendingStorageServiceImpl implements IAppPendingStorageService
 
     /**
      * 查询入库码盘列表
-     * 
+     *
      * @param appPendingStorage 入库码盘
      * @return 入库码盘
      */
@@ -55,7 +55,7 @@ public class AppPendingStorageServiceImpl implements IAppPendingStorageService
 
     /**
      * 新增入库码盘
-     * 
+     *
      * @param appPendingStorage 入库码盘
      * @return 结果
      */
@@ -68,7 +68,7 @@ public class AppPendingStorageServiceImpl implements IAppPendingStorageService
 
     /**
      * 修改入库码盘
-     * 
+     *
      * @param appPendingStorage 入库码盘
      * @return 结果
      */
@@ -81,7 +81,7 @@ public class AppPendingStorageServiceImpl implements IAppPendingStorageService
 
     /**
      * 批量删除入库码盘
-     * 
+     *
      * @param recordIds 需要删除的入库码盘主键
      * @return 结果
      */
@@ -93,7 +93,7 @@ public class AppPendingStorageServiceImpl implements IAppPendingStorageService
 
     /**
      * 删除入库码盘信息
-     * 
+     *
      * @param recordId 入库码盘主键
      * @return 结果
      */
@@ -147,7 +147,7 @@ public class AppPendingStorageServiceImpl implements IAppPendingStorageService
             appPendingStorage.setOrderId(appPendingStorageRequest.getListId());
             appPendingStorage.setRecordId(UUID.randomUUID().toString());
             appPendingStorage.setGoodsCode(appPendingStorageRequest.getGoodsId());
-            appPendingStorage.setStatus(2);
+            appPendingStorage.setStatus(0);
             appPendingStorage.setStorageType(1);
             appPendingStorage.setCreatePerson("test");
             appPendingStorage.setCustomerId(appPendingStorageRequest.getCustomerName());