取消检验报告修改功能；优化显示等

UniformMaterialManagementSystem/ViewModels/FactoryLicenseInputPageViewModel.cs

@@ -246,7 +246,7 @@ namespace UniformMaterialManagementSystem.ViewModels
                             inspectApply.ApplyNo.Substring(inspectApply.ApplyNo.Length - 4, 3);
 
             //发证单位
-            Department = "军需能源质量监督总站" + App.CurrentUser.SupervisionUnit.Name;
+            Department = "军需能源质量监督总站" + App.CurrentUser!.SupervisionUnit.Name;
             EditUser = App.CurrentUser.UserName;
 
         }

UniformMaterialManagementSystem/ViewModels/InspectionReportInputPageViewModel.cs

@@ -79,7 +79,7 @@ namespace UniformMaterialManagementSystem.ViewModels
 
         private InspectionReport? _inspectionReport;
 
-        public InspectionReportInputPageViewModel(IDataBaseService<InspectApply> inspectApplyService, IDataBaseService<User> userService,IDataBaseService<InspectionReport> inspectionReportService)
+        public InspectionReportInputPageViewModel(IDataBaseService<InspectApply> inspectApplyService, IDataBaseService<User> userService, IDataBaseService<InspectionReport> inspectionReportService)
         {
             _inspectApplyService = inspectApplyService;
             _inspectionReportService = inspectionReportService;
@@ -126,7 +126,7 @@ namespace UniformMaterialManagementSystem.ViewModels
             //校验是否选择检验申请单
             if (SelectedInspectApply == null)
             {
-                MessageBox.Show("请双击检验申请表行数据进行新增，再执行保存！","提示",MessageBoxButton.OK,MessageBoxImage.Warning);
+                MessageBox.Show("请双击检验申请表行数据进行新增，再执行保存！", "提示", MessageBoxButton.OK, MessageBoxImage.Warning);
                 return;
             }
 
@@ -141,7 +141,7 @@ namespace UniformMaterialManagementSystem.ViewModels
             Dictionary<string, string> dictionary = CustomValidate();
             if (dictionary.ContainsKey("result") && !string.IsNullOrEmpty(dictionary["result"]))
             {
-                MessageBox.Show(dictionary["result"],"提示",MessageBoxButton.OK,MessageBoxImage.Warning);
+                MessageBox.Show(dictionary["result"], "提示", MessageBoxButton.OK, MessageBoxImage.Warning);
                 return;
             }
 
@@ -164,7 +164,7 @@ namespace UniformMaterialManagementSystem.ViewModels
             //分离检验申请单跟踪
             if (inspect != null)
             {
-                _inspectApplyService.SetEntryState(inspect,EntityState.Detached);
+                _inspectApplyService.SetEntryState(inspect, EntityState.Detached);
             }
 
             //重新加载检验申请列表
@@ -315,7 +315,7 @@ namespace UniformMaterialManagementSystem.ViewModels
             SelectedInspectApply = inspectApply;
 
             ReportNo = inspectApply.ApplyNo.Replace("申请", "");
-            Department = App.CurrentUser.SupervisionUnit.Name;
+            Department = "军需能源质量监督总站" + App.CurrentUser!.SupervisionUnit.Name;
             ReportTime = DateTime.Now;
             InspectCategory = inspectApply.InspCategory;
             PurchaseCompanyNames = GetPurchaseCompanyNames(inspectApply);
@@ -350,7 +350,7 @@ namespace UniformMaterialManagementSystem.ViewModels
         {
             if (_selectedInspectionReportDetail == null)
             {
-                MessageBox.Show("请选中一行，再执行删除操作！","提示",MessageBoxButton.OK,MessageBoxImage.Warning);
+                MessageBox.Show("请选中一行，再执行删除操作！", "提示", MessageBoxButton.OK, MessageBoxImage.Warning);
                 return;
             }
 

UniformMaterialManagementSystem/ViewModels/InspectionReportManagePageViewModel.cs

@@ -58,19 +58,19 @@ namespace UniformMaterialManagementSystem.ViewModels
             LoadData();
         }
 
-        partial void OnSelectedInspectionReportChanging(InspectionReportModel? oldValue, InspectionReportModel? newValue)
-        {
-            if (oldValue == null) return;
-            bool isChanged = IsCurrentReportChanged(oldValue);
-            if (isChanged)
-            {
-                if (!AskIsSave())
-                {
-                    //取消变更新行
-                    SelectedInspectionReport = oldValue;
-                }
-            }
-        }
+        //partial void OnSelectedInspectionReportChanging(InspectionReportModel? oldValue, InspectionReportModel? newValue)
+        //{
+        //    if (oldValue == null) return;
+        //    bool isChanged = IsCurrentReportChanged(oldValue);
+        //    if (isChanged)
+        //    {
+        //        if (!AskIsSave())
+        //        {
+        //            //取消变更新行
+        //            SelectedInspectionReport = oldValue;
+        //        }
+        //    }
+        //}
 
         /// <summary>
         /// 加载数据
@@ -79,7 +79,7 @@ namespace UniformMaterialManagementSystem.ViewModels
         private void LoadData()
         {
             //询问是否保存
-            if(!AskIsSave()) return;
+            //if(!AskIsSave()) return;
 
             var inspectionReports = _inspectionReportService.Query()
                 .Include(x => x.InspectionReportDetails)
@@ -254,10 +254,13 @@ namespace UniformMaterialManagementSystem.ViewModels
 
             //删除
             _inspectionReportService.Delete(x=>x.Guid == SelectedInspectionReport.Guid); //删除主表时会级联删除子表
-            _inspectionReportService.SaveChanges();
+            var success = _inspectionReportService.SaveChanges();
 
-            //重新加载数据
-            LoadData();
+            if (success)
+            {
+                MessageBox.Show("删除成功！");
+                InspectionReports.Remove(SelectedInspectionReport);
+            }
         }
 
         /// <summary>
@@ -268,7 +271,7 @@ namespace UniformMaterialManagementSystem.ViewModels
         {
             if (SelectedInspectionReport == null) return;
 
-            if (!AskIsSave()) return;
+            //if (!AskIsSave()) return;
 
             InspectionReportUtil.ExportInspectionReportFile(SelectedInspectionReport);
         }
@@ -412,56 +415,56 @@ namespace UniformMaterialManagementSystem.ViewModels
             return false;
         }
 
