From b479afcbcfe05657866639c4a31d75bee3a24373 Mon Sep 17 00:00:00 2001
From: sunjianxi <839419401@qq.com>
Date: Tue, 14 Apr 2026 10:35:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=BC=80=E5=8F=91-sjx?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../springblade/desk/order/pojo/enums/MoldDemandEnum.java  | 2 +-
 .../order/service/impl/PlateGoodsRecordServiceImpl.java    | 1 +
 .../order/service/impl/YieldOrderCraftServiceImpl.java     | 1 -
 .../desk/order/service/impl/YieldOrderDailyAssignImpl.java | 7 ++++++-
 .../desk/order/service/impl/YieldOrderServiceImpl.java     | 2 ++
 5 files changed, 10 insertions(+), 3 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 ae99f507..d3db907c 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
@@ -31,7 +31,7 @@ public enum MoldDemandEnum {
 	 */
 	MAF_STATUS_CREATE("新建", 11001),
 	MAF_STATUS_SEND("已下发", 11002),
-	MAF_STATUS_DONE("已完成", 11003),
+	MAF_STATUS_DONE("已关闭", 11003),
 
 	/**
 	 * 类型;12001、热表，烧结，12002、仓库
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsRecordServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsRecordServiceImpl.java
index b1505588..e4eff918 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsRecordServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsRecordServiceImpl.java
@@ -306,6 +306,7 @@ public class PlateGoodsRecordServiceImpl extends BaseServiceImpl<PlateGoodsRecor
 				if(CollectionUtils.isEmpty(materialQuotaList1)){
 					log.info("镀层物料需求计算，镀金局部镀、镀层厚度"+h1+"未匹配到物料定额");
 					//将订单状态标记为数据异常，记录异常原因，并退出
+					yieldOrder.setValidationMomo("镀层物料需求计算，镀金局部镀、镀层厚度"+h1+"未匹配到物料定额");
 					this.updateYieldOrder(yieldOrder);
 					return false;
 				}
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderCraftServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderCraftServiceImpl.java
index 3b585a29..51ab1bb7 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderCraftServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderCraftServiceImpl.java
@@ -395,7 +395,6 @@ public class YieldOrderCraftServiceImpl extends BaseServiceImpl<YieldOrderCraftM
 			BsProcessSetEntity processSet = processSetService.selectBsProcessSetByProcessCode(orderCraft.getProcessCode());
 			if (Func.isNotEmpty(processSet) && Func.isNotBlank(processSet.getTeam())) {
 				BsTeamSetEntity teamSetEntity = teamSetService.selectByTeamName(processSet.getTeam());
-
 				if (Func.isNotEmpty(teamSetEntity)) {
 					centerId = teamSetEntity.getWcId();
 				}
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderDailyAssignImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderDailyAssignImpl.java
index 938d301a..f2901b68 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderDailyAssignImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderDailyAssignImpl.java
@@ -30,10 +30,15 @@ public class YieldOrderDailyAssignImpl extends BaseServiceImpl<YieldOrderDailyAs
 
 	@Override
 	public void saveOrEdit(Long workCenterId, Long oemId, Long abilityId, Double area, Double quantity) {
+		LocalDate today = LocalDate.now();
+		LocalDateTime startOfDay = today.atStartOfDay();
+		LocalDateTime endOfDay = today.atTime(LocalTime.MAX);
 		LambdaQueryWrapper<YieldOrderAssignDaily> wrapper = Wrappers.<YieldOrderAssignDaily>query().lambda()
 			.eq(YieldOrderAssignDaily::getIsDeleted, CommonConstant.BOOLEAN_FALSE)
 			.eq(YieldOrderAssignDaily::getCraftAbilityId, abilityId)
-			.eq(YieldOrderAssignDaily::getCreateTime, DateUtil.toDate(LocalDate.now()));
+			.between(YieldOrderAssignDaily::getCreateTime,
+						DateUtil.toDate(startOfDay),
+						DateUtil.toDate(endOfDay));
 		if (Func.isNotEmpty(workCenterId)) {
 			wrapper.eq(YieldOrderAssignDaily::getWorkCenterId, workCenterId);
 		}
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 7cc8cfbf..420dacd8 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
@@ -481,6 +481,8 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
 			this.updateById(yieldOrder);
 			return Boolean.FALSE;
 		}
+		yieldOrder.setStatus(YieldOrderEnum.STATUS_APS.getCode());
+		this.updateById(yieldOrder);
 		return Boolean.TRUE;
 	}