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

---
 .../web/controller/app/AppTaskController.java |  4 ++++
 .../impl/AppPendingStorageServiceImpl.java    | 24 +++++++++++++------
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppTaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppTaskController.java
index 6869b13f..74d2dce3 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppTaskController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppTaskController.java
@@ -494,6 +494,7 @@ public class AppTaskController extends BaseController
     @Anonymous
     public AjaxResult createOutRequest(@RequestBody TaskOutRequest outRequest)
     {
+        logger.info("请求出库：{}", JSON.toJSONString(outRequest));
         // 判断请求数据完整性
         if (outRequest == null || StringUtils.isEmpty(outRequest.getGoodsId())
         || outRequest.getNeedNum() == null || outRequest.getNeedNum().compareTo(BigDecimal.ZERO) <= 0) {
@@ -577,6 +578,9 @@ public class AppTaskController extends BaseController
             outTask.setTaskPriority(1);
             outTask.setVehicleId(appStock.getVehicleId());
             outTask.setOrigin(appStock.getLocationId());
+            if(StringUtils.isNotEmpty(outRequest.getStand())) {
+                outTask.setDestination(outRequest.getStand());
+            }
             outTask.setCreateTime(new Date());
             outTask.setGoodsId(appStock.getGoodsId());
             outTask.setOpNum(opNum);
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 82f0ea14..47683949 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
@@ -140,18 +140,28 @@ public class AppPendingStorageServiceImpl implements IAppPendingStorageService
 
         for (AppPendingStorageRequest appPendingStorageRequest : appPendingStorageRequestList) {
             AppPendingStorage appPendingStorage = new AppPendingStorage();
-            BeanUtils.copyProperties(appPendingStorageRequest, appPendingStorage);
-            appPendingStorage.setCreateTime(DateUtils.getNowDate());
-            appPendingStorage.setUpdateTime(DateUtils.getNowDate());
-            appPendingStorage.setVehicleNo(vehicleNo);
-            appPendingStorage.setOrderId(appPendingStorageRequest.getListId());
             appPendingStorage.setRecordId(UUID.randomUUID().toString());
+            appPendingStorage.setListId(appPendingStorageRequest.getListId());
+            Integer orderType = Math.toIntExact(appPendingStorageRequest.getOrderType() == null ? 0 : appPendingStorageRequest.getOrderType());
+            appPendingStorage.setOrderType(orderType);
+            String customerId = appPendingStorageRequest.getCustomerName() == null ? "" : appPendingStorageRequest.getCustomerName();
+            appPendingStorage.setCustomerId(customerId);
+            appPendingStorage.setOrderId(appPendingStorageRequest.getListId());
+            appPendingStorage.setGoodsId(appPendingStorageRequest.getGoodsId());
+            appPendingStorage.setGoodsNum(appPendingStorageRequest.getGoodsNum());
+            appPendingStorage.setVehicleNo(vehicleNo);
             appPendingStorage.setGoodsCode(appPendingStorageRequest.getGoodsId());
+            appPendingStorage.setGoodsDesc(appPendingStorageRequest.getGoodsDesc());
+            String unit = appPendingStorageRequest.getUnit() == null ? "无" : appPendingStorageRequest.getUnit();
+            appPendingStorage.setUnit(unit);
+            appPendingStorage.setSpare1(appPendingStorageRequest.getSpare1());
+            appPendingStorage.setSpare2(appPendingStorageRequest.getSpare2());
             appPendingStorage.setStatus(0);
             appPendingStorage.setStorageType(1);
-            appPendingStorage.setCreatePerson("test");
-            appPendingStorage.setCustomerId(appPendingStorageRequest.getCustomerName());
+            appPendingStorage.setCreatePerson("PDA");
 
+            appPendingStorage.setCreateTime(DateUtils.getNowDate());
+            appPendingStorage.setUpdateTime(DateUtils.getNowDate());
             appPendingStorageList.add(appPendingStorage);
         }
         return appPendingStorageMapper.insertAppPendingStorageList(appPendingStorageList);