liulb
/
AUCMA_SCADA
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

。

Browse Source
dev
liulb@mesnac.com 11 months ago
parent 8fbb2ad83d
commit 5cf54f161b
36 changed files with 97 additions and 72 deletions
Show Stats Download Patch File Download Diff File

2
Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.AssemblyInfo.cs
Unescape Escape View File

@ -15,7 +15,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Api")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+1f1769a34b701f2b8f03838d72e1f49991068d57")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+8fbb2ad83d57856f072d050fdcbf7c41e1580841")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Api")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Api")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

2
Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.AssemblyInfoInputs.cache
Unescape Escape View File

@ -1 +1 @@
74179ae8157f7852c9431e0f012388d24731455a211a8eff479efc28af69b31d
8f89db87316bfa668c5be930959d7b93008608861bf20ee4145bfb18ea646fec

2
Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfo.cs
Unescape Escape View File

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Common")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+bf1b9ff1c1eb08ec0e8d95a38646105ea05fb6c1")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+8fbb2ad83d57856f072d050fdcbf7c41e1580841")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Common")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Common")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

2
Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfoInputs.cache
Unescape Escape View File

@ -1 +1 @@
09e70017c9bba340185d279a719dbcbda4ae15b3c3762baa2bc1b80903fb62bd
9bd482d7bbcea1a322cd8ff7a1971f7b2257dda496b874caea56d4980cbbe151

2
Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfo.cs
Unescape Escape View File

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.EventBus")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+bf1b9ff1c1eb08ec0e8d95a38646105ea05fb6c1")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+8fbb2ad83d57856f072d050fdcbf7c41e1580841")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.EventBus")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.EventBus")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

2
Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfoInputs.cache
Unescape Escape View File

@ -1 +1 @@
62c372c21881cc0a3cf18ed9ccd3281daa887a1a4ca7f4ee3d294ea0404fcb2b
64ac1698027ecfcf4a676d543fb64ce992aeb969ac7efed304ab804a214e67f6

2
Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfo.cs
Unescape Escape View File

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Extensions")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+bf1b9ff1c1eb08ec0e8d95a38646105ea05fb6c1")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+8fbb2ad83d57856f072d050fdcbf7c41e1580841")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Extensions")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Extensions")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

2
Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfoInputs.cache
Unescape Escape View File

@ -1 +1 @@
19d97d4aad1e5f6c727e3cec4adacff61b3a7c7bd32d69c8972a032c9273ee13
8d63f2803d401a3dbf0c51292f991127beab95f6eadfe4a139291948b3905091

2
Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfo.cs
Unescape Escape View File

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.FrameWork")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+1f1769a34b701f2b8f03838d72e1f49991068d57")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+8fbb2ad83d57856f072d050fdcbf7c41e1580841")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.FrameWork")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.FrameWork")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

2
Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfoInputs.cache
Unescape Escape View File

@ -1 +1 @@
e4ff5feba5f86593977c536e74c908c2b5f430e00657cc6a35b4093b4fba7066
78eaddb5eab47ccbfb284bee2bf00c1aababcaa925cfe9149e5e3354f72398ef

2
Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfo.cs
Unescape Escape View File

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.IRepository")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+bf1b9ff1c1eb08ec0e8d95a38646105ea05fb6c1")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+8fbb2ad83d57856f072d050fdcbf7c41e1580841")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.IRepository")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.IRepository")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

2
Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfoInputs.cache
Unescape Escape View File

@ -1 +1 @@
f1bcb3e30d597461cd7b4a6e828ff284b1b41e27582d847c26cbc7fdb28431c0
b7f5a8af7c597826e075549f8aa831b0bc092e07852e41dab2c16597e79b443c

2
Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfo.cs
Unescape Escape View File

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.IService")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+bf1b9ff1c1eb08ec0e8d95a38646105ea05fb6c1")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+8fbb2ad83d57856f072d050fdcbf7c41e1580841")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.IService")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.IService")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

2
Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfoInputs.cache
Unescape Escape View File

@ -1 +1 @@
0d0764005bd65b273c0508565a549cd7307506af4e8920b4795d4d8f39986518
da15c2789d48f410604458379ce923e1bf446b3337a6e848e0722cb7042fca60

2
Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfo.cs
Unescape Escape View File

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Model")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+bf1b9ff1c1eb08ec0e8d95a38646105ea05fb6c1")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+8fbb2ad83d57856f072d050fdcbf7c41e1580841")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Model")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Model")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

2
Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfoInputs.cache
Unescape Escape View File

@ -1 +1 @@
5773f152df26b95087e08348c9bda19c1be708fc03119089543692f612cbff29
52c11d7aa5470f090d34c1e43e543e105478df5f6e51cff40175dbc2b065ac1c

