班次添加硫化、筛选全显示

main
yinq 2 weeks ago
parent 8624ff9330
commit 2bebf36edb

@ -38,7 +38,7 @@ namespace SlnMesnac.Repository.service.Impl
.WhereIF(!string.IsNullOrEmpty(materialCode), (ppi, ppei) => ppi.MaterialCode == materialCode)
.WhereIF(!string.IsNullOrEmpty(stationCode), (ppi, ppei) => ppi.StationCode == stationCode)
.WhereIF(!string.IsNullOrEmpty(planStatus), (ppi, ppei) => ppi.PlanStatus == planStatus || ppi.PlanStatus == "4")
.WhereIF(!string.IsNullOrEmpty(classes), (ppi, ppei) => ppei.classes == classes)
.WhereIF(!string.IsNullOrEmpty(classes) && classes != "硫化", (ppi, ppei) => ppei.classes == classes)
.Select((ppi, ppei) => new ProdPLanInfo
{
ObjId = ppi.ObjId,

@ -27,12 +27,8 @@
<ProjectReference Include="..\SlnMesnac.Ioc\SlnMesnac.Ioc.csproj" />
<ProjectReference Include="..\SlnMesnac.Model\SlnMesnac.Model.csproj" />
<ProjectReference Include="..\SlnMesnac.Mqtt\SlnMesnac.Mqtt.csproj" />
<ProjectReference Include="..\SlnMesnac.Plc\SlnMesnac.Plc.csproj" />
<ProjectReference Include="..\SlnMesnac.Quartz\SlnMesnac.Quartz.csproj" />
<ProjectReference Include="..\SlnMesnac.Repository\SlnMesnac.Repository.csproj" />
<ProjectReference Include="..\SlnMesnac.Rfid\SlnMesnac.Rfid.csproj" />
<ProjectReference Include="..\SlnMesnac.Serilog\SlnMesnac.Serilog.csproj" />
<ProjectReference Include="..\SlnMesnac.TouchSocket\SlnMesnac.TouchSocket.csproj" />
</ItemGroup>
<ItemGroup>

@ -342,9 +342,9 @@ namespace SlnMesnac.WPF.ViewModel
ProcessCode = configuration.GetSection("AppConfig")["ProcessCode"];
// 初始化班次列表
ShiftList = new List<string> { "白班", "小夜", "大夜" };
SelectedShift = "白班"; // 默认选择白班
ShiftList = new List<string> { "硫化", "白班", "小夜", "大夜" };
SelectedShift = "硫化"; // 默认选择硫化
HandoverCommand = new RelayCommand(Handover);
ProductionReportCommand = new RelayCommand(ProductionReport);
TechnologicalInformationCommand = new RelayCommand(TechnologicalInformation);

Loading…
Cancel
Save