镀层物料计算增加逻辑

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);
 	}
 }

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);
 }

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);
+	}
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsRecordServiceImpl.java

@@ -236,6 +236,7 @@ public class PlateGoodsRecordServiceImpl extends BaseServiceImpl<PlateGoodsRecor
 				for(CraftAbilityEntity craftAbility : craftAbilityList){
 					if(StringUtils.isNotEmpty(craftAbility.getWxLimit())){
 						abilityName = DictCache.getValue("ProcessCapabilityType",craftAbility.getWxLimit());
+						if(StringUtils.isNotEmpty(abilityName)){
 							if(abilityName.contains("镀金") || abilityName.contains("镀银")){
 								localArea = craftAbility.getLocalArea().doubleValue();
 								isContains = true;
@@ -245,6 +246,7 @@ public class PlateGoodsRecordServiceImpl extends BaseServiceImpl<PlateGoodsRecor
 					}
 				}
 			}
+		}
 		if(StringUtils.isNotEmpty(plateGoodsCode) && isContains){
 			Double h1 = dsPart.getPlateThickness();
 			Double h2 = dsPart.getPlateThicknessTwo();
@@ -263,6 +265,8 @@ public class PlateGoodsRecordServiceImpl extends BaseServiceImpl<PlateGoodsRecor
 				}
 			}
 			if(h1 == null){
+				String matCode = dsPart.getPlateCode();
+				if(StringUtils.isEmpty(matCode)){
 					//根据配置码查询镀种信息
 					BsPlatingEntity bsPlatingEntity =bsPlatingService.selectBsPlatingConfigNo(dsPart.getConfigCode());
 					if(bsPlatingEntity == null){
@@ -273,7 +277,9 @@ public class PlateGoodsRecordServiceImpl extends BaseServiceImpl<PlateGoodsRecor
 						return false;
 					}
 					//镀层代码
-				String matCode=bsPlatingEntity.getMatCode();
+					matCode = bsPlatingEntity.getMatCode();
+				}
+
 				//根据零件号、镀层代码、质量等级，从镀层厚度对应表中查询镀层厚度
 				int start_f21e8=0;
 				if(partCode.startsWith("21E8-210")){

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())){
 				//订单状态为验证完成并且已接收 进行分派