diff --git a/SlnMesnac.Repository/service/Impl/MesProductPlanServiceImpl.cs b/SlnMesnac.Repository/service/Impl/MesProductPlanServiceImpl.cs index 5433b71..5886dc3 100644 --- a/SlnMesnac.Repository/service/Impl/MesProductPlanServiceImpl.cs +++ b/SlnMesnac.Repository/service/Impl/MesProductPlanServiceImpl.cs @@ -68,7 +68,7 @@ namespace SlnMesnac.Repository.service.Impl { try { - return base._rep.GetFirst(x => x.PlanCode == planCode && x.StationId == _appConfig.stationId); + return base._rep.GetFirst(x => x.PlanCode == planCode); } catch (Exception ex) { diff --git a/SlnMesnac.WPF/ViewModel/ProdMgmtViewModel.cs b/SlnMesnac.WPF/ViewModel/ProdMgmtViewModel.cs index ef6b873..2d5c8f0 100644 --- a/SlnMesnac.WPF/ViewModel/ProdMgmtViewModel.cs +++ b/SlnMesnac.WPF/ViewModel/ProdMgmtViewModel.cs @@ -374,6 +374,7 @@ namespace SlnMesnac.WPF.ViewModel { hasPlan.PlanStatus = PlanStatusEnum.待执行; _prodMgmtBusiness.UpdateProdPlan(hasPlan); + } else {