From 2c7bf6eebf2c622e574f661adf7088b79061f2c4 Mon Sep 17 00:00:00 2001
From: liweidong-hj <liweidong-hj@huafang.com>
Date: Wed, 29 Apr 2026 17:50:25 +0800
Subject: [PATCH] =?UTF-8?q?=E9=95=80=E5=B1=82=E7=89=A9=E6=96=99=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97=E5=A2=9E=E5=8A=A0=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/MoldDemandController.java      |  2 +-
 .../order/service/IMoldDemandService.java     |  7 ++++
 .../service/impl/MoldDemandServiceImpl.java   | 26 ++++++++++++++
 .../impl/PlateGoodsRecordServiceImpl.java     | 34 +++++++++++--------
 .../service/impl/YieldOrderServiceImpl.java   |  2 +-
 5 files changed, 55 insertions(+), 16 deletions(-)

diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/MoldDemandController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/MoldDemandController.java
index 79e36281..42870b59 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/MoldDemandController.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/MoldDemandController.java
@@ -81,7 +81,7 @@ public class MoldDemandController extends BladeController {
 	@PostMapping("/closeBatch")
 	@Operation(summary = "批量关闭", description = "传入ids")
 	public R closeBatch(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
-		Boolean result = moldDemandService.changeStatus(Func.toLongList(ids), MoldDemandEnum.STATUS_CLOSE.getCode());
+		Boolean result = moldDemandService.closeBatch(Func.toLongList(ids));
 		return R.status(result);
 	}
 }
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IMoldDemandService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IMoldDemandService.java
index d8b8e941..77d3acc8 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IMoldDemandService.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IMoldDemandService.java
@@ -40,4 +40,11 @@ public interface IMoldDemandService extends BaseService<MoldDemand> {
 
 
 	MoldDemandVo detail(String id);
+
+	/**
+	 * 批量关闭
+	 * @param toLongList
+	 * @return
+	 */
+    Boolean closeBatch(List<Long> toLongList);
 }
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldDemandServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldDemandServiceImpl.java
index 6fff3cd2..99d45b06 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldDemandServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldDemandServiceImpl.java
@@ -1,9 +1,11 @@
 package org.springblade.desk.order.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
+import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseEntity;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.desk.dashboard.pojo.entity.DsPartEntity;
@@ -139,4 +141,28 @@ public class MoldDemandServiceImpl extends BaseServiceImpl<MoldDemandMapper, Mol
 		}
 		return vo;
 	}
+
+	@Override
+	public Boolean closeBatch(List<Long> idList) {
+		// 1. 参数校验
+		if (CollectionUtils.isEmpty(idList)) {
+			throw new ServiceException("要关闭的模具需求ID列表不能为空");
+		}
+
+		// 2. 查询数据
+		List<MoldDemand> moldDemandList = baseMapper.selectByIds(idList);
+		if (CollectionUtils.isEmpty(moldDemandList)) {
+			throw new ServiceException("未找到对应的模具需求数据");
+		}
+
+		// 4. 设置状态（根据业务需求选择正确的状态）
+		for (MoldDemand moldDemand : moldDemandList) {
+			// 只处理未关闭的
+			if (!moldDemand.getMafStatus().equals(MoldDemandEnum.STATUS_CLOSE.getCode())) {
+				moldDemand.setMafStatus(MoldDemandEnum.STATUS_CLOSE.getCode());
+			}
+		}
+		// 5. 批量更新
+		return this.updateBatchById(moldDemandList);
+	}
 }
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 dd3accb5..f9e15406 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
@@ -236,10 +236,12 @@ public class PlateGoodsRecordServiceImpl extends BaseServiceImpl<PlateGoodsRecor
 				for(CraftAbilityEntity craftAbility : craftAbilityList){
 					if(StringUtils.isNotEmpty(craftAbility.getWxLimit())){
 						abilityName = DictCache.getValue("ProcessCapabilityType",craftAbility.getWxLimit());
-						if(abilityName.contains("镀金") || abilityName.contains("镀银")){
-							localArea = craftAbility.getLocalArea().doubleValue();
-							isContains = true;
-							break;
+						if(StringUtils.isNotEmpty(abilityName)){
+							if(abilityName.contains("镀金") || abilityName.contains("镀银")){
+								localArea = craftAbility.getLocalArea().doubleValue();
+								isContains = true;
+								break;
+							}
 						}
 					}
 				}
@@ -263,17 +265,21 @@ public class PlateGoodsRecordServiceImpl extends BaseServiceImpl<PlateGoodsRecor
 				}
 			}
 			if(h1 == null){
-				//根据配置码查询镀种信息
-				BsPlatingEntity bsPlatingEntity =bsPlatingService.selectBsPlatingConfigNo(dsPart.getConfigCode());
-				if(bsPlatingEntity == null){
-					log.info("配置码"+dsPart.getConfigCode()+"未查询到镀种信息");
-					//将订单状态标记为数据异常，记录异常原因，并退出
-					yieldOrder.setValidationMomo("配置码"+dsPart.getConfigCode()+"未查询到镀种信息");
-					this.updateYieldOrder(yieldOrder);
-					return false;
+				String matCode = dsPart.getPlateCode();
+				if(StringUtils.isEmpty(matCode)){
+					//根据配置码查询镀种信息
+					BsPlatingEntity bsPlatingEntity =bsPlatingService.selectBsPlatingConfigNo(dsPart.getConfigCode());
+					if(bsPlatingEntity == null){
+						log.info("配置码"+dsPart.getConfigCode()+"未查询到镀种信息");
+						//将订单状态标记为数据异常，记录异常原因，并退出
+						yieldOrder.setValidationMomo("配置码"+dsPart.getConfigCode()+"未查询到镀种信息");
+						this.updateYieldOrder(yieldOrder);
+						return false;
+					}
+					//镀层代码
+					matCode = bsPlatingEntity.getMatCode();
 				}
-				//镀层代码
-				String matCode=bsPlatingEntity.getMatCode();
+
 				//根据零件号、镀层代码、质量等级，从镀层厚度对应表中查询镀层厚度
 				int start_f21e8=0;
 				if(partCode.startsWith("21E8-210")){
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 20371023..6387aa40 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
@@ -249,7 +249,7 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
 			yieldOrder.setValidationResult(YieldOrderEnum.VALIDATION_RESULT_PASS.getCode());
 			this.updateById(yieldOrder);
 
-			if(yieldOrder.getValidationResult() != null &&
+			if(yieldOrder.getReceiveStatus() != null &&
 					yieldOrder.getValidationResult().equals(YieldOrderEnum.VALIDATION_RESULT_PASS.getCode()) &&
 					yieldOrder.getReceiveStatus().equals(YieldOrderEnum.RECEIVE_STATUS_YES.getCode())){
 				//订单状态为验证完成并且已接收 进行分派