-        /// <summary>
-        /// 询问是否保存更改
-        /// </summary>
-        private bool AskIsSave()
-        {
-            if (SelectedInspectionReport == null) return true;
-            var isChanged = IsCurrentReportChanged(SelectedInspectionReport);
-            if (!isChanged) return true;
-
-            var result = MessageBox.Show($"检验报告编号【{SelectedInspectionReport?.ReportNo}】已修改，是否保存修改？", "提示", MessageBoxButton.YesNo, MessageBoxImage.Question);
-            if (result == MessageBoxResult.Yes)
-            {
-                Dictionary<string, string> dictionary = CustomValidate();
-                if (dictionary.ContainsKey("result") && !string.IsNullOrEmpty(dictionary["result"]))
-                {
-                    MessageBox.Show(dictionary["result"], "错误", MessageBoxButton.OK, MessageBoxImage.Error);
-                    return false;
-                }
-                //保存修改
-                SaveInspectionReport();
-            }
-            else if (result == MessageBoxResult.No) //放弃更改
-            {
-                var inspectionReport = _inspectionReportService.Get(x => x.Guid == SelectedInspectionReport!.Guid);
-
-                if (inspectionReport == null) //新增行直接移除
-                {
-                    if (SelectedInspectionReport != null) InspectionReports.Remove(SelectedInspectionReport);
-                }
-                else
-                {
-                    _inspectionReportService.SetEntryState(inspectionReport, EntityState.Unchanged);
+        ///// <summary>
+        ///// 询问是否保存更改
+        ///// </summary>
+        //private bool AskIsSave()
+        //{
+        //    if (SelectedInspectionReport == null) return true;
+        //    var isChanged = IsCurrentReportChanged(SelectedInspectionReport);
+        //    if (!isChanged) return true;
 
-                    if (SelectedInspectionReport != null)
-                    {
-                        ModifyModelFromInspectReport(SelectedInspectionReport, inspectionReport);
-
-                        var details = _inspectionReportDetailService
-                            .GetAll(x => x.InspectionReportGuid == SelectedInspectionReport.Guid).ToList();
-                        SelectedInspectionReport.InspectionReportDetails.Clear();//detail被跟踪，clear之后变为Deleted状态
-                        foreach (var detail in details) //重新将数据库的数据赋值过来，并设置跟踪状态Unchanged
-                        {
-                            SelectedInspectionReport.InspectionReportDetails.Add(detail);
-                            _inspectionReportDetailService.SetEntryState(detail, EntityState.Unchanged);
-                        }
-                    }
-                }
-            }
-            return true;
-        }
+        //    var result = MessageBox.Show($"检验报告编号【{SelectedInspectionReport?.ReportNo}】已修改，是否保存修改？", "提示", MessageBoxButton.YesNo, MessageBoxImage.Question);
+        //    if (result == MessageBoxResult.Yes)
+        //    {
+        //        Dictionary<string, string> dictionary = CustomValidate();
+        //        if (dictionary.ContainsKey("result") && !string.IsNullOrEmpty(dictionary["result"]))
+        //        {
+        //            MessageBox.Show(dictionary["result"], "错误", MessageBoxButton.OK, MessageBoxImage.Error);
+        //            return false;
+        //        }
+        //        //保存修改
+        //        SaveInspectionReport();
+        //    }
+        //    else if (result == MessageBoxResult.No) //放弃更改
+        //    {
+        //        var inspectionReport = _inspectionReportService.Get(x => x.Guid == SelectedInspectionReport!.Guid);
+
+        //        if (inspectionReport == null) //新增行直接移除
+        //        {
+        //            if (SelectedInspectionReport != null) InspectionReports.Remove(SelectedInspectionReport);
+        //        }
+        //        else
+        //        {
+        //            _inspectionReportService.SetEntryState(inspectionReport, EntityState.Unchanged);
+
+        //            if (SelectedInspectionReport != null)
+        //            {
+        //                ModifyModelFromInspectReport(SelectedInspectionReport, inspectionReport);
+
+        //                var details = _inspectionReportDetailService
+        //                    .GetAll(x => x.InspectionReportGuid == SelectedInspectionReport.Guid).ToList();
+        //                SelectedInspectionReport.InspectionReportDetails.Clear();//detail被跟踪，clear之后变为Deleted状态
+        //                foreach (var detail in details) //重新将数据库的数据赋值过来，并设置跟踪状态Unchanged
+        //                {
+        //                    SelectedInspectionReport.InspectionReportDetails.Add(detail);
+        //                    _inspectionReportDetailService.SetEntryState(detail, EntityState.Unchanged);
+        //                }
+        //            }
+        //        }
+        //    }
+        //    return true;
+        //}
 
         private void ModifyModelFromInspectReport(InspectionReportModel model, InspectionReport report)
         {

UniformMaterialManagementSystem/Views/FactoryLicense/FactoryLicenseInputPage.xaml

@@ -176,7 +176,7 @@
                                                         HorizontalAlignment="Center"
                                                         FontFamily="{StaticResource FluentSystemIconsRegular}"
                                                         FontSize="20"
-                                                        Text="{x:Static utils:RegularFontUtil.Document_Search_16}" />
+                                                        Text="{x:Static utils:RegularFontUtil.Arrow_Clockwise_12}" />
                                                     <TextBlock Text="刷新" />
                                                 </StackPanel>
                                             </Border>
@@ -518,6 +518,7 @@
                         <TextBox
                             Width="120"
                             VerticalAlignment="Center"
+                            IsReadOnly="True"
                             Text="{Binding FactoryQuantity, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                             TextWrapping="Wrap" />
                         <TextBlock VerticalAlignment="Center" Text="{Binding InspectApply.Material.MeasureUnit}" />

UniformMaterialManagementSystem/Views/FactoryLicense/FactoryLicenseManagePage.xaml

@@ -175,7 +175,7 @@
                                                         HorizontalAlignment="Center"
                                                         FontFamily="{StaticResource FluentSystemIconsRegular}"
                                                         FontSize="20"
-                                                        Text="{x:Static utils:RegularFontUtil.Document_Search_16}" />
+                                                        Text="{x:Static utils:RegularFontUtil.Arrow_Clockwise_12}" />
                                                     <TextBlock Text="刷新" />
                                                 </StackPanel>
                                             </Border>
@@ -297,7 +297,7 @@
                                                         HorizontalAlignment="Center"
                                                         FontFamily="{StaticResource FluentSystemIconsRegular}"
                                                         FontSize="20"
-                                                        Text="{x:Static utils:RegularFontUtil.Dock_20}" />
+                                                        Text="{x:Static utils:RegularFontUtil.Clipboard_Arrow_Right_20}" />
                                                     <TextBlock Text="导出附表" />
                                                 </StackPanel>
                                             </Border>

UniformMaterialManagementSystem/Views/InspectionRecordPage.xaml

@@ -304,7 +304,7 @@
                                                         HorizontalAlignment="Center"
                                                         FontFamily="{StaticResource FluentSystemIconsRegular}"
                                                         FontSize="20"
-                                                        Text="{x:Static utils:RegularFontUtil.Dock_20}" />
+                                                        Text="{x:Static utils:RegularFontUtil.Clipboard_Arrow_Right_20}" />
                                                     <TextBlock Text="导出附表" />
                                                 </StackPanel>
                                             </Border>

UniformMaterialManagementSystem/Views/InspectionReport/InspectionReportManagePage.xaml

@@ -233,7 +233,7 @@
                                     </ControlTemplate>
                                 </Button.Template>
                             </Button>-->
-                            <Button
+                            <!--<Button
                                 x:Name="SaveButton"
                                 Click="SaveButton_OnClick"
                                 Command="{Binding SaveInspectionReportCommand}">
@@ -259,8 +259,8 @@
                                         </ControlTemplate.Triggers>
                                     </ControlTemplate>
                                 </Button.Template>
-                            </Button>
-                            <Separator />
+                            </Button>-->
+                            <!--<Separator />-->
                             <Button Command="{Binding ExportInspectionReportCommand}">
                                 <Button.Template>
                                     <ControlTemplate>
@@ -438,6 +438,7 @@
                     <TextBox
                         Grid.Row="2"
                         Grid.Column="1"
+                        IsReadOnly="True"
                         Text="{Binding SelectedInspectionReport.Department, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
                     <TextBlock
                         Grid.Row="2"
@@ -447,6 +448,7 @@
                     <DatePicker
                         Grid.Row="2"
                         Grid.Column="3"
+                        IsEnabled="False"
                         Text="{Binding SelectedInspectionReport.ReportTime, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
                     <TextBlock
                         Grid.Row="3"
@@ -598,6 +600,7 @@
                         Grid.Column="1"
                         Grid.ColumnSpan="3"
                         HorizontalScrollBarVisibility="Auto"
+                        IsReadOnly="True"
                         Text="{Binding SelectedInspectionReport.ReportBasis, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                         TextWrapping="Wrap" />
                     <TextBlock
@@ -631,6 +634,7 @@
                             Foreground="Red"
                             GroupName="IsSampleGroup"
                             IsChecked="{Binding SelectedInspectionReport.IsSample, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                            IsEnabled="False"
                             Unchecked="IsSampleRadioButton_Unchecked" />
                         <RadioButton
                             x:Name="NotSampleRadioButton"
@@ -640,7 +644,8 @@
                             VerticalContentAlignment="Center"
                             Content="未抽样送检"
                             GroupName="IsSampleGroup"
-                            IsChecked="True" />
+                            IsChecked="True"
+                            IsEnabled="False" />
                         <TextBox
                             Grid.Row="1"
                             Grid.Column="0"
@@ -649,6 +654,7 @@
                             HorizontalContentAlignment="Left"
                             VerticalContentAlignment="Top"
                             AcceptsReturn="True"
+                            IsReadOnly="True"
                             Text="{Binding SelectedInspectionReport.ReportDesc, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                             TextWrapping="Wrap"
                             VerticalScrollBarVisibility="Auto" />
@@ -681,7 +687,8 @@
                             Content="合格"
                             Foreground="Green"
                             GroupName="ConclusionGroup"
-                            IsChecked="{Binding SelectedInspectionReport.Conclusion, Mode=TwoWay, Converter={StaticResource ContentToBoolConverter}, ConverterParameter=合格}" />
+                            IsChecked="{Binding SelectedInspectionReport.Conclusion, Mode=TwoWay, Converter={StaticResource ContentToBoolConverter}, ConverterParameter=合格}"
+                            IsEnabled="False" />
                         <RadioButton
                             x:Name="SecondQualifiedRadioButton"
                             Grid.Row="0"
@@ -691,7 +698,8 @@
                             Content="合格（初测不合格，复测合格）"
                             Foreground="DarkOrange"
                             GroupName="ConclusionGroup"
-                            IsChecked="{Binding SelectedInspectionReport.Conclusion, Mode=TwoWay, Converter={StaticResource ContentToBoolConverter}, ConverterParameter=合格（初测不合格，复测合格）}" />
+                            IsChecked="{Binding SelectedInspectionReport.Conclusion, Mode=TwoWay, Converter={StaticResource ContentToBoolConverter}, ConverterParameter=合格（初测不合格，复测合格）}"
+                            IsEnabled="False" />
                         <RadioButton
                             x:Name="UnQualifiedRadioButton"
                             Grid.Row="0"
@@ -701,7 +709,8 @@
                             Content="不合格"
                             Foreground="Red"
                             GroupName="ConclusionGroup"
-                            IsChecked="{Binding SelectedInspectionReport.Conclusion, Mode=TwoWay, Converter={StaticResource ContentToBoolConverter}, ConverterParameter=不合格}" />
+                            IsChecked="{Binding SelectedInspectionReport.Conclusion, Mode=TwoWay, Converter={StaticResource ContentToBoolConverter}, ConverterParameter=不合格}"
+                            IsEnabled="False" />
                         <!--<TextBox
                             x:Name="ConclusionTextBox"
                             Grid.Row="0"
@@ -717,6 +726,7 @@
                             HorizontalContentAlignment="Left"
                             VerticalContentAlignment="Top"
                             AcceptsReturn="True"
+                            IsReadOnly="True"
                             Text="{Binding SelectedInspectionReport.ConclusionDesc, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                             TextWrapping="Wrap"
                             VerticalScrollBarVisibility="Auto" />
@@ -743,7 +753,11 @@
                             BorderThickness="1">
                             <ToolBarPanel>
                                 <ToolBar Background="White" ToolBarTray.IsLocked="True">
-                                    <Button HorizontalContentAlignment="Center" Command="{Binding AddInspectionReportDetailCommand}">
+                                    <Button
+                                        HorizontalContentAlignment="Center"
+                                        Command="{Binding AddInspectionReportDetailCommand}"
+                                        Foreground="Gray"
+                                        IsEnabled="False">
                                         <Button.Template>
                                             <ControlTemplate>
                                                 <Border
@@ -767,7 +781,10 @@
                                             </ControlTemplate>
                                         </Button.Template>
                                     </Button>
-                                    <Button Command="{Binding RemoveInspectionReportDetailCommand}">
+                                    <Button
+                                        Command="{Binding RemoveInspectionReportDetailCommand}"
+                                        Foreground="Gray"
+                                        IsEnabled="False">
                                         <Button.Template>
                                             <ControlTemplate>
                                                 <Border
@@ -834,7 +851,10 @@
                                 </Style>
                             </DataGrid.Resources>
                             <DataGrid.Columns>
-                                <DataGridTemplateColumn Width="100" Header="检验组">
+                                <DataGridTemplateColumn
+                                    Width="100"
+                                    Header="检验组"
+                                    IsReadOnly="True">
                                     <DataGridTemplateColumn.CellTemplate>
                                         <DataTemplate>
                                             <TextBlock
@@ -866,7 +886,8 @@
                                     Binding="{Binding SupervisionUnit, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                                     EditingElementStyle="{StaticResource TextColumnEditingElementStyle}"
                                     ElementStyle="{StaticResource TextColumnElementStyle}"
-                                    Header="单位" />
+                                    Header="单位"
+                                    IsReadOnly="True" />
 
                                 <!--<DataGridTextColumn
                                     Width="100"
@@ -874,7 +895,10 @@
                                     EditingElementStyle="{StaticResource TextColumnEditingElementStyle}"
                                     ElementStyle="{StaticResource TextColumnElementStyle}"
                                     Header="姓名" />-->
-                                <DataGridTemplateColumn Width="100" Header="姓名">
+                                <DataGridTemplateColumn
+                                    Width="100"
+                                    Header="姓名"
+                                    IsReadOnly="True">
                                     <DataGridTemplateColumn.CellTemplate>
                                         <DataTemplate>
                                             <TextBlock

UniformMaterialManagementSystem/Views/SampleRegistration/SampleRegistrationInputPage.xaml

@@ -170,8 +170,8 @@
                                                     HorizontalAlignment="Center"
                                                     FontFamily="{StaticResource FluentSystemIconsRegular}"
                                                     FontSize="20"
-                                                    Text="{x:Static utils:RegularFontUtil.Document_Search_16}" />
-                                                <TextBlock Text=" 查询 " />
+                                                    Text="{x:Static utils:RegularFontUtil.Arrow_Clockwise_12}" />
+                                                <TextBlock Text=" 刷新 " />
                                             </StackPanel>
                                         </Border>
                                         <ControlTemplate.Triggers>
@@ -499,10 +499,18 @@
                         HorizontalAlignment="Right"
                         VerticalAlignment="Center"
                         Text="数量：" />
-                    <TextBox
+                    <Grid
                         Grid.Row="6"
                         Grid.Column="3"
-                        Text="{Binding Quantity, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                        Background="White">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+                        <TextBox Grid.Column="0" Text="{Binding Quantity, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                        <TextBlock Grid.Column="1" Text="{Binding InspectApply.Material.MeasureUnit}" />
+                    </Grid>
+
                     <TextBlock
                         Grid.Row="7"
                         Grid.Column="0"

UniformMaterialManagementSystem/Views/SampleRegistration/SampleRegistrationManagePage.xaml

@@ -171,8 +171,8 @@
                                                     HorizontalAlignment="Center"
                                                     FontFamily="{StaticResource FluentSystemIconsRegular}"
                                                     FontSize="20"
-                                                    Text="{x:Static utils:RegularFontUtil.Document_Search_16}" />
-                                                <TextBlock Text=" 查询 " />
+                                                    Text="{x:Static utils:RegularFontUtil.Arrow_Clockwise_12}" />
+                                                <TextBlock Text=" 刷新 " />
                                             </StackPanel>
                                         </Border>
                                         <ControlTemplate.Triggers>
@@ -566,11 +566,20 @@
                         HorizontalAlignment="Right"
                         VerticalAlignment="Center"
                         Text="数量：" />
-                    <TextBox
+                    <Grid
                         Grid.Row="6"
                         Grid.Column="3"
-                        IsReadOnly="True"
-                        Text="{Binding SelectedSampleRegistration.Quantity, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                        Background="White">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+                        <TextBox
+                            Grid.Column="0"
+                            IsReadOnly="True"
+                            Text="{Binding SelectedSampleRegistration.Quantity, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                        <TextBlock Grid.Column="1" Text="{Binding SelectedSampleRegistration.InspectApply.Material.MeasureUnit}" />
+                    </Grid>
                     <TextBlock
                         Grid.Row="7"
                         Grid.Column="0"