From e1c19d2f59300d83fa7abff049fc87b614324b8b Mon Sep 17 00:00:00 2001
From: wusiyu <2015098864@qq.com>
Date: Fri, 8 May 2026 20:22:27 +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/mapper/StGlassCakeOutMapper.java    | 3 +++
 .../org/springblade/wms/mapper/StGlassCakeOutMapper.xml     | 6 ++++++
 .../wms/service/impl/StGlassCakeOutServiceImpl.java         | 4 ++++
 3 files changed, 13 insertions(+)

diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGlassCakeOutMapper.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGlassCakeOutMapper.java
index e42f2f676..65f4063e0 100644
--- a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGlassCakeOutMapper.java
+++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGlassCakeOutMapper.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
+import org.springblade.desk.produce.pojo.entity.WorkOrder;
 import org.springblade.wms.excel.StGlassCakeOutExcel;
 import org.springblade.wms.pojo.entity.StGlassCakeOut;
 import org.springblade.wms.pojo.vo.StGlassCakeOutVO;
@@ -43,5 +44,7 @@ public interface StGlassCakeOutMapper extends BaseMapper<StGlassCakeOut> {
 	List<StGlassCakeOutExcel> exportStGlassCakeOut(@Param("ew") Wrapper<StGlassCakeOut> queryWrapper);
 
 	StGlassCakeOut getBySirId(Long sirId);
+
+	WorkOrder getByWoCode(String cardNo);
 }
 
diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGlassCakeOutMapper.xml b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGlassCakeOutMapper.xml
index 8f4c4674e..603e47db7 100644
--- a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGlassCakeOutMapper.xml
+++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGlassCakeOutMapper.xml
@@ -198,4 +198,10 @@
         SELECT * FROM ST_GLASS_CAKE_OUT ${ew.customSqlSegment}
     </select>
 
+    <select id="getByWoCode" resultType="org.springblade.desk.produce.pojo.entity.WorkOrder">
+        SELECT *
+        FROM MES_WORK_ORDER
+        WHERE card_no = #{cardNo}
+    </select>
+
 </mapper>
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 92baeb72f..43831ecb0 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
@@ -362,7 +362,11 @@ public class StGlassCakeOutServiceImpl extends BaseServiceImpl<StGlassCakeOutMap
 
 		// ============ 第三步：无数据 → 新增一条待出库数据 ============
 		StGlassCakeOutDTO dto = new StGlassCakeOutDTO();
+
 		dto.setCardNo(cardNo);
+		WorkOrder workOrder = baseMapper.getByWoCode(dto.getCardNo());
+		dto.setWoCode(workOrder.getWoCode());
+
 		List<StGlassCakeOut> stGlassCakeOutList = this.generatePreOutOrder(dto);
 			if (!CollectionUtils.isEmpty(stGlassCakeOutList)) {
 				for (StGlassCakeOut waitOut : stGlassCakeOutList) {