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 wrapper = Wrappers.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