From 5691675d460e0e3a719266cfc4b271c60cca4985 Mon Sep 17 00:00:00 2001
From: wusiyu <2015098864@qq.com>
Date: Wed, 27 May 2026 17:31:54 +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/feign/WmsTaskClient.java    |  4 ++--
 .../springblade/wms/feign/WmsTaskClientImpl.java    |  4 ++--
 .../impl/StOtherReceiptRecordServiceImpl.java       | 13 +++++++++++--
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/feign/WmsTaskClient.java b/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/feign/WmsTaskClient.java
index d9ddca026..096e3eb3c 100644
--- a/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/feign/WmsTaskClient.java
+++ b/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/feign/WmsTaskClient.java
@@ -54,9 +54,9 @@ public interface WmsTaskClient {
 	 * 子件入库
 	 */
 	@PostMapping(SAVE_SUB_ORDER_WAREHOUSING)
-	void saveSubOrderWarehousing(@RequestParam("goodsCode")String goodsCode, @RequestParam("batchNo")String batchNo, @RequestParam("quantity")Double quantity,
+	void saveSubOrderWarehousing(@RequestParam("woCode")String woCode, @RequestParam("goodsCode")String goodsCode, @RequestParam("batchNo")String batchNo, @RequestParam("quantity")Double quantity,
 								 @RequestParam("shId")Long shId, @RequestParam("slId")Long slId, @RequestParam("date") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")Date date,
-								 @RequestParam("userId")Long userId) throws Exception;
+								 @RequestParam("userId")Long userId, @RequestParam("checkNo")String checkNo, @RequestParam("quantityLevel")String quantityLevel, @RequestParam("scrapCycle") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")Date scrapCycle) throws Exception;
 
 	/**
 	 * 石墨模预出库
diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/feign/WmsTaskClientImpl.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/feign/WmsTaskClientImpl.java
index 12bacd235..82dd8b693 100644
--- a/blade-service/blade-wms/src/main/java/org/springblade/wms/feign/WmsTaskClientImpl.java
+++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/feign/WmsTaskClientImpl.java
@@ -51,8 +51,8 @@ public class WmsTaskClientImpl implements WmsTaskClient{
 	}
 
 	@Override
-	public void saveSubOrderWarehousing(String goodsCode, String batchNo, Double quantity, Long shId, Long slId, Date date, Long userId) throws Exception {
-		stOtherReceiptRecordService.saveSubOrderWarehousing(goodsCode, batchNo, quantity, shId, slId, date, userId);
+	public void saveSubOrderWarehousing(String woCode, String goodsCode, String batchNo, Double quantity, Long shId, Long slId, Date date, Long userId, String checkNo, String quantityLevel, Date scrapCycle) throws Exception {
+		stOtherReceiptRecordService.saveSubOrderWarehousing(woCode, goodsCode, batchNo, quantity, shId, slId, date, userId, checkNo, quantityLevel,scrapCycle);
 	}
 
 	@Override
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 894cc75fc..d66397d56 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
@@ -7,7 +7,6 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import jakarta.annotation.Resource;
-import org.springblade.common.exception.BusinessException;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.secure.BladeUser;
@@ -342,7 +341,8 @@ public class StOtherReceiptRecordServiceImpl extends BaseServiceImpl<StOtherRece
 	}
 
 	@Override
-	public void saveSubOrderWarehousing(String goodsCode, String batchNo, Double quantity, Long shId, Long slId, Date date, Long userId) throws Exception {
+	public void saveSubOrderWarehousing(String woCode, String goodsCode, String batchNo, Double quantity, Long shId, Long slId,
+										Date date, Long userId, String checkNo, String quantityLevel, Date scrapCycle) throws Exception {
 
 		BladeUser user = AuthUtil.getUser();
 		StOtherReceiptRecord otherReceiptRecord = new StOtherReceiptRecord();
@@ -358,6 +358,7 @@ public class StOtherReceiptRecordServiceImpl extends BaseServiceImpl<StOtherRece
 		}
 		otherReceiptRecord.setGoodsId(goods.getId());
 
+		StStockInoutRecord findRecord = this.getGlassCakeByWoCode(woCode, goodsCode);
 		List<StStockInoutRecord> inoutList = new ArrayList<>();
 		StStockInoutRecord stockInoutRecord = new StStockInoutRecord();
 		stockInoutRecord.setGoodsId(goods.getId());
@@ -367,6 +368,14 @@ public class StOtherReceiptRecordServiceImpl extends BaseServiceImpl<StOtherRece
 		stockInoutRecord.setSlId(slId);
 		stockInoutRecord.setInOutDate(date);
 		stockInoutRecord.setCreateUser(userId);
+		stockInoutRecord.setCheckNo(checkNo);
+		stockInoutRecord.setQuantityLevel(quantityLevel);
+		stockInoutRecord.setScrapCycle(scrapCycle);
+
+		stockInoutRecord.setPrintMark(findRecord.getPrintMark());
+		stockInoutRecord.setPowderWeight(findRecord.getPowderWeight());
+		stockInoutRecord.setMaterialNo(findRecord.getMaterialNo());
+		stockInoutRecord.setThickness(findRecord.getThickness());
 		inoutList.add(stockInoutRecord);
 
 		otherReceiptRecord.setInoutList(inoutList);