功能开发-sjx

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、仓库

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

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

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

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