From fa6cce864091160393904edc3fe38b5541797723 Mon Sep 17 00:00:00 2001
From: wusiyu <2015098864@qq.com>
Date: Fri, 29 May 2026 19:45:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=BA=93=E7=AE=A1=E7=90=86=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/pojo/entity/StBuyOrder.java           |  5 ++++-
 .../device/mapper/MeasuringUpkeepMapper.xml   |  4 ++--
 .../erpdata/mapper/ErpDataWmsMapper.xml       |  2 +-
 .../service/impl/StBuyOrderServiceImpl.java   | 19 +++++++++++++++----
 4 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/StBuyOrder.java b/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/StBuyOrder.java
index 2737412ed..24f7480f8 100644
--- a/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/StBuyOrder.java
+++ b/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/StBuyOrder.java
@@ -189,7 +189,10 @@ public class StBuyOrder extends TenantEntity {
 	@Schema(description = "erp采购单号")
 	private String erpBuyCode;
 
-	@TableField(exist = false)
+	/**
+	 * 采购员名称
+	 */
+	@Schema(description = "采购员名称")
 	private String buyManName;
 
 	@TableField(exist = false)
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/MeasuringUpkeepMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/MeasuringUpkeepMapper.xml
index da1c5a8c3..529f90b62 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/MeasuringUpkeepMapper.xml
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/MeasuringUpkeepMapper.xml
@@ -229,7 +229,7 @@
         UPDATE st_realtime_stock
         SET occupy_quantity = occupy_quantity + #{checkQty},
             is_measure_maintenance = 1,
-            update_time = NOW()
+            update_time = SYSDATE
         WHERE id = #{id}
     </update>
 
@@ -238,7 +238,7 @@
         SET STAY_MAINTAIN_NUM = 0,
             is_measure_maintenance = 0,
             occupy_quantity = occupy_quantity - #{checkQty},
-            update_time = NOW()
+            update_time = SYSDATE
         WHERE id = #{id}
     </update>
 </mapper>
diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpDataWmsMapper.xml b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpDataWmsMapper.xml
index 367940889..f4ae1d440 100644
--- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpDataWmsMapper.xml
+++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpDataWmsMapper.xml
@@ -15,7 +15,7 @@
         SELECT
             a.orderno,
             a.relctrler,
-            a.reqstat
+            a.reqstat,
             c.userdesc AS relctrler_name,
             a.rpno,
             d.purcode,
diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StBuyOrderServiceImpl.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StBuyOrderServiceImpl.java
index ac2a4f7f8..4403a1c9e 100644
--- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StBuyOrderServiceImpl.java
+++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StBuyOrderServiceImpl.java
@@ -32,7 +32,10 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Optional;
 
 /**
  * @version 1.0
@@ -383,16 +386,24 @@ public class StBuyOrderServiceImpl extends BaseServiceImpl<StBuyOrderMapper, StB
 		StBuyOrder buyOrder = this.getById(id);
 		PurchaseTrackVO purchaseTrackVO = erpDataWmsClient.getBuyOrderStatus(buyOrder.getExtraBill()).getData();
 		if (purchaseTrackVO == null) {
-			System.out.println("ERP未查到数据");
+			throw new ServiceException("ERP未查到数据");
 		}
 
 		buyOrder.setErpBuyCode(purchaseTrackVO.getRpno());
 		buyOrder.setNeedStatus(purchaseTrackVO.getReqstat());
 		List<User> userList = userClient.listByNameNolike(purchaseTrackVO.getRelctrlerName());
-		buyOrder.setPlanBuyMan(userList.get(0).getId());
+		Long planBuyManId = Optional.ofNullable(userList)
+				.filter(list -> !list.isEmpty())
+				.map(list -> list.get(0).getId())
+				.orElse(0L);
+		buyOrder.setPlanBuyMan(planBuyManId);
 		buyOrder.setPlanBuyManName(purchaseTrackVO.getRelctrlerName());
 		List<User> users = userClient.listByNameNolike(purchaseTrackVO.getPurcodeName());
-		buyOrder.setBuyMan(users.get(0).getId());
+		Long buyManId = Optional.ofNullable(users)
+				.filter(list -> !list.isEmpty())
+				.map(list -> list.get(0).getId())
+				.orElse(0L);
+		buyOrder.setBuyMan(buyManId);
 		buyOrder.setBuyManName(purchaseTrackVO.getPurcodeName());
 
 		this.updateById(buyOrder);