仓库管理修改

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;
 
 }
 

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));
 	}

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);