2
Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfo.cs
Unescape Escape View File

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.RealTimeService")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+1f1769a34b701f2b8f03838d72e1f49991068d57")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+8fbb2ad83d57856f072d050fdcbf7c41e1580841")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.RealTimeService")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.RealTimeService")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

2
Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfoInputs.cache
Unescape Escape View File

@ -1 +1 @@
c2fbac0fe4030a2a6945b05a3ea3e3d88f5f76084e501a716f7f8a0042118937
a1f9010a7d46211872cad5e8c4aa3216688e6a8eec016d181db1d08760aca34d

2
Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfo.cs
Unescape Escape View File

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Repository")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+bf1b9ff1c1eb08ec0e8d95a38646105ea05fb6c1")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+8fbb2ad83d57856f072d050fdcbf7c41e1580841")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Repository")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Repository")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

2
Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfoInputs.cache
Unescape Escape View File

@ -1 +1 @@
71714e5e63310566fa090718f0555bff735e2e784a813bbab00e8f701d48c3b3
7f2358fffe4765de4675d3e607315e66536e4f68aa0b8e1868c33cfe3317afba

2
Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfo.cs
Unescape Escape View File

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Serilog.Es")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+bf1b9ff1c1eb08ec0e8d95a38646105ea05fb6c1")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+8fbb2ad83d57856f072d050fdcbf7c41e1580841")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Serilog.Es")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Serilog.Es")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

2
Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfoInputs.cache
Unescape Escape View File

@ -1 +1 @@
ce41c6807cfbdb8eff45c5405f4984b42d6d923756e6e213836d5b9c510a3e3c
9400025c7f3069f1316f9560fd615815643f718b3733a68b202126f88a51996d

2
Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfo.cs
Unescape Escape View File

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Service")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+bf1b9ff1c1eb08ec0e8d95a38646105ea05fb6c1")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+8fbb2ad83d57856f072d050fdcbf7c41e1580841")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Service")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Service")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

2
Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfoInputs.cache
Unescape Escape View File

@ -1 +1 @@
51f44909201dbd9241b4779a73b8b672cb1f3a748f196d413168252d62b5138c
09595d320f932418e714085a6ae1c8de4974c991c29069a26efac0cb0a9d96b5

2
Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfo.cs
Unescape Escape View File

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Tasks")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+bf1b9ff1c1eb08ec0e8d95a38646105ea05fb6c1")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+8fbb2ad83d57856f072d050fdcbf7c41e1580841")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Tasks")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Tasks")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

2
Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfoInputs.cache
Unescape Escape View File

@ -1 +1 @@
2906f3a415f186cbcb70496e9279b2f10c55fe29e20ba6540a209d684a48975e
ba61d7e81b9c388d626f49c629c35f99df500b17b2f7400d4d57c1d145d69a04

5
Admin.Core.sln
Unescape Escape View File

@ -93,11 +93,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aucma.Core.TemperatureTask"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aucma.Core.PerfusionTask", "Aucma.Core.PerfusionTask\Aucma.Core.PerfusionTask.csproj", "{9762EE52-F073-4CF6-AAAE-7FCDC894C967}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{84DFF535-D535-4AB1-A9DA-3749665EB639}"
ProjectSection(SolutionItems) = preProject
.editorconfig = .editorconfig
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU

48
Aucma.Core.BoxFoam/Business/InStoreBusiness.cs
Unescape Escape View File

