chenx/qhmes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

原材料入库

Browse Source
This commit is contained in:
chenx
2026-05-15 11:34:12 +08:00
parent f5ba828eff
commit 70dced7d2c
1700 changed files with 24156 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
yy-admin-master/YY.Admin/ViewModels/Control/MenuTreeViewModel.cs
View File

@@ -209,7 +209,10 @@ namespace YY.Admin.ViewModels.Control
if (tab.TabSource is MenuItem menuItem)
{
// 取消上一个选中菜单选中状态
SelectedMenuItem?.IsSelected = false;
if (SelectedMenuItem != null)
{
SelectedMenuItem.IsSelected = false;
}
SelectedMenuItem = menuItem;
@@ -229,7 +232,7 @@ namespace YY.Admin.ViewModels.Control
ToggleParents(menuItem, false);
// 取消菜单选中
menuItem?.IsSelected = false;
menuItem.IsSelected = false;
}
}

4
yy-admin-master/YY.Admin/ViewModels/SysManage/UserEditDialogViewModel.cs
View File

@@ -74,9 +74,9 @@ namespace YY.Admin.ViewModels.SysManage
private void OnStatusSelected(object statusObj)
{
if (statusObj is StatusEnum status)
if (statusObj is StatusEnum status && SysUser != null)
{
SysUser?.Status = status;
SysUser.Status = status;
}
}

5
yy-admin-master/YY.Admin/Views/MainWindow.xaml.cs
View File

@@ -101,7 +101,10 @@ namespace YY.Admin.Views
if (e.OriginalSource is Button { Tag: SkinType skinType })
{
var vm = DataContext as MainWindowViewModel;
vm?.AppSettingsViewModel?.SkinType = skinType;
if (vm?.AppSettingsViewModel != null)
{
vm.AppSettingsViewModel.SkinType = skinType;
}
}
}
}

2
yy-admin-master/YY.Admin/Views/MixerMaterial/MixerMaterialEditDialogView.xaml
View File

@@ -97,7 +97,7 @@
DisplayMemberPath="Key"
ItemsSource="{Binding FeedManageStatusOptions}"
SelectedValue="{Binding Material.FeedManageStatus}"
hc:InfoElement.Title="投管状态"
hc:InfoElement.Title="投罐状态"
hc:InfoElement.TitleWidth="90"
hc:InfoElement.TitlePlacement="Left"
Margin="0,0,0,16"/>

2
yy-admin-master/YY.Admin/Views/MixerMaterial/MixerMaterialListView.xaml
View File

@@ -188,7 +188,7 @@
<DataGridTextColumn Header="物料小类" Binding="{Binding MinorCategoryText}" CellStyle="{StaticResource CusDataGridCellStyle}" Width="120"/>
<DataGridTextColumn Header="物料描述" Binding="{Binding MaterialDesc}" CellStyle="{StaticResource CusDataGridCellStyle}" Width="160"/>
<DataGridTextColumn Header="物料别名" Binding="{Binding AliasName}" CellStyle="{StaticResource CusDataGridCellStyle}" Width="120"/>
<DataGridTextColumn Header="投管状态" Binding="{Binding FeedManageStatusText}" CellStyle="{StaticResource CusDataGridCellStyle}" Width="100"/>
<DataGridTextColumn Header="投罐状态" Binding="{Binding FeedManageStatusText}" CellStyle="{StaticResource CusDataGridCellStyle}" Width="100"/>
<DataGridTextColumn Header="使用状态" Binding="{Binding UseStatusText}" CellStyle="{StaticResource CusDataGridCellStyle}" Width="100"/>
<DataGridTextColumn Header="比重" Binding="{Binding SpecificGravity, StringFormat=N4}" CellStyle="{StaticResource CusDataGridCellStyle}" Width="90"/>
<DataGridTextColumn Header="保质期(天)" Binding="{Binding ShelfLifeDays}" CellStyle="{StaticResource CusDataGridCellStyle}" Width="100"/>

8
yy-admin-master/YY.Admin/YY.Admin.csproj
View File

@@ -108,4 +108,12 @@
</None>
</ItemGroup>
<!-- 主程序 BaseDirectory 需含 Configuration/appsettings.json；带 RuntimeIdentifier 时子项目 None 未必进入主输出 -->
<ItemGroup>
<None Include="..\YY.Admin.Services\Configuration\appsettings.json">
<Link>Configuration\appsettings.json</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
</Project>