From 137e6b066761a632b3dab8cddd881b48f75d3f93 Mon Sep 17 00:00:00 2001
From: wusiyu <2015098864@qq.com>
Date: Tue, 16 Jun 2026 14:51:36 +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

---
 .../org/springblade/wms/pojo/entity/StRealtimeStock.java    | 3 ++-
 .../org/springblade/wms/controller/StGoodsController.java   | 6 ++++++
 .../wms/service/impl/StOtherOutRecordServiceImpl.java       | 6 +++++-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/StRealtimeStock.java b/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/StRealtimeStock.java
index 9c9bc195f..e61a8af91 100644
--- a/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/StRealtimeStock.java
+++ b/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/StRealtimeStock.java
@@ -203,7 +203,8 @@ public class StRealtimeStock extends TenantEntity {
 	@TableField(exist = false)
 	private Long outRecordId;
 
-
+    @Schema(description = "领料人ID")
+    private Long picker;
 
 }
 
diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StGoodsController.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StGoodsController.java
index 6869a9335..7812b88e3 100644
--- a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StGoodsController.java
+++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StGoodsController.java
@@ -1,5 +1,6 @@
 package org.springblade.wms.controller;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
@@ -69,6 +70,11 @@ public class StGoodsController extends BladeController {
 		QueryWrapper<StGoods> wrapper = Condition.getQueryWrapper(stGoods, StGoods.class);
 		wrapper.eq("is_deleted", 0)
 			   .orderByDesc("create_time");
+
+		String goodsCodeAndGoodsName = StrUtil.toString(stGoods.get("goodsCodeAndGoodsName"));
+		if (StrUtil.isNotBlank(goodsCodeAndGoodsName)) {
+			wrapper.and(w -> w.like("goods_code", goodsCodeAndGoodsName).or().like("goods_name", goodsCodeAndGoodsName));
+		}
 		IPage<StGoods> pages = stGoodsService.page(Condition.getPage(query), wrapper);
 		return R.data(StGoodsWrapper.build().pageVO(pages));
 	}
diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StOtherOutRecordServiceImpl.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StOtherOutRecordServiceImpl.java
index 1c9a51bfa..6a259f087 100644
--- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StOtherOutRecordServiceImpl.java
+++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StOtherOutRecordServiceImpl.java
@@ -1,5 +1,6 @@
 package org.springblade.wms.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import jakarta.annotation.Resource;
@@ -254,6 +255,9 @@ public class StOtherOutRecordServiceImpl extends BaseServiceImpl<StOtherOutRecor
 				}
 				detail.setDeptId(mainInout.getDeptId());
 				detail.setCreateUser(mainInout.getCreateUser());
+				if (stOtherOutRecord.getPicker() == null) {
+					detail.setUserId(stock.getPicker());
+				}
 				detail.setUserId(stOtherOutRecord.getPicker());
 				String pickerTeamSet = stStockInoutRecordService.getTeamSetByUserId(stOtherOutRecord.getPicker());
 				detail.setPickerTeamSet(pickerTeamSet);
@@ -300,7 +304,7 @@ public class StOtherOutRecordServiceImpl extends BaseServiceImpl<StOtherOutRecor
 				newOutRecord.setCreateTime(new Date());
 				newOutRecord.setUpdateUser(user.getUserId());
 				newOutRecord.setUpdateTime(new Date());
-				newOutRecord.setPicker(stOtherOutRecord.getPicker());
+				newOutRecord.setPicker(detail.getUserId());
 
 				// 保存当前出库单（每条明细对应一条新出库单）
 				this.save(newOutRecord);