@ -17,6 +17,7 @@ using System.Windows.Media.Media3D;
using System.Windows.Forms;
using Admin.Core.Model.Model_New;
using static ICSharpCode.SharpZipLib.Zip.ExtendedUnixData;
using Microsoft.IdentityModel.Logging;
namespace Aucma.Core.BoxFoam.Business
{
@ -163,15 +164,21 @@ namespace Aucma.Core.BoxFoam.Business
{
LogDelegateEvent?.Invoke($"获取物料编码：{materialCode}");
Console.WriteLine($"获取物料编码：{materialCode}");
bool r= obj.plc.WriteString("DB200.132", materialCode);//写入物料号
Console.WriteLine($"写入物料编码：{r}");
if (r)
bool result= obj.plc.WriteString("DB200.132", materialCode);//写入物料号
Console.WriteLine($"写入物料编码：{materialCode}");
if (result)
{
Thread.Sleep(2500);
int space = obj.plc.ReadInt16("DB200.438");//读取货道号，大约1.5s 可以获取
Console.WriteLine($"物料MES码：{materialBarCode}，》入库货道：{space}");
logHelper.Info($"物料MES码：{materialBarCode}，》入库货道：{space}");
LogDelegateEvent?.Invoke($"物料MES码：{materialBarCode}，》物料码：{materialCode}");
//更新货道入库
await EnterStore(materialBarCode);
await EnterStore(materialBarCode, space);
//更新过点数
await UpdateComplete(materialBarCode);
Console.WriteLine($"更新物料信息成功！");
Console.WriteLine($"更新物料信息成功！");
RefreshDataGridDelegateEvent?.Invoke();
}
else
{
@ -303,14 +310,39 @@ namespace Aucma.Core.BoxFoam.Business
#region 任务执行入库
public async Task EnterStore(string barCode)
public async Task EnterStore(string barCode,int space)
{
string spaceCode = string.Empty;
switch (space)
{
case 1:
spaceCode = "PB01_001";
break;
case 2:
spaceCode = "PB01_002";
break;
case 3:
spaceCode = "PB01_003";
break;
case 4:
spaceCode = "PB01_004";
break;
case 5:
spaceCode = "PB01_005";
break;
case 6:
spaceCode = "PB01_006";
break;
default:
break;
}
//根据条码获取物料详情
var material = _printBarCodeServices.FirstAsync(d => d.MaterialBarcode == barCode).Result;
RecordInStore recordInstore = new RecordInStore();
recordInstore.StoreCode = storeCode;
recordInstore.StoreArea = "";
recordInstore.SpaceCode = "";
recordInstore.SpaceCode = spaceCode;
string materialType = SubString(barCode);//截取中间物料条码
recordInstore.MaterialType = materialType;
recordInstore.MaterialCode = barCode;
@ -326,7 +358,7 @@ namespace Aucma.Core.BoxFoam.Business
if (result > 0)
{
string message = $"物料[{material.MaterialName}],入库成功！";
RefreshScanMateriaCodeEvent?.Invoke(material.MaterialCode, barCode, material.MaterialName, "", message); //刷新界面扫码信息
RefreshScanMateriaCodeEvent?.Invoke(material.MaterialCode, barCode, material.MaterialName, spaceCode, message); //刷新界面扫码信息
LogDelegateEvent?.Invoke($"物料[{material.MaterialName}], 入库成功！");
RefreshDataGridDelegateEvent?.Invoke();
}

18
Aucma.Core.BoxFoam/ViewModels/IndexPageViewModel.cs
Unescape Escape View File

@ -35,32 +35,32 @@ namespace Aucma.Core.BoxFoam.ViewModels
InStoreBusiness.RefreshDataGridDelegateEvent += LoadData;//刷新底部列表
InStoreBusiness.RefreshScanMateriaCodeEvent += RefreshScanInfo;//扫码信息刷新
InStoreBusiness.LogDelegateEvent += PrintMessageToListBox;//入库日志事件
LoadData();
Task.Run(async () =>
{
await LoadData();
});
}
#region 扫描记录 data
#region 加载DataGrid数据
private async Task LoadData()
{
var storeCode = Appsettings.app("StoreInfo", "BeforeStoreCode");
DateTime startTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd 00:00:00"));
DateTime endTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd 23:59:59"));
List<RecordInStore> list = _recordInstoreServices.QueryAsync(x=>x.StoreCode.Equals(storeCode)).Result.OrderBy(x=>x.CreatedTime).Take(10).ToList();
System.Windows.Application.Current.Dispatcher.Invoke((Action)(async () =>
List<RecordInStore> list =await _recordInstoreServices.QueryAsync(x => x.StoreCode.Equals(storeCode));
if (list == null || list.Count == 0) return;
list = list.OrderByDescending(x => x.CreatedTime).Take(10).ToList();
System.Windows.Application.Current.Dispatcher.Invoke((Action)(() =>
{
PlanInfoDataGrid.Clear();
int i = 1;
try
{
foreach (var item in list)
{
PlanInfoDataGrid.Add(item);
i++;
};
}
}
catch (Exception ex)
{

2
Aucma.Core.BoxFoam/Views/EnterWarehouseStatisticsPageView.xaml
Unescape Escape View File

@ -156,7 +156,7 @@
Foreground="White" >
<DataGrid.Columns>
<DataGridTextColumn Binding="{Binding No}" Header="序号" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" />
<DataGridTextColumn Binding="{Binding SpaceCode}" Header="货道编号" Width="2*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding SpaceCode}" Header="货道编号" Width="2*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" Visibility="Collapsed"/>
<DataGridTextColumn Binding="{Binding MaterialBarCode}" Header="产品条码" Width="3*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding MaterialType}" Header="产品型号" Width="2*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding InstoreTime,StringFormat=\{0:yyyy-MM-dd HH:mm\}}" Header="入库时间" Width="2*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>

20
Aucma.Core.BoxFoam/Views/IndexPageView.xaml
Unescape Escape View File

@ -111,12 +111,12 @@
<RowDefinition/>
</Grid.RowDefinitions>
<StackPanel Grid.Row="0" Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" >
<TextBlock Text="物料条码" FontSize="18" Foreground="White" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="0 0 30 0"/>
<TextBlock Text="物料编码" FontSize="18" Foreground="White" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="0 0 30 0"/>
<TextBox FontSize="18" Text="{Binding MaterialBarCode,Mode=TwoWay}" BorderBrush="White" Foreground="White" Width="200" IsReadOnly="True" Margin="0 0 10 0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" />
<TextBox FontSize="18" Text="{Binding BeginTime,Mode=TwoWay}" BorderBrush="White" Foreground="White" Width="200" IsReadOnly="True" Margin="10 0 0 0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>
</StackPanel>
<StackPanel Grid.Row="1" Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" >
<TextBlock Text="物料编码" FontSize="18" Foreground="White" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="0 0 30 0"/>
<TextBlock Text="物料条码" FontSize="18" Foreground="White" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="0 0 30 0"/>
<TextBox FontSize="18" Text="{Binding MaterialCode,Mode=TwoWay}" BorderBrush="White" Foreground="White" Width="420" IsReadOnly="True" Margin="0 0 0 0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" />
</StackPanel>
<StackPanel Grid.Row="2" Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" >
@ -124,12 +124,12 @@
<TextBox FontSize="18" Text="{Binding MaterialName,Mode=TwoWay}" BorderBrush="White" Foreground="White" Width="420" IsReadOnly="True" Margin="30,0,0,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>
</StackPanel>
<StackPanel Grid.Row="3" Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" >
<StackPanel Visibility="Collapsed" Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" >
<TextBlock Text="目的货道" FontSize="18" Foreground="White"/>
<TextBox FontSize="18" Text="{Binding Destination,Mode=TwoWay}" BorderBrush="White" Foreground="White" Width="420" IsReadOnly="True" Margin="30,0,0,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>
</StackPanel>
<StackPanel Grid.Row="4" Grid.RowSpan="2" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" >
<StackPanel Grid.Row="3" Grid.RowSpan="2" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" >
<TextBlock Text="提示信息" FontSize="18" Foreground="White"/>
<TextBox FontSize="15" BorderBrush="White"
MinHeight="70" MaxHeight="100" MinWidth="420" IsReadOnly="True" Foreground="White"
@ -200,14 +200,12 @@
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
<!--<DataGridTextColumn Binding="{Binding TaskCode}" Header="任务编号" Width="1*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>-->
<DataGridTextColumn Binding="{Binding BarCodeCode}" Header="物料条码" Width="2*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding MaterialCode}" Header="物料类型" Width="1*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" />
<!--<DataGridTextColumn Binding="{Binding MaterialName}" Header="物料名称" Width="2*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" />-->
<DataGridTextColumn Binding="{Binding SpaceName}" Header="入库货道" Width="*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" Visibility="Collapsed" />
<DataGridTextColumn Binding="{Binding CreateTime,StringFormat=\{0:yyyy-MM-dd HH:mm\}}" Header="创建时间" Width="1.5*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" Visibility="Collapsed"/>
<DataGridTextColumn Binding="{Binding TaskStatus}" Header="状态" Width="0.5*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<!--<DataGridTextColumn Binding="{Binding CompleteAmount}" Header="设备号" Width="*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>-->
<DataGridTextColumn Binding="{Binding MaterialType}" Header="物料类型" Width="1*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" />
<DataGridTextColumn Binding="{Binding MaterialName}" Header="物料名称" Width="2*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" />
<DataGridTextColumn Binding="{Binding SpaceCode}" Header="入库货道" Width="*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" Visibility="Collapsed" />
<DataGridTextColumn Binding="{Binding InStoreTime,StringFormat=\{0:yyyy-MM-dd HH:mm\}}" Header="创建时间" Width="1.5*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<!--<DataGridTextColumn Binding="{Binding TaskStatus}" Header="状态" Width="0.5*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>-->
</DataGrid.Columns>
</DataGrid>
</Grid>

2
Aucma.Core.BoxFoam/Views/MainWindow.xaml
Unescape Escape View File

@ -33,7 +33,7 @@
</Grid.ColumnDefinitions>
<StackPanel Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Center">
<TextBlock Text="澳柯玛箱体发泡控制系统" FontSize="42" Foreground="White" FontWeight="Bold"/>
<TextBlock Text="箱体发泡控制系统" FontSize="42" Foreground="White" FontWeight="Bold"/>
</StackPanel>
<StackPanel Grid.Column="2" VerticalAlignment="Center" HorizontalAlignment="Right">

16
Aucma.Core.DoorFoam/ViewModels/RealTimePageViewModel.cs
Unescape Escape View File

@ -248,7 +248,7 @@ namespace Aucma.Core.DoorFoam.ViewModels
if (result!=null) return;
var plan = await _productPlanInfoServices.QueryAsync(d => d.PlanAmount > d.CompleteAmount);
// var plan = _orderBomInfoServices.Query(d => d.MaterialType == "200");
//var plan = _orderBomInfoServices.Query(d => d.MaterialType == "200");
//var plan = _baseOrderInfoServices.QueryAsync().Result;
if (plan == null)
{
@ -259,14 +259,14 @@ namespace Aucma.Core.DoorFoam.ViewModels
var obj = await _printBarCodeServices.FirstAsync(d => d.MaterialBarcode == code);
if (obj == null)
{
PrintMessageToListBox("未查询到条码打印信息");
Console.WriteLine("未查询到条码打印信息");
PrintMessageToListBox($"未查询到条码打印信息【{code}】");
Console.WriteLine($"未查询到条码打印信息【{code}】");
return;
}
ProductPlanInfo stationPlan = plan.FirstOrDefault(d => d.OrderCode == obj.OrderCode);
if (stationPlan == null)
{
PrintMessageToListBox($"未查询到该条码订单信息；条码【{code}】");
PrintMessageToListBox($"未查询到该条码订单信息；物料二维码【{code}】");
Console.WriteLine($"未查询到该条码订单信息；条码【{code}】");
log.Error($"未查询到该条码订单信息；条码【{code}】");
return;
@ -288,7 +288,7 @@ namespace Aucma.Core.DoorFoam.ViewModels
PrintMessageToListBox($"箱门匹配信息记录成功！箱体码【{code}】");
model.MaterialName = this.FormatMaterialType(stationPlan.MaterialName);
System.Windows.Application.Current.Dispatcher.Invoke((Action)(async () =>
System.Windows.Application.Current.Dispatcher.Invoke((Action)(() =>
{
planInfoDataGrid.Insert(0, model);
}));
@ -433,19 +433,19 @@ namespace Aucma.Core.DoorFoam.ViewModels
if (history != null) return ;
List<MaterialCompletion> completionList = new List<MaterialCompletion>();
#region 更新过点数据
string stationName = Appsettings.app("StationInfo", "StationName");
string stationCode = Appsettings.app("StationInfo", "StationCode");
MaterialCompletion completion = new MaterialCompletion();
completion.OrderCode = history.OrderCode;
completion.MaterialBarcode = barCode;
completion.MaterialCode = history.MaterialCode;
completion.MaterialName = history.MaterialName;
completion.StationName = stationName;
completion.StationName = stationCode;
completion.ProductLineCode = "CX_02";
completion.CompleteDate = DateTime.Now;
completionList.Add(completion);
#endregion
int r = _materialCompletionServices.AddAsync(completionList).Result;
_=_materialCompletionServices.AddAsync(completionList).Result;
}

2
Aucma.Core.DoorFoam/appsettings.json
Unescape Escape View File

@ -219,7 +219,7 @@
}
],
"StationInfo": {
"StationCode": 1020,
"StationCode": 1012,
"ShellInventoryStoreCode": "XKJCK-001",
"LinerInventory": "NDJCK-001",
"AfterStoreCode": "FPJCK-001",

2
HwControlLib/obj/Debug/net6.0-windows/HwControlLib.AssemblyInfo.cs
Unescape Escape View File

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("HwControlLib")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+1f1769a34b701f2b8f03838d72e1f49991068d57")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+8fbb2ad83d57856f072d050fdcbf7c41e1580841")]
[assembly: System.Reflection.AssemblyProductAttribute("HwControlLib")]
[assembly: System.Reflection.AssemblyTitleAttribute("HwControlLib")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

2
HwControlLib/obj/Debug/net6.0-windows/HwControlLib.AssemblyInfoInputs.cache
Unescape Escape View File

@ -1 +1 @@
cbeff29e757208ba6b6519cfe0f0f0a4c3216a27c70a7e6ba8b9780a6ce4b085
05fe130e02417a0fa9c68025438bc7bff96607603d71071d708f782a26e33533

Write Preview
Loading…
Cancel
Save