From 8fa2e058d3e576bb0706aa9ca02785e65a6da738 Mon Sep 17 00:00:00 2001
From: wusiyu <2015098864@qq.com>
Date: Mon, 8 Jun 2026 11:14:12 +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/service/impl/StGlassCakeOutServiceImpl.java          | 1 +
 .../wms/service/impl/StGraphiteMoldOutServiceImpl.java       | 2 +-
 .../wms/service/impl/StOtherReceiptRecordServiceImpl.java    | 5 +----
 .../wms/service/impl/StStorageLocationServiceImpl.java       | 4 ++--
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StGlassCakeOutServiceImpl.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StGlassCakeOutServiceImpl.java
index 389105223..fc4274c21 100644
--- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StGlassCakeOutServiceImpl.java
+++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StGlassCakeOutServiceImpl.java
@@ -287,6 +287,7 @@ public class StGlassCakeOutServiceImpl extends BaseServiceImpl<StGlassCakeOutMap
 				StStorehouse storehouse = stStorehouseService.getById(maxStock.getShId());
 				preOutStock.setShCode(storehouse.getShCode());
 				preOutStock.setRlsId(maxStock.getId());
+				preOutStock.setBatchCode(faYieldOrder.getBatchNo());
 				preOutStock.setStovePiNo(maxStock.getStovePiNo());
 
 				preOutStock.setThickness(maxStock.getThickness());
diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StGraphiteMoldOutServiceImpl.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StGraphiteMoldOutServiceImpl.java
index 603e5256f..ce876e157 100644
--- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StGraphiteMoldOutServiceImpl.java
+++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StGraphiteMoldOutServiceImpl.java
@@ -185,7 +185,7 @@ public class StGraphiteMoldOutServiceImpl extends BaseServiceImpl<StGraphiteMold
 				StStorehouse storehouse = stStorehouseService.getById(maxStock.getShId());
 				preOutStock.setShName(storehouse.getShName());
 				preOutStock.setRlsId(maxStock.getId());
-				preOutStock.setPiNo(maxStock.getPiNo());
+				preOutStock.setPiNo(faYieldOrder.getBatchNo());
 
 				preOutStock.setCurStatus(0L);
 				preOutStock.setCreateTime(now);
diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StOtherReceiptRecordServiceImpl.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StOtherReceiptRecordServiceImpl.java
index 885fb7ba4..be4cd613c 100644
--- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StOtherReceiptRecordServiceImpl.java
+++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StOtherReceiptRecordServiceImpl.java
@@ -2,7 +2,6 @@ package org.springblade.wms.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -129,9 +128,7 @@ public class StOtherReceiptRecordServiceImpl extends BaseServiceImpl<StOtherRece
 				}
 			}
 
-			if (detail.getSirCode() == null) {
-				detail.setSirCode(stStockInoutRecordService.generateCode());
-			}
+			detail.setSirCode(stStockInoutRecordService.generateCode());
 			detail.setInOutSource(StStockInoutRecord.INOUT_SOURCE_OTHER_PURCHASE_RECEIPT);
 			// 赋值公共属性：批次号、入库单关联ID、部门/创建人
 			if (detail.getPiNo() == null) {
diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StStorageLocationServiceImpl.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StStorageLocationServiceImpl.java
index 0945b6c51..b044dfabc 100644
--- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StStorageLocationServiceImpl.java
+++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StStorageLocationServiceImpl.java
@@ -99,8 +99,8 @@ public class StStorageLocationServiceImpl extends BaseServiceImpl<StStorageLocat
 	public List<StStorageLocationVO> findByShIdAndGoodsId(Long shId, String goodsCode) {
 		// 1. 查询条件
 		QueryWrapper<StStorageLocation> wrapper = new QueryWrapper<>();
-		wrapper.eq("is_deleted", 0);
-//			.eq("goods_code", goodsCode);
+		wrapper.eq("is_deleted", 0)
+		       .eq("goods_code", goodsCode);
 		if (shId != null) {
 			wrapper.eq("sh_id", shId);
 		}