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

4
yy-admin-master/YY.Admin.Services/Configuration/appsettings.json
View File

@@ -33,7 +33,7 @@
"EnableIncreTable": false // 启用表增量更新（只更新贴了特性[IncreTable]的实体表）
},
"SeedSettings": {
"EnableInitSeed": true, // 启用种子初始化（若种子没有变化建议关闭）
"EnableInitSeed": false, // 避免重复运行时触发唯一键冲突；首次初始化后建议关闭
"EnableIncreSeed": false // 启用种子增量更新（只更新贴了特性[IncreSeed]的种子表）
}
},
@@ -54,7 +54,7 @@
"EnableIncreTable": false // 启用表增量更新（只更新贴了特性[IncreTable]的实体表）
},
"SeedSettings": {
"EnableInitSeed": true, // 启用种子初始化（若种子没有变化建议关闭）
"EnableInitSeed": false, // 避免重复运行时触发唯一键冲突；首次初始化后建议关闭
"EnableIncreSeed": false // 启用种子增量更新（只更新贴了特性[IncreSeed]的种子表）
}
}

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>

BIN
yy-admin-master/_publish/YY.Admin-win-x64/Admin.NET.db Normal file
View File

Binary file not shown.

5
yy-admin-master/_publish/YY.Admin-win-x64/AppSettings/admin/appsettings.json Normal file
View File

@@ -0,0 +1,5 @@
{
"SkinType": 0,
"SyncWithSystem": false,
"IsTabControlVisible": true
}

33
yy-admin-master/_publish/YY.Admin-win-x64/Config/Core.config Normal file
View File

@@ -0,0 +1,33 @@
<?xml version="1.0" encoding="utf-8"?>
<Core>
<!--全局调试。XTrace.Debug-->
<Debug>true</Debug>
<!--日志等级。只输出大于等于该级别的日志，All/Debug/Info/Warn/Error/Fatal，默认Info-->
<LogLevel>Info</LogLevel>
<!--文件日志目录。默认Log子目录-->
<LogPath>Log</LogPath>
<!--日志文件上限。超过上限后拆分新日志文件，默认10MB，0表示不限制大小-->
<LogFileMaxBytes>10</LogFileMaxBytes>
<!--日志文件备份。超过备份数后，最旧的文件将被删除，网络安全法要求至少保存6个月日志，默认200，0表示不限制个数-->
<LogFileBackups>200</LogFileBackups>
<!--日志文件格式。默认{0:yyyy_MM_dd}.log，支持日志等级如 {1}_{0:yyyy_MM_dd}.log-->
<LogFileFormat>{0:yyyy_MM_dd}.log</LogFileFormat>
<!--日志行格式。默认Time|ThreadId|Kind|Name|Message，还支持Level-->
<LogLineFormat>Time|ThreadId|Kind|Name|Message</LogLineFormat>
<!--网络日志。本地子网日志广播udp://255.255.255.255:514，或者http://xxx:80/log-->
<NetworkLog></NetworkLog>
<!--日志记录时间UTC校正，小时-->
<UtcIntervalHours>0</UtcIntervalHours>
<!--数据目录。本地数据库目录，默认Data子目录-->
<DataPath>Data</DataPath>
<!--备份目录。备份数据库时存放的目录，默认Backup子目录-->
<BackupPath>Backup</BackupPath>
<!--插件目录-->
<PluginPath>Plugins</PluginPath>
<!--插件服务器。将从该网页上根据关键字分析链接并下载插件，部分嵌入式设备不支持https-->
<PluginServer>http://x.newlifex.com/</PluginServer>
<!--辅助解析程序集。程序集加载过程中，被依赖程序集未能解析时，是否协助解析，默认false-->
<AssemblyResolve>false</AssemblyResolve>
<!--服务地址。用户访问的外网地址，反向代理之外，用于内部构造其它Url（如SSO），或者向注册中心登记，多地址逗号隔开-->
<ServiceAddress></ServiceAddress>
</Core>

3
yy-admin-master/_publish/YY.Admin-win-x64/Configuration/jeecg-sync-state.json Normal file
View File

@@ -0,0 +1,3 @@
{
"lastUserListSyncUtc": "2026-04-28T08:42:50Z"
}

BIN
yy-admin-master/_publish/YY.Admin-win-x64/Slave.db Normal file
View File

Binary file not shown.