From 3cd929cce5afc27bd22951ce2e3edf8fd80fa8c1 Mon Sep 17 00:00:00 2001
From: liweidong-hj <liweidong-hj@huafang.com>
Date: Tue, 28 Apr 2026 11:28:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=88=E8=A7=84=E6=80=A7?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../desk/order/pojo/enums/MoldDemandEnum.java        |  2 +-
 .../order/service/impl/YieldOrderServiceImpl.java    | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/enums/MoldDemandEnum.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/enums/MoldDemandEnum.java
index d3db907c..e20dfb32 100644
--- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/enums/MoldDemandEnum.java
+++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/enums/MoldDemandEnum.java
@@ -30,7 +30,7 @@ public enum MoldDemandEnum {
 	 * 状态枚举; 11001、新建，11002:已下发，11003、已完成
 	 */
 	MAF_STATUS_CREATE("新建", 11001),
-	MAF_STATUS_SEND("已下发", 11002),
+	MAF_STATUS_SEND("已申报", 11002),
 	MAF_STATUS_DONE("已关闭", 11003),
 
 	/**
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java
index d5a49d29..5cd7e928 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java
@@ -533,12 +533,15 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
 						if(moldDemand == null){
 							moldDemand = new MoldDemand();
 							moldDemand.setMoCode(null);
-							moldDemand.setPartCode(subPart.getPartCode());
-							moldDemand.setPartName(subPart.getPartName());
+							moldDemand.setPartCode(yieldOrder.getPartCode());
+							moldDemand.setPartName(yieldOrder.getPartName());
+							moldDemand.setToolCode(subPart.getPartCode());
+							moldDemand.setToolName(subPart.getPartName());
 							moldDemand.setDemandNum(subPart.getQuota() * yieldOrder.getYpQty());
 							moldDemand.setLinkOrderIds(yieldOrder.getId().toString());
-							moldDemand.setStatus(MoldDemandEnum.STATUS_WAITING.getCode());
+//							moldDemand.setStatus(MoldDemandEnum.STATUS_WAITING.getCode());
 							moldDemand.setMafStatus(MoldDemandEnum.MAF_STATUS_CREATE.getCode());
+							moldDemand.setMafType(MoldDemandEnum.MAF_TYPE_RB.getCode());
 							moldDemand.setNeedDate(yieldOrder.getDemandDate());
 							moldDemand.setQuaLevel(yieldOrder.getProductIdent());
 							moldDemandMapper.insert(moldDemand);
@@ -567,8 +570,9 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
 					moldDemand.setToolCode(processMoldToolList.get(0).getMoldCode());
 					moldDemand.setToolName(processMoldToolList.get(0).getMoldName());
 					moldDemand.setLinkOrderIds(yieldOrder.getId().toString());
-					moldDemand.setStatus(MoldDemandEnum.STATUS_WAITING.getCode());
+//					moldDemand.setStatus(MoldDemandEnum.STATUS_WAITING.getCode());
 					moldDemand.setMafStatus(MoldDemandEnum.MAF_STATUS_CREATE.getCode());
+					moldDemand.setMafType(MoldDemandEnum.MAF_TYPE_RB.getCode());
 					moldDemand.setNeedDate(yieldOrder.getDemandDate());
 					moldDemand.setQuaLevel(yieldOrder.getProductIdent());
 					moldDemandMapper.insert(moldDemand);