wenjy
/
Aucma.Scada
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change - 货道明细逻辑实现

Browse Source
foamRearStore
wenjy 1 year ago
parent f256c920b6
commit 02529161b3
67 changed files with 1502 additions and 22 deletions
Show Stats Download Patch File Download Diff File

BIN
.vs/HighWayIot/v16/.suo
View File

Binary file not shown.

33
Aucma.Scada.Business/InventoryInfoBusiness.cs
Unescape Escape View File

@ -31,11 +31,17 @@ namespace Aucma.Scada.Business
private IBaseSpaceInfoService _spaceInfoService = new BaseSpaceInfoServiceImpl(); private IBaseSpaceInfoService _spaceInfoService = new BaseSpaceInfoServiceImpl();
private IBaseSpaceDetailService _spaceDetailService = new BaseSpaceDetailServiceImpl();
public InventoryInfoBusiness() public InventoryInfoBusiness()
{ {
} }
//List<BaseSpaceDetail>
public delegate void RefreshSpaceDetails(List<BaseSpaceDetail> taskInfos);
public event RefreshSpaceDetails RefreshSpaceDetailsEvent;
/// <summary> /// <summary>
/// 获取货道信息 /// 获取货道信息
/// </summary> /// </summary>
@ -159,5 +165,32 @@ namespace Aucma.Scada.Business
} }
return result; return result;
} }
/// <summary>
/// 刷新货道明细
/// </summary>
/// <param name="storeCode"></param>
/// <param name="spaceCode"></param>
/// <returns></returns>
public void RefreshBaseSpaceDetails(string storeCode,string spaceCode)
{
List<BaseSpaceDetail> spaceDetails = _spaceDetailService.GetSpaceDetailsBySpaceCode(storeCode, spaceCode);
if(spaceDetails != null)
{
RefreshSpaceDetailsEvent?.Invoke(spaceDetails);
}
}
/// <summary>
/// 获取货道明细
/// </summary>
/// <param name="storeCode"></param>
/// <param name="spaceCode"></param>
/// <returns></returns>
public List<BaseSpaceDetail> GetBaseSpaceDetails(string storeCode, string spaceCode)
{
List<BaseSpaceDetail> spaceDetails = _spaceDetailService.GetSpaceDetailsBySpaceCode(storeCode, spaceCode);
return spaceDetails;
}
} }
} }

BIN
Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll
View File

Binary file not shown.

BIN
Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.pdb
View File

Binary file not shown.

BIN
Aucma.Scada.Business/bin/Debug/HighWayIot.Repository.dll
View File

Binary file not shown.

BIN
Aucma.Scada.Business/bin/Debug/HighWayIot.Repository.pdb
View File

Binary file not shown.

BIN
Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.csproj.AssemblyReference.cache
View File

Binary file not shown.

BIN
Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.dll
View File

Binary file not shown.

BIN
Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.pdb
View File

Binary file not shown.

8
Aucma.Scada.UI/Aucma.Scada.UI.csproj
Unescape Escape View File

@ -117,6 +117,9 @@
<Compile Include="Page\InventoryInfo\ShellInventory.xaml.cs"> <Compile Include="Page\InventoryInfo\ShellInventory.xaml.cs">
<DependentUpon>ShellInventory.xaml</DependentUpon> <DependentUpon>ShellInventory.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="Page\InventoryInfo\SpaceDetailWindow.xaml.cs">
<DependentUpon>SpaceDetailWindow.xaml</DependentUpon>
</Compile>
<Compile Include="Page\InventoryInfo\SpaceInfoControl.xaml.cs"> <Compile Include="Page\InventoryInfo\SpaceInfoControl.xaml.cs">
<DependentUpon>SpaceInfoControl.xaml</DependentUpon> <DependentUpon>SpaceInfoControl.xaml</DependentUpon>
</Compile> </Compile>
@ -134,6 +137,7 @@
<Compile Include="viewModel\InStoreInfo\InStoreInfoViewModel.cs" /> <Compile Include="viewModel\InStoreInfo\InStoreInfoViewModel.cs" />
<Compile Include="viewModel\InventoryInfo\InventoryInfoViewModel.cs" /> <Compile Include="viewModel\InventoryInfo\InventoryInfoViewModel.cs" />
<Compile Include="viewModel\InventoryInfo\LinerInventoryViewModel.cs" /> <Compile Include="viewModel\InventoryInfo\LinerInventoryViewModel.cs" />
<Compile Include="viewModel\InventoryInfo\SpaceDetailViewModel.cs" />
<Compile Include="viewModel\LogInfoViewModel.cs" /> <Compile Include="viewModel\LogInfoViewModel.cs" />
<Compile Include="viewModel\MainViewModel.cs" /> <Compile Include="viewModel\MainViewModel.cs" />
<Compile Include="viewModel\OutStoreInfo\OutStoreInfoViewModel.cs" /> <Compile Include="viewModel\OutStoreInfo\OutStoreInfoViewModel.cs" />
@ -180,6 +184,10 @@
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</Page> </Page>
<Page Include="Page\InventoryInfo\SpaceDetailWindow.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Page\InventoryInfo\SpaceInfoControl.xaml"> <Page Include="Page\InventoryInfo\SpaceInfoControl.xaml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>

2
Aucma.Scada.UI/Page/InventoryInfo/LinerInventory.xaml
Unescape Escape View File

@ -130,7 +130,7 @@
</Border> </Border>
<Border Grid.Column="5" BorderBrush="White" BorderThickness="1"> <Border Grid.Column="5" BorderBrush="White" BorderThickness="1">
<Button Command="{Binding DataContext.UpdateCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}" CommandParameter="{Binding spaceCode}" Style="{StaticResource BUTTON_AGREE}" BorderBrush="Transparent" BorderThickness="0" Background="Transparent"> <Button Command="{Binding DataContext.SpaceDetailCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}" CommandParameter="{Binding spaceCode}" Style="{StaticResource BUTTON_AGREE}" BorderBrush="Transparent" BorderThickness="0" Background="Transparent">
<TextBlock Text="明细" FontSize="18" Foreground="Green" FontWeight="Bold" VerticalAlignment="Center" HorizontalAlignment="Center"/> <TextBlock Text="明细" FontSize="18" Foreground="Green" FontWeight="Bold" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Button> </Button>
</Border> </Border>

2
Aucma.Scada.UI/Page/InventoryInfo/ShellInventory.xaml
Unescape Escape View File

@ -131,7 +131,7 @@
</Border> </Border>
<Border Grid.Column="5" BorderBrush="White" BorderThickness="1"> <Border Grid.Column="5" BorderBrush="White" BorderThickness="1">
<Button Command="{Binding DataContext.UpdateCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}" CommandParameter="{Binding spaceCode}" Style="{StaticResource BUTTON_AGREE}" BorderBrush="Transparent" BorderThickness="0" Background="Transparent"> <Button Command="{Binding DataContext.SpaceDetailCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}" CommandParameter="{Binding spaceCode}" Style="{StaticResource BUTTON_AGREE}" BorderBrush="Transparent" BorderThickness="0" Background="Transparent">
<TextBlock Text="明细" FontSize="18" Foreground="Green" FontWeight="Bold" VerticalAlignment="Center" HorizontalAlignment="Center"/> <TextBlock Text="明细" FontSize="18" Foreground="Green" FontWeight="Bold" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Button> </Button>
</Border> </Border>

57
Aucma.Scada.UI/Page/InventoryInfo/SpaceDetailWindow.xaml
Unescape Escape View File

@ -0,0 +1,57 @@
<Window x:Class="Aucma.Scada.UI.Page.InventoryInfo.SpaceDetailWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:Aucma.Scada.UI.Page.InventoryInfo"
mc:Ignorable="d"
Title="{Binding TitleName}" Height="450" Width="800" Name="window">
<Border Margin="5" Background="White" CornerRadius="10">
<Border.Effect>
<DropShadowEffect Color="Gray" ShadowDepth="0" BlurRadius="5" Opacity="0.3" Direction="0"></DropShadowEffect>
</Border.Effect>
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="2*"/>
<RowDefinition Height="7*"/>
<RowDefinition Height="1*"/>
</Grid.RowDefinitions>
<Border Grid.Row="0" BorderBrush="CadetBlue" BorderThickness="0">
<StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="20,0,0,0">
<TextBlock Text="物料编号" VerticalAlignment="Center" Foreground="Gray" FontSize="15"/>
<TextBox Width="200" Height="25" Margin="10 0 0 0" Text="{Binding MaterialCodeSearch}" Foreground="Gray" VerticalAlignment="Center" FontSize="15"/>
<!--resourceStyle 413行修改边框颜色-->
<TextBlock Text="物料名称" VerticalAlignment="Center" Foreground="Gray" FontSize="15" Margin="20,0,0,0"/>
<TextBox Width="150" Height="25" Margin="10 0 0 0" Text="{Binding MaterialNameSearch}" Foreground="Gray" VerticalAlignment="Center" FontSize="15"/>
<Button Content="查询" Command="{Binding QueryCommand}" Style="{StaticResource BUTTON_AGREE}" Background="#007DFA" BorderBrush="#007DFA" Foreground="White" Margin="20,0,0,0" Height="30" Width="80" />
<Button Content="重置" Command="{Binding ResetCommand}" Style="{StaticResource BUTTON_AGREE}" Background="#007DFA" BorderBrush="#007DFA" Foreground="White" Margin="20,0,0,0" Height="30" Width="80" />
</StackPanel>
</Border>
<!--计划列表-->
<Border Grid.Row="1" BorderBrush="Green" BorderThickness="2" CornerRadius="5" Background="Transparent" Margin="1,1,5,5">
<DataGrid Name="dataGrid" ItemsSource="{Binding SpaceDetailDataGrid}" Background="Transparent"
FontSize="15" ColumnHeaderHeight="35"
RowHeight="31" AutoGenerateColumns="False" RowHeaderWidth="0"
GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden"
ScrollViewer.VerticalScrollBarVisibility="Hidden" BorderThickness="0" CanUserAddRows="False"
Foreground="Gray" SelectedItem="{Binding SelectedDataItem}">
<!--resourceStyle 399行修改选中字体颜色-->
<DataGrid.Columns>
<DataGridTextColumn Binding="{Binding spaceCode}" Header="货道编号" Width="1*" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding materialCode}" Header="物料编号" Width="1*" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding materialName}" Header="物料名称" Width="1*" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding materialType}" Header="物料类型" Width="1*" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding materialAmount}" Header="物料数量" Width="1*" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding createTime,StringFormat=\{0:MM月dd日 HH:mm\}}" Header="创建时间" Width="1*" IsReadOnly="True"/>
</DataGrid.Columns>
</DataGrid>
</Border>
<Border Grid.Row="2" BorderBrush="Green" BorderThickness="0" CornerRadius="5" Background="Transparent" Margin="1,1,5,5" VerticalAlignment="Center" HorizontalAlignment="Right">
<Button Content="关 闭" Command="{Binding CloseWindowCommand}" CommandParameter="{Binding ElementName=window}" Style="{StaticResource BUTTON_AGREE}" Background="#FF9900" Foreground="white" Margin="20,0,50,0" Height="30" BorderBrush="#FF9900" Width="80" />
</Border>
</Grid>
</Border>
</Window>

30
Aucma.Scada.UI/Page/InventoryInfo/SpaceDetailWindow.xaml.cs
Unescape Escape View File

@ -0,0 +1,30 @@
using Aucma.Scada.UI.viewModel.InventoryInfo;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Shapes;
namespace Aucma.Scada.UI.Page.InventoryInfo
{
/// <summary>
/// SpaceDetailWindow.xaml 的交互逻辑
/// </summary>
public partial class SpaceDetailWindow : Window
{
public SpaceDetailWindow(string storeCode, string spaceCode)
{
InitializeComponent();
SpaceDetailViewModel spaceDetailViewModel = new SpaceDetailViewModel(storeCode,spaceCode);
this.DataContext = spaceDetailViewModel;
}
}
}

BIN
Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.dll
View File

Binary file not shown.

BIN
Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.pdb
View File

Binary file not shown.

BIN
Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.exe
View File

Binary file not shown.

BIN
Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.pdb
View File

Binary file not shown.

BIN
Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.dll
View File

Binary file not shown.

BIN
Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.pdb
View File

Binary file not shown.

232
Aucma.Scada.UI/bin/Debug/Log/2023-10-13/LogInfo.txt
Unescape Escape View File

@ -366,4 +366,236 @@
日志时间：2023-10-13 09:50:20,605 [1] 日志时间：2023-10-13 09:50:20,605 [1]
日志级别：INFO 日志级别：INFO
日志内容：程序退出 日志内容：程序退出
<-------------->
日志时间：2023-10-13 11:07:27,515 [1]
日志级别：INFO
日志内容：根据产线工位编号：ZZ-01；获取到的执行计划信息：[{"objId":82,"executePlanCode":"a1e0d29c2b774f25bd0df0f059e24976","productPlanCode":"202310081458","orderCode":"11215483","materialCode":"9002006859","materialName":"SC-439,YZXGWBC元气森林,C","productLineCode":"ZZ-01","planAmount":1,"completeAmount":0,"beginTime":null,"endTime":null,"isFlag":0,"executeOrder":1,"executeStatus":1,"createdTime":"\/Date(1697003840000)\/"}]
<-------------->
日志时间：2023-10-13 11:07:52,918 [1]
日志级别：INFO
日志内容：程序退出
<-------------->
日志时间：2023-10-13 11:10:31,708 [1]
日志级别：INFO
日志内容：根据产线工位编号：ZZ-01；获取到的执行计划信息：[{"objId":82,"executePlanCode":"a1e0d29c2b774f25bd0df0f059e24976","productPlanCode":"202310081458","orderCode":"11215483","materialCode":"9002006859","materialName":"SC-439,YZXGWBC元气森林,C","productLineCode":"ZZ-01","planAmount":1,"completeAmount":0,"beginTime":null,"endTime":null,"isFlag":0,"executeOrder":1,"executeStatus":1,"createdTime":"\/Date(1697003840000)\/"}]
<-------------->
日志时间：2023-10-13 11:10:42,608 [1]
日志级别：INFO
日志内容：根据仓库编号：NDJCK-001；货道编号：ND_001；获取到的执货道明细：[{"objId":1,"spaceCode":"ND_001","materialCode":"202310130001","materialName":"SC232","materialType":"3600000780","materialAmount":1,"storeCode":"NDJCK-001","isFlag":0,"createTime":"\/Date(1697166427000)\/"}]
<-------------->
日志时间：2023-10-13 11:10:54,698 [1]
日志级别：INFO
日志内容：程序退出
<-------------->
日志时间：2023-10-13 11:11:22,105 [1]
日志级别：INFO
日志内容：根据产线工位编号：ZZ-01；获取到的执行计划信息：[{"objId":82,"executePlanCode":"a1e0d29c2b774f25bd0df0f059e24976","productPlanCode":"202310081458","orderCode":"11215483","materialCode":"9002006859","materialName":"SC-439,YZXGWBC元气森林,C","productLineCode":"ZZ-01","planAmount":1,"completeAmount":0,"beginTime":null,"endTime":null,"isFlag":0,"executeOrder":1,"executeStatus":1,"createdTime":"\/Date(1697003840000)\/"}]
<-------------->
日志时间：2023-10-13 11:11:29,032 [1]
日志级别：INFO
日志内容：根据仓库编号：NDJCK-001；货道编号：ND_001；获取到的执货道明细：[{"objId":1,"spaceCode":"ND_001","materialCode":"202310130001","materialName":"SC232","materialType":"3600000780","materialAmount":1,"storeCode":"NDJCK-001","isFlag":0,"createTime":"\/Date(1697166427000)\/"}]
<-------------->
日志时间：2023-10-13 11:12:27,081 [1]
日志级别：INFO
日志内容：根据产线工位编号：ZZ-01；获取到的执行计划信息：[{"objId":82,"executePlanCode":"a1e0d29c2b774f25bd0df0f059e24976","productPlanCode":"202310081458","orderCode":"11215483","materialCode":"9002006859","materialName":"SC-439,YZXGWBC元气森林,C","productLineCode":"ZZ-01","planAmount":1,"completeAmount":0,"beginTime":null,"endTime":null,"isFlag":0,"executeOrder":1,"executeStatus":1,"createdTime":"\/Date(1697003840000)\/"}]
<-------------->
日志时间：2023-10-13 11:13:08,462 [1]
日志级别：INFO
日志内容：根据仓库编号：NDJCK-001；货道编号：ND_001；获取到的执货道明细：[{"objId":1,"spaceCode":"ND_001","materialCode":"202310130001","materialName":"SC232","materialType":"3600000780","materialAmount":1,"storeCode":"NDJCK-001","isFlag":0,"createTime":"\/Date(1697166427000)\/"}]
<-------------->
日志时间：2023-10-13 11:13:41,752 [1]
日志级别：INFO
日志内容：根据产线工位编号：ZZ-01；获取到的执行计划信息：[{"objId":82,"executePlanCode":"a1e0d29c2b774f25bd0df0f059e24976","productPlanCode":"202310081458","orderCode":"11215483","materialCode":"9002006859","materialName":"SC-439,YZXGWBC元气森林,C","productLineCode":"ZZ-01","planAmount":1,"completeAmount":0,"beginTime":null,"endTime":null,"isFlag":0,"executeOrder":1,"executeStatus":1,"createdTime":"\/Date(1697003840000)\/"}]
<-------------->
日志时间：2023-10-13 11:13:52,236 [1]
日志级别：INFO
日志内容：根据仓库编号：NDJCK-001；货道编号：ND_001；获取到的执货道明细：[{"objId":1,"spaceCode":"ND_001","materialCode":"202310130001","materialName":"SC232","materialType":"3600000780","materialAmount":1,"storeCode":"NDJCK-001","isFlag":0,"createTime":"\/Date(1697166427000)\/"}]
<-------------->
日志时间：2023-10-13 11:15:38,874 [1]
日志级别：INFO
日志内容：根据产线工位编号：ZZ-01；获取到的执行计划信息：[{"objId":82,"executePlanCode":"a1e0d29c2b774f25bd0df0f059e24976","productPlanCode":"202310081458","orderCode":"11215483","materialCode":"9002006859","materialName":"SC-439,YZXGWBC元气森林,C","productLineCode":"ZZ-01","planAmount":1,"completeAmount":0,"beginTime":null,"endTime":null,"isFlag":0,"executeOrder":1,"executeStatus":1,"createdTime":"\/Date(1697003840000)\/"}]
<-------------->
日志时间：2023-10-13 11:16:13,751 [1]
日志级别：INFO
日志内容：根据仓库编号：NDJCK-001；货道编号：ND_001；获取到的执货道明细：[{"objId":1,"spaceCode":"ND_001","materialCode":"202310130001","materialName":"SC232","materialType":"3600000780","materialAmount":1,"storeCode":"NDJCK-001","isFlag":0,"createTime":"\/Date(1697166427000)\/"}]
<-------------->
日志时间：2023-10-13 11:16:17,483 [1]
日志级别：INFO
日志内容：根据仓库编号：NDJCK-001；货道编号：ND_001；获取到的执货道明细：[{"objId":1,"spaceCode":"ND_001","materialCode":"202310130001","materialName":"SC232","materialType":"3600000780","materialAmount":1,"storeCode":"NDJCK-001","isFlag":0,"createTime":"\/Date(1697166427000)\/"}]
<-------------->
日志时间：2023-10-13 11:16:19,486 [1]
日志级别：INFO
日志内容：根据仓库编号：NDJCK-001；货道编号：ND_001；获取到的执货道明细：[{"objId":1,"spaceCode":"ND_001","materialCode":"202310130001","materialName":"SC232","materialType":"3600000780","materialAmount":1,"storeCode":"NDJCK-001","isFlag":0,"createTime":"\/Date(1697166427000)\/"}]
<-------------->
日志时间：2023-10-13 11:16:21,574 [1]
日志级别：INFO
日志内容：根据仓库编号：NDJCK-001；货道编号：ND_001；获取到的执货道明细：[{"objId":1,"spaceCode":"ND_001","materialCode":"202310130001","materialName":"SC232","materialType":"3600000780","materialAmount":1,"storeCode":"NDJCK-001","isFlag":0,"createTime":"\/Date(1697166427000)\/"}]
<-------------->
日志时间：2023-10-13 11:16:25,217 [1]
日志级别：INFO
日志内容：根据仓库编号：NDJCK-001；货道编号：ND_001；获取到的执货道明细：[{"objId":1,"spaceCode":"ND_001","materialCode":"202310130001","materialName":"SC232","materialType":"3600000780","materialAmount":1,"storeCode":"NDJCK-001","isFlag":0,"createTime":"\/Date(1697166427000)\/"}]
<-------------->
日志时间：2023-10-13 11:16:28,596 [1]
日志级别：INFO
日志内容：程序退出
<-------------->
日志时间：2023-10-13 11:22:19,217 [1]
日志级别：INFO
日志内容：根据产线工位编号：ZZ-01；获取到的执行计划信息：[{"objId":82,"executePlanCode":"a1e0d29c2b774f25bd0df0f059e24976","productPlanCode":"202310081458","orderCode":"11215483","materialCode":"9002006859","materialName":"SC-439,YZXGWBC元气森林,C","productLineCode":"ZZ-01","planAmount":1,"completeAmount":0,"beginTime":null,"endTime":null,"isFlag":0,"executeOrder":1,"executeStatus":1,"createdTime":"\/Date(1697003840000)\/"}]
<-------------->
日志时间：2023-10-13 11:22:28,903 [1]
日志级别：INFO
日志内容：根据仓库编号：NDJCK-001；货道编号：ND_001；获取到的执货道明细：[{"objId":1,"spaceCode":"ND_001","materialCode":"202310130001","materialName":"SC232","materialType":"3600000780","materialAmount":1,"storeCode":"NDJCK-001","isFlag":0,"createTime":"\/Date(1697166427000)\/"}]
<-------------->
日志时间：2023-10-13 11:22:37,920 [1]
日志级别：INFO
日志内容：程序退出
<-------------->
日志时间：2023-10-13 11:23:36,329 [1]
日志级别：INFO
日志内容：根据产线工位编号：ZZ-01；获取到的执行计划信息：[{"objId":82,"executePlanCode":"a1e0d29c2b774f25bd0df0f059e24976","productPlanCode":"202310081458","orderCode":"11215483","materialCode":"9002006859","materialName":"SC-439,YZXGWBC元气森林,C","productLineCode":"ZZ-01","planAmount":1,"completeAmount":0,"beginTime":null,"endTime":null,"isFlag":0,"executeOrder":1,"executeStatus":1,"createdTime":"\/Date(1697003840000)\/"}]
<-------------->
日志时间：2023-10-13 11:23:49,688 [1]
日志级别：INFO
日志内容：修改仓库：NDJCK-001；货道：ND_001；货道状态：2;修改成功
<-------------->
日志时间：2023-10-13 11:23:51,679 [1]
日志级别：INFO
日志内容：根据仓库编号：NDJCK-001；货道编号：ND_001；获取到的执货道明细：[{"objId":1,"spaceCode":"ND_001","materialCode":"202310130001","materialName":"SC232","materialType":"3600000780","materialAmount":1,"storeCode":"NDJCK-001","isFlag":0,"createTime":"\/Date(1697166427000)\/"}]
<-------------->
日志时间：2023-10-13 11:24:01,191 [1]
日志级别：INFO
日志内容：程序退出
<-------------->
日志时间：2023-10-13 11:26:13,915 [1]
日志级别：INFO
日志内容：根据产线工位编号：ZZ-01；获取到的执行计划信息：[{"objId":82,"executePlanCode":"a1e0d29c2b774f25bd0df0f059e24976","productPlanCode":"202310081458","orderCode":"11215483","materialCode":"9002006859","materialName":"SC-439,YZXGWBC元气森林,C","productLineCode":"ZZ-01","planAmount":1,"completeAmount":0,"beginTime":null,"endTime":null,"isFlag":0,"executeOrder":1,"executeStatus":1,"createdTime":"\/Date(1697003840000)\/"}]
<-------------->
日志时间：2023-10-13 11:26:20,972 [1]
日志级别：INFO
日志内容：根据仓库编号：NDJCK-001；货道编号：ND_001；获取到的执货道明细：[{"objId":1,"spaceCode":"ND_001","materialCode":"202310130001","materialName":"SC232","materialType":"3600000780","materialAmount":1,"storeCode":"NDJCK-001","isFlag":0,"createTime":"\/Date(1697166427000)\/"}]
<-------------->
日志时间：2023-10-13 11:26:26,318 [1]
日志级别：INFO
日志内容：程序退出
<-------------->
日志时间：2023-10-13 11:26:48,705 [1]
日志级别：INFO
日志内容：根据产线工位编号：ZZ-01；获取到的执行计划信息：[{"objId":82,"executePlanCode":"a1e0d29c2b774f25bd0df0f059e24976","productPlanCode":"202310081458","orderCode":"11215483","materialCode":"9002006859","materialName":"SC-439,YZXGWBC元气森林,C","productLineCode":"ZZ-01","planAmount":1,"completeAmount":0,"beginTime":null,"endTime":null,"isFlag":0,"executeOrder":1,"executeStatus":1,"createdTime":"\/Date(1697003840000)\/"}]
<-------------->
日志时间：2023-10-13 11:26:56,980 [1]
日志级别：INFO
日志内容：根据仓库编号：NDJCK-001；货道编号：ND_001；获取到的执货道明细：[{"objId":1,"spaceCode":"ND_001","materialCode":"202310130001","materialName":"SC232","materialType":"3600000780","materialAmount":1,"storeCode":"NDJCK-001","isFlag":0,"createTime":"\/Date(1697166427000)\/"}]
<-------------->
日志时间：2023-10-13 11:27:03,019 [1]
日志级别：INFO
日志内容：程序退出
<-------------->
日志时间：2023-10-13 11:31:36,403 [1]
日志级别：INFO
日志内容：根据产线工位编号：ZZ-01；获取到的执行计划信息：[{"objId":82,"executePlanCode":"a1e0d29c2b774f25bd0df0f059e24976","productPlanCode":"202310081458","orderCode":"11215483","materialCode":"9002006859","materialName":"SC-439,YZXGWBC元气森林,C","productLineCode":"ZZ-01","planAmount":1,"completeAmount":0,"beginTime":null,"endTime":null,"isFlag":0,"executeOrder":1,"executeStatus":1,"createdTime":"\/Date(1697003840000)\/"}]
<-------------->
日志时间：2023-10-13 11:31:51,304 [1]
日志级别：INFO
日志内容：根据仓库编号：NDJCK-001；货道编号：ND_001；获取到的执货道明细：[{"objId":1,"spaceCode":"ND_001","materialCode":"202310130001","materialName":"SC232","materialType":"3600000780","materialAmount":1,"storeCode":"NDJCK-001","isFlag":0,"createTime":"\/Date(1697166427000)\/"}]
<-------------->
日志时间：2023-10-13 11:31:54,715 [1]
日志级别：INFO
日志内容：根据仓库编号：NDJCK-001；货道编号：ND_001；获取到的执货道明细：[{"objId":1,"spaceCode":"ND_001","materialCode":"202310130001","materialName":"SC232","materialType":"3600000780","materialAmount":1,"storeCode":"NDJCK-001","isFlag":0,"createTime":"\/Date(1697166427000)\/"}]
<-------------->
日志时间：2023-10-13 11:31:58,278 [1]
日志级别：INFO
日志内容：程序退出
<-------------->
日志时间：2023-10-13 11:39:19,780 [1]
日志级别：INFO
日志内容：根据产线工位编号：ZZ-01；获取到的执行计划信息：[{"objId":82,"executePlanCode":"a1e0d29c2b774f25bd0df0f059e24976","productPlanCode":"202310081458","orderCode":"11215483","materialCode":"9002006859","materialName":"SC-439,YZXGWBC元气森林,C","productLineCode":"ZZ-01","planAmount":1,"completeAmount":0,"beginTime":null,"endTime":null,"isFlag":0,"executeOrder":1,"executeStatus":1,"createdTime":"\/Date(1697003840000)\/"}]
<-------------->
日志时间：2023-10-13 11:39:27,305 [1]
日志级别：INFO
日志内容：根据仓库编号：NDJCK-001；货道编号：ND_001；获取到的执货道明细：[{"objId":1,"spaceCode":"ND_001","materialCode":"202310130001","materialName":"SC232","materialType":"3600000780","materialAmount":1,"storeCode":"NDJCK-001","isFlag":0,"createTime":"\/Date(1697166427000)\/"}]
<-------------->
日志时间：2023-10-13 11:39:37,142 [1]
日志级别：INFO
日志内容：根据仓库编号：NDJCK-001；货道编号：ND_001；获取到的执货道明细：[{"objId":1,"spaceCode":"ND_001","materialCode":"202310130001","materialName":"SC232","materialType":"3600000780","materialAmount":1,"storeCode":"NDJCK-001","isFlag":0,"createTime":"\/Date(1697166427000)\/"}]
<-------------->
日志时间：2023-10-13 11:39:51,532 [1]
日志级别：INFO
日志内容：根据仓库编号：NDJCK-001；货道编号：ND_001；获取到的执货道明细：[{"objId":1,"spaceCode":"ND_001","materialCode":"202310130001","materialName":"SC232","materialType":"3600000780","materialAmount":1,"storeCode":"NDJCK-001","isFlag":0,"createTime":"\/Date(1697166427000)\/"}]
<-------------->
日志时间：2023-10-13 11:39:56,170 [1]
日志级别：INFO
日志内容：根据仓库编号：NDJCK-001；货道编号：ND_001；获取到的执货道明细：[{"objId":1,"spaceCode":"ND_001","materialCode":"202310130001","materialName":"SC232","materialType":"3600000780","materialAmount":1,"storeCode":"NDJCK-001","isFlag":0,"createTime":"\/Date(1697166427000)\/"}]
<-------------->
日志时间：2023-10-13 11:39:58,896 [1]
日志级别：INFO
日志内容：程序退出
<-------------->
日志时间：2023-10-13 11:41:58,512 [1]
日志级别：INFO
日志内容：根据产线工位编号：ZZ-01；获取到的执行计划信息：[{"objId":82,"executePlanCode":"a1e0d29c2b774f25bd0df0f059e24976","productPlanCode":"202310081458","orderCode":"11215483","materialCode":"9002006859","materialName":"SC-439,YZXGWBC元气森林,C","productLineCode":"ZZ-01","planAmount":1,"completeAmount":0,"beginTime":null,"endTime":null,"isFlag":0,"executeOrder":1,"executeStatus":1,"createdTime":"\/Date(1697003840000)\/"}]
<-------------->
日志时间：2023-10-13 11:42:33,832 [1]
日志级别：INFO
日志内容：根据仓库编号：NDJCK-001；货道编号：XK_001；获取到的执货道明细：[]
<-------------->
日志时间：2023-10-13 11:42:36,511 [1]
日志级别：INFO
日志内容：修改仓库：XKJCK-001；货道：XK_002；货道状态：2;修改成功
<-------------->
日志时间：2023-10-13 11:42:38,679 [1]
日志级别：INFO
日志内容：根据仓库编号：NDJCK-001；货道编号：XK_002；获取到的执货道明细：[]
<-------------->
日志时间：2023-10-13 11:43:42,869 [1]
日志级别：INFO
日志内容：根据仓库编号：NDJCK-001；货道编号：XK_001；获取到的执货道明细：[]
<-------------->
日志时间：2023-10-13 11:43:52,963 [1]
日志级别：INFO
日志内容：根据仓库编号：NDJCK-001；货道编号：XK_001；获取到的执货道明细：[]
<-------------->
日志时间：2023-10-13 11:44:52,319 [1]
日志级别：INFO
日志内容：根据仓库编号：NDJCK-001；货道编号：XK_001；获取到的执货道明细：[]
<-------------->
日志时间：2023-10-13 11:45:33,801 [1]
日志级别：INFO
日志内容：根据产线工位编号：ZZ-01；获取到的执行计划信息：[{"objId":82,"executePlanCode":"a1e0d29c2b774f25bd0df0f059e24976","productPlanCode":"202310081458","orderCode":"11215483","materialCode":"9002006859","materialName":"SC-439,YZXGWBC元气森林,C","productLineCode":"ZZ-01","planAmount":1,"completeAmount":0,"beginTime":null,"endTime":null,"isFlag":0,"executeOrder":1,"executeStatus":1,"createdTime":"\/Date(1697003840000)\/"}]
<-------------->
日志时间：2023-10-13 11:45:42,655 [1]
日志级别：INFO
日志内容：根据仓库编号：NDJCK-001；货道编号：XK_001；获取到的执货道明细：[]
<-------------->
日志时间：2023-10-13 11:46:32,150 [1]
日志级别：INFO
日志内容：根据仓库编号：NDJCK-001；货道编号：XK_001；获取到的执货道明细：[]
<-------------->
日志时间：2023-10-13 11:47:25,634 [1]
日志级别：INFO
日志内容：根据产线工位编号：ZZ-01；获取到的执行计划信息：[{"objId":82,"executePlanCode":"a1e0d29c2b774f25bd0df0f059e24976","productPlanCode":"202310081458","orderCode":"11215483","materialCode":"9002006859","materialName":"SC-439,YZXGWBC元气森林,C","productLineCode":"ZZ-01","planAmount":1,"completeAmount":0,"beginTime":null,"endTime":null,"isFlag":0,"executeOrder":1,"executeStatus":1,"createdTime":"\/Date(1697003840000)\/"}]
<-------------->
日志时间：2023-10-13 11:47:32,355 [1]
日志级别：INFO
日志内容：根据仓库编号：XKJCK-001；货道编号：XK_001；获取到的执货道明细：[{"objId":2,"spaceCode":"XK_001","materialCode":"202310130001","materialName":"SC232","materialType":"3504000161","materialAmount":1,"storeCode":"XKJCK-001","isFlag":0,"createTime":"\/Date(1697168597000)\/"},{"objId":3,"spaceCode":"XK_001","materialCode":"202310130001","materialName":"SC232","materialType":"3504000161","materialAmount":1,"storeCode":"XKJCK-001","isFlag":0,"createTime":"\/Date(1697168597000)\/"}]
<-------------->
日志时间：2023-10-13 11:47:35,677 [1]
日志级别：INFO
日志内容：根据仓库编号：NDJCK-001；货道编号：ND_001；获取到的执货道明细：[{"objId":1,"spaceCode":"ND_001","materialCode":"202310130001","materialName":"SC232","materialType":"3600000780","materialAmount":1,"storeCode":"NDJCK-001","isFlag":0,"createTime":"\/Date(1697166427000)\/"}]
<-------------->
日志时间：2023-10-13 11:47:38,874 [1]
日志级别：INFO
日志内容：根据仓库编号：XKJCK-001；货道编号：XK_001；获取到的执货道明细：[{"objId":2,"spaceCode":"XK_001","materialCode":"202310130001","materialName":"SC232","materialType":"3504000161","materialAmount":1,"storeCode":"XKJCK-001","isFlag":0,"createTime":"\/Date(1697168597000)\/"},{"objId":3,"spaceCode":"XK_001","materialCode":"202310130001","materialName":"SC232","materialType":"3504000161","materialAmount":1,"storeCode":"XKJCK-001","isFlag":0,"createTime":"\/Date(1697168597000)\/"}]
<-------------->
日志时间：2023-10-13 11:47:46,323 [1]
日志级别：INFO
日志内容：根据仓库编号：XKJCK-001；货道编号：XK_001；获取到的执货道明细：[{"objId":2,"spaceCode":"XK_001","materialCode":"202310130001","materialName":"SC232","materialType":"3504000161","materialAmount":1,"storeCode":"XKJCK-001","isFlag":0,"createTime":"\/Date(1697168597000)\/"},{"objId":3,"spaceCode":"XK_001","materialCode":"202310130001","materialName":"SC232","materialType":"3504000161","materialAmount":1,"storeCode":"XKJCK-001","isFlag":0,"createTime":"\/Date(1697168597000)\/"}]
<-------------->
日志时间：2023-10-13 11:47:48,963 [1]
日志级别：INFO
日志内容：根据仓库编号：XKJCK-001；货道编号：XK_001；获取到的执货道明细：[{"objId":2,"spaceCode":"XK_001","materialCode":"202310130001","materialName":"SC232","materialType":"3504000161","materialAmount":1,"storeCode":"XKJCK-001","isFlag":0,"createTime":"\/Date(1697168597000)\/"},{"objId":3,"spaceCode":"XK_001","materialCode":"202310130001","materialName":"SC232","materialType":"3504000161","materialAmount":1,"storeCode":"XKJCK-001","isFlag":0,"createTime":"\/Date(1697168597000)\/"}]
<-------------->
日志时间：2023-10-13 11:47:50,398 [1]
日志级别：INFO
日志内容：根据仓库编号：XKJCK-001；货道编号：XK_001；获取到的执货道明细：[{"objId":2,"spaceCode":"XK_001","materialCode":"202310130001","materialName":"SC232","materialType":"3504000161","materialAmount":1,"storeCode":"XKJCK-001","isFlag":0,"createTime":"\/Date(1697168597000)\/"},{"objId":3,"spaceCode":"XK_001","materialCode":"202310130001","materialName":"SC232","materialType":"3504000161","materialAmount":1,"storeCode":"XKJCK-001","isFlag":0,"createTime":"\/Date(1697168597000)\/"}]

394
Aucma.Scada.UI/bin/Debug/Log/2023-10-13/SqlLog.txt
View File

File diff suppressed because one or more lines are too long

BIN
Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.AssemblyReference.cache
View File

Binary file not shown.

2
Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.CoreCompileInputs.cache
Unescape Escape View File

@ -1 +1 @@
8c62282e566233f3d1ec0b8c9430f0155780137f 6a29b8ed4aee2e942140eaca6cfc42242f4667f1

2
Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.FileListAbsolute.txt
Unescape Escape View File

@ -148,3 +148,5 @@ C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\Aucma.Sc
C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\Aucma.Scada.Business.pdb C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\Aucma.Scada.Business.pdb
C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\AssemblyPlan\PlanInfoEditWindow.g.cs C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\AssemblyPlan\PlanInfoEditWindow.g.cs
C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\AssemblyPlan\PlanInfoEditWindow.baml C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\AssemblyPlan\PlanInfoEditWindow.baml
C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\SpaceDetailWindow.g.cs
C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\SpaceDetailWindow.baml

BIN
Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.exe
View File

Binary file not shown.

BIN
Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.g.resources
View File

Binary file not shown.

BIN
Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.pdb
View File

Binary file not shown.

6
Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.cache
Unescape Escape View File

@ -10,11 +10,11 @@ none
false false
DEBUG;TRACE DEBUG;TRACE
C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\App.xaml C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\App.xaml
13-444325909 14-991814903
321021156326 341590398857
1341517938856 1341517938856
Page\AssemblyPlan\AssemblyPlanControl.xaml;Page\AssemblyPlan\PlanInfoEditWindow.xaml;Page\InStoreInfo\InStoreInfoControl.xaml;LogInfoControl.xaml;MainWindow.xaml;Page\InventoryInfo\InventoryInfoControl.xaml;Page\InventoryInfo\LinerInventory.xaml;Page\InventoryInfo\ShellInventory.xaml;Page\InventoryInfo\SpaceInfoControl.xaml;Page\OutStoreInfo\OutStoreInfoControl.xaml;Page\TaskInfo\TaskInfoControl.xaml;RecordControl.xaml;templates\style\resourceStyle.xaml; Page\AssemblyPlan\AssemblyPlanControl.xaml;Page\AssemblyPlan\PlanInfoEditWindow.xaml;Page\InStoreInfo\InStoreInfoControl.xaml;LogInfoControl.xaml;MainWindow.xaml;Page\InventoryInfo\InventoryInfoControl.xaml;Page\InventoryInfo\LinerInventory.xaml;Page\InventoryInfo\ShellInventory.xaml;Page\InventoryInfo\SpaceDetailWindow.xaml;Page\InventoryInfo\SpaceInfoControl.xaml;Page\OutStoreInfo\OutStoreInfoControl.xaml;Page\TaskInfo\TaskInfoControl.xaml;RecordControl.xaml;templates\style\resourceStyle.xaml;
False False

8
Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.i.cache
Unescape Escape View File

@ -10,11 +10,11 @@ none
false false
DEBUG;TRACE DEBUG;TRACE
C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\App.xaml C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\App.xaml
13-444325909 14-991814903
33266586542 35835829073
1341517938856 1341517938856
Page\AssemblyPlan\AssemblyPlanControl.xaml;Page\AssemblyPlan\PlanInfoEditWindow.xaml;Page\InStoreInfo\InStoreInfoControl.xaml;LogInfoControl.xaml;MainWindow.xaml;Page\InventoryInfo\InventoryInfoControl.xaml;Page\InventoryInfo\LinerInventory.xaml;Page\InventoryInfo\ShellInventory.xaml;Page\InventoryInfo\SpaceInfoControl.xaml;Page\OutStoreInfo\OutStoreInfoControl.xaml;Page\TaskInfo\TaskInfoControl.xaml;RecordControl.xaml;templates\style\resourceStyle.xaml; Page\AssemblyPlan\AssemblyPlanControl.xaml;Page\AssemblyPlan\PlanInfoEditWindow.xaml;Page\InStoreInfo\InStoreInfoControl.xaml;LogInfoControl.xaml;MainWindow.xaml;Page\InventoryInfo\InventoryInfoControl.xaml;Page\InventoryInfo\LinerInventory.xaml;Page\InventoryInfo\ShellInventory.xaml;Page\InventoryInfo\SpaceDetailWindow.xaml;Page\InventoryInfo\SpaceInfoControl.xaml;Page\OutStoreInfo\OutStoreInfoControl.xaml;Page\TaskInfo\TaskInfoControl.xaml;RecordControl.xaml;templates\style\resourceStyle.xaml;
False True

17
Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.i.lref
Unescape Escape View File

@ -0,0 +1,17 @@
C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\GeneratedInternalTypeHelper.g.i.cs
FC:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\App.xaml;;
FC:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\Page\AssemblyPlan\AssemblyPlanControl.xaml;;
FC:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\Page\AssemblyPlan\PlanInfoEditWindow.xaml;;
FC:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\Page\InStoreInfo\InStoreInfoControl.xaml;;
FC:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\LogInfoControl.xaml;;
FC:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\MainWindow.xaml;;
FC:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\InventoryInfoControl.xaml;;
FC:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\LinerInventory.xaml;;
FC:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\ShellInventory.xaml;;
FC:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\SpaceDetailWindow.xaml;;
FC:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\SpaceInfoControl.xaml;;
FC:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\Page\OutStoreInfo\OutStoreInfoControl.xaml;;
FC:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\Page\TaskInfo\TaskInfoControl.xaml;;
FC:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\RecordControl.xaml;;
FC:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\templates\style\resourceStyle.xaml;;

1
Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.lref
Unescape Escape View File

@ -8,6 +8,7 @@ FC:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\MainWindow.xaml;;
FC:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\InventoryInfoControl.xaml;; FC:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\InventoryInfoControl.xaml;;
FC:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\LinerInventory.xaml;; FC:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\LinerInventory.xaml;;
FC:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\ShellInventory.xaml;; FC:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\ShellInventory.xaml;;
FC:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\SpaceDetailWindow.xaml;;
FC:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\SpaceInfoControl.xaml;; FC:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\SpaceInfoControl.xaml;;
FC:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\Page\OutStoreInfo\OutStoreInfoControl.xaml;; FC:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\Page\OutStoreInfo\OutStoreInfoControl.xaml;;
FC:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\Page\TaskInfo\TaskInfoControl.xaml;; FC:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\Page\TaskInfo\TaskInfoControl.xaml;;

BIN
Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/LinerInventory.baml
View File

Binary file not shown.

2
Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/LinerInventory.g.cs
Unescape Escape View File

@ -1,4 +1,4 @@
#pragma checksum "..\..\..\..\Page\InventoryInfo\LinerInventory.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "39655C7FD22A46A8DFBF58FA533851CE3776BF2EAD8FC7576CCBA05D72C28434" #pragma checksum "..\..\..\..\Page\InventoryInfo\LinerInventory.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "9304FC8172CB52D504E9617BDBABDBDAD65770A58C85BA08E7AD74C367EB3268"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// This code was generated by a tool. // This code was generated by a tool.

2
Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/LinerInventory.g.i.cs
Unescape Escape View File

@ -1,4 +1,4 @@
#pragma checksum "..\..\..\..\Page\InventoryInfo\LinerInventory.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "39655C7FD22A46A8DFBF58FA533851CE3776BF2EAD8FC7576CCBA05D72C28434" #pragma checksum "..\..\..\..\Page\InventoryInfo\LinerInventory.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "9304FC8172CB52D504E9617BDBABDBDAD65770A58C85BA08E7AD74C367EB3268"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// This code was generated by a tool. // This code was generated by a tool.

BIN
Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/ShellInventory.baml
View File

Binary file not shown.

2
Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/ShellInventory.g.cs
Unescape Escape View File

@ -1,4 +1,4 @@
#pragma checksum "..\..\..\..\Page\InventoryInfo\ShellInventory.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "83131235919B5B9790102FB8D6757CE14995A030A6FA40D2A4B146AE60A808B8" #pragma checksum "..\..\..\..\Page\InventoryInfo\ShellInventory.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "05067D3A2D27ED28509706FACEABCFB7007D8C6D3AF240FDBE1969C7821EC8B2"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// This code was generated by a tool. // This code was generated by a tool.

2
Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/ShellInventory.g.i.cs
Unescape Escape View File

@ -1,4 +1,4 @@
#pragma checksum "..\..\..\..\Page\InventoryInfo\ShellInventory.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "83131235919B5B9790102FB8D6757CE14995A030A6FA40D2A4B146AE60A808B8" #pragma checksum "..\..\..\..\Page\InventoryInfo\ShellInventory.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "05067D3A2D27ED28509706FACEABCFB7007D8C6D3AF240FDBE1969C7821EC8B2"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// This code was generated by a tool. // This code was generated by a tool.

75
Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/SpaceDetailControl.g.i.cs
Unescape Escape View File

@ -0,0 +1,75 @@
#pragma checksum "..\..\..\..\Page\InventoryInfo\SpaceDetailControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "C8EDA0C5970FB6737A73D301A67AE3E2E28FC2D8C84C131935A11684FC985547"
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
using Aucma.Scada.UI.Page.InventoryInfo;
using System;
using System.Diagnostics;
using System.Windows;
using System.Windows.Automation;
using System.Windows.Controls;
using System.Windows.Controls.Primitives;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Ink;
using System.Windows.Input;
using System.Windows.Markup;
using System.Windows.Media;
using System.Windows.Media.Animation;
using System.Windows.Media.Effects;
using System.Windows.Media.Imaging;
using System.Windows.Media.Media3D;
using System.Windows.Media.TextFormatting;
using System.Windows.Navigation;
using System.Windows.Shapes;
using System.Windows.Shell;
namespace Aucma.Scada.UI.Page.InventoryInfo {
/// <summary>
/// SpaceDetailControl
/// </summary>
public partial class SpaceDetailControl : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
private bool _contentLoaded;
/// <summary>
/// InitializeComponent
/// </summary>
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
public void InitializeComponent() {
if (_contentLoaded) {
return;
}
_contentLoaded = true;
System.Uri resourceLocater = new System.Uri("/Aucma.Scada.UI;component/page/inventoryinfo/spacedetailcontrol.xaml", System.UriKind.Relative);
#line 1 "..\..\..\..\Page\InventoryInfo\SpaceDetailControl.xaml"
System.Windows.Application.LoadComponent(this, resourceLocater);
#line default
#line hidden
}
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
this._contentLoaded = true;
}
}
}

BIN
Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/SpaceDetailWindow.baml
View File

Binary file not shown.

100
Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/SpaceDetailWindow.g.cs
Unescape Escape View File

@ -0,0 +1,100 @@
#pragma checksum "..\..\..\..\Page\InventoryInfo\SpaceDetailWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "4D9ED6B85D9AED019513FD7ED55B2B09E5774A2891B1F28DF6AA7A43EAA53529"
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
using Aucma.Scada.UI.Page.InventoryInfo;
using System;
using System.Diagnostics;
using System.Windows;
using System.Windows.Automation;
using System.Windows.Controls;
using System.Windows.Controls.Primitives;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Ink;
using System.Windows.Input;
using System.Windows.Markup;
using System.Windows.Media;
using System.Windows.Media.Animation;
using System.Windows.Media.Effects;
using System.Windows.Media.Imaging;
using System.Windows.Media.Media3D;
using System.Windows.Media.TextFormatting;
using System.Windows.Navigation;
using System.Windows.Shapes;
using System.Windows.Shell;
namespace Aucma.Scada.UI.Page.InventoryInfo {
/// <summary>
/// SpaceDetailWindow
/// </summary>
public partial class SpaceDetailWindow : System.Windows.Window, System.Windows.Markup.IComponentConnector {
#line 8 "..\..\..\..\Page\InventoryInfo\SpaceDetailWindow.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal Aucma.Scada.UI.Page.InventoryInfo.SpaceDetailWindow window;
#line default
#line hidden
#line 34 "..\..\..\..\Page\InventoryInfo\SpaceDetailWindow.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.DataGrid dataGrid;
#line default
#line hidden
private bool _contentLoaded;
/// <summary>
/// InitializeComponent
/// </summary>
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
public void InitializeComponent() {
if (_contentLoaded) {
return;
}
_contentLoaded = true;
System.Uri resourceLocater = new System.Uri("/Aucma.Scada.UI;component/page/inventoryinfo/spacedetailwindow.xaml", System.UriKind.Relative);
#line 1 "..\..\..\..\Page\InventoryInfo\SpaceDetailWindow.xaml"
System.Windows.Application.LoadComponent(this, resourceLocater);
#line default
#line hidden
}
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
switch (connectionId)
{
case 1:
this.window = ((Aucma.Scada.UI.Page.InventoryInfo.SpaceDetailWindow)(target));
return;
case 2:
this.dataGrid = ((System.Windows.Controls.DataGrid)(target));
return;
}
this._contentLoaded = true;
}
}
}

100
Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/SpaceDetailWindow.g.i.cs
Unescape Escape View File

@ -0,0 +1,100 @@
#pragma checksum "..\..\..\..\Page\InventoryInfo\SpaceDetailWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "4D9ED6B85D9AED019513FD7ED55B2B09E5774A2891B1F28DF6AA7A43EAA53529"
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
using Aucma.Scada.UI.Page.InventoryInfo;
using System;
using System.Diagnostics;
using System.Windows;
using System.Windows.Automation;
using System.Windows.Controls;
using System.Windows.Controls.Primitives;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Ink;
using System.Windows.Input;
using System.Windows.Markup;
using System.Windows.Media;
using System.Windows.Media.Animation;
using System.Windows.Media.Effects;
using System.Windows.Media.Imaging;
using System.Windows.Media.Media3D;
using System.Windows.Media.TextFormatting;
using System.Windows.Navigation;
using System.Windows.Shapes;
using System.Windows.Shell;
namespace Aucma.Scada.UI.Page.InventoryInfo {
/// <summary>
/// SpaceDetailWindow
/// </summary>
public partial class SpaceDetailWindow : System.Windows.Window, System.Windows.Markup.IComponentConnector {
#line 8 "..\..\..\..\Page\InventoryInfo\SpaceDetailWindow.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal Aucma.Scada.UI.Page.InventoryInfo.SpaceDetailWindow window;
#line default
#line hidden
#line 34 "..\..\..\..\Page\InventoryInfo\SpaceDetailWindow.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.DataGrid dataGrid;
#line default
#line hidden
private bool _contentLoaded;
/// <summary>
/// InitializeComponent
/// </summary>
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
public void InitializeComponent() {
if (_contentLoaded) {
return;
}
_contentLoaded = true;
System.Uri resourceLocater = new System.Uri("/Aucma.Scada.UI;component/page/inventoryinfo/spacedetailwindow.xaml", System.UriKind.Relative);
#line 1 "..\..\..\..\Page\InventoryInfo\SpaceDetailWindow.xaml"
System.Windows.Application.LoadComponent(this, resourceLocater);
#line default
#line hidden
}
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
switch (connectionId)
{
case 1:
this.window = ((Aucma.Scada.UI.Page.InventoryInfo.SpaceDetailWindow)(target));
return;
case 2:
this.dataGrid = ((System.Windows.Controls.DataGrid)(target));
return;
}
this._contentLoaded = true;
}
}
}

8
Aucma.Scada.UI/viewModel/AssemblyPlan/PlanInfoEditViewModel.cs
Unescape Escape View File

@ -18,9 +18,6 @@ namespace Aucma.Scada.UI.viewModel.AssemblyPlan
{ {
public class PlanInfoEditViewModel : ViewModelBase public class PlanInfoEditViewModel : ViewModelBase
{ {
private ISysUserInfoService sysUserInfoService = new SysUserInfoServiceImpl();
private AssemblyPlanBusiness assemblyPlanBusiness = AssemblyPlanBusiness.Instance; private AssemblyPlanBusiness assemblyPlanBusiness = AssemblyPlanBusiness.Instance;
public PlanInfoEditViewModel() public PlanInfoEditViewModel()
@ -72,9 +69,7 @@ namespace Aucma.Scada.UI.viewModel.AssemblyPlan
RaisePropertyChanged(nameof(SelectedDataItem)); RaisePropertyChanged(nameof(SelectedDataItem));
} }
} }
#endregion
#region 事件定义
/// <summary> /// <summary>
/// 计划列表DataGrid /// 计划列表DataGrid
/// </summary> /// </summary>
@ -86,6 +81,9 @@ namespace Aucma.Scada.UI.viewModel.AssemblyPlan
set { planInfoDataGrid = value; RaisePropertyChanged(() => PlanInfoDataGrid); } set { planInfoDataGrid = value; RaisePropertyChanged(() => PlanInfoDataGrid); }
} }
#endregion
#region 事件定义
/// <summary> /// <summary>
/// 生产计划下达 /// 生产计划下达

13
Aucma.Scada.UI/viewModel/InventoryInfo/LinerInventoryViewModel.cs
Unescape Escape View File

@ -33,6 +33,8 @@ namespace Aucma.Scada.UI.viewModel.InventoryInfo
UpdateSpaceStatusCommand = new RelayCommand<object>(obj => UpdateSpaceStatus(obj)); UpdateSpaceStatusCommand = new RelayCommand<object>(obj => UpdateSpaceStatus(obj));
SpaceDetailCommand = new RelayCommand<object>(obj => SpaceDetail(obj));
Query(); Query();
} }
@ -54,6 +56,8 @@ namespace Aucma.Scada.UI.viewModel.InventoryInfo
public RelayCommand<object> UpdateUnusualFlagCommand { get; set; } public RelayCommand<object> UpdateUnusualFlagCommand { get; set; }
public RelayCommand<object> UpdateSpaceStatusCommand { get; set; } public RelayCommand<object> UpdateSpaceStatusCommand { get; set; }
public RelayCommand<object> SpaceDetailCommand { get; set; }
#endregion #endregion
private void update(object obj) private void update(object obj)
@ -155,6 +159,15 @@ namespace Aucma.Scada.UI.viewModel.InventoryInfo
MessageBox.Show("货道状态修改失败"); MessageBox.Show("货道状态修改失败");
} }
} }
private void SpaceDetail(object obj)
{
string info = obj as string;
SpaceDetailWindow spaceDetailWindow = new SpaceDetailWindow(appConfig.linerStoreCode,info);
spaceDetailWindow.Show();
inventoryInfoBusiness.RefreshBaseSpaceDetails(appConfig.linerStoreCode, info);
}
} }
} }

13
Aucma.Scada.UI/viewModel/InventoryInfo/ShellInventoryViewModel.cs
Unescape Escape View File

@ -1,4 +1,5 @@
using Aucma.Scada.Business; using Aucma.Scada.Business;
using Aucma.Scada.UI.Page.InventoryInfo;
using GalaSoft.MvvmLight; using GalaSoft.MvvmLight;
using GalaSoft.MvvmLight.Command; using GalaSoft.MvvmLight.Command;
using HighWayIot.Config; using HighWayIot.Config;
@ -29,6 +30,7 @@ namespace Aucma.Scada.UI.viewModel.InventoryInfo
UpdateSpaceStatusCommand = new RelayCommand<object>(obj => UpdateSpaceStatus(obj)); UpdateSpaceStatusCommand = new RelayCommand<object>(obj => UpdateSpaceStatus(obj));
SpaceDetailCommand = new RelayCommand<object>(obj => SpaceDetail(obj));
Query(); Query();
} }
@ -52,6 +54,8 @@ namespace Aucma.Scada.UI.viewModel.InventoryInfo
public RelayCommand<object> UpdateSpaceStatusCommand { get; set; } public RelayCommand<object> UpdateSpaceStatusCommand { get; set; }
public RelayCommand<object> SpaceDetailCommand { get; set; }
#endregion #endregion
private void Query() private void Query()
@ -147,6 +151,15 @@ namespace Aucma.Scada.UI.viewModel.InventoryInfo
MessageBox.Show("货道状态修改失败"); MessageBox.Show("货道状态修改失败");
} }
} }
private void SpaceDetail(object obj)
{
string info = obj as string;
SpaceDetailWindow spaceDetailWindow = new SpaceDetailWindow(appConfig.shellStoreCode, info);
spaceDetailWindow.Show();
inventoryInfoBusiness.RefreshBaseSpaceDetails(appConfig.shellStoreCode, info);
}
} }

156
Aucma.Scada.UI/viewModel/InventoryInfo/SpaceDetailViewModel.cs
Unescape Escape View File

@ -0,0 +1,156 @@
using Aucma.Scada.Business;
using GalaSoft.MvvmLight;
using GalaSoft.MvvmLight.Command;
using HighWayIot.Repository.domain;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
namespace Aucma.Scada.UI.viewModel.InventoryInfo
{
public class SpaceDetailViewModel : ViewModelBase
{
private InventoryInfoBusiness inventoryInfoBusiness = InventoryInfoBusiness.Instance;
private string storeCode = string.Empty;
private string spaceCode = string.Empty;
public SpaceDetailViewModel(string storeCode, string spaceCode)
{
CloseWindowCommand = new RelayCommand<object>(t => CloseWindow(t));
QueryCommand = new RelayCommand(Query);
ResetCommand = new RelayCommand(Reset);
inventoryInfoBusiness.RefreshSpaceDetailsEvent += RefreshSpaceDetails;
this.storeCode = storeCode;
this.spaceCode = spaceCode;
TitleName = "货道明细信息";
}
#region 参数定义
/// <summary>
/// 物料编号
/// </summary>
private string materialCodeSearch;
public string MaterialCodeSearch
{
get { return materialCodeSearch; }
set
{
materialCodeSearch = value;
RaisePropertyChanged(nameof(MaterialCodeSearch));
}
}
/// <summary>
/// 物料名称
/// </summary>
private string materialNameSearch;
public string MaterialNameSearch
{
get { return materialNameSearch; }
set
{
materialNameSearch = value;
RaisePropertyChanged(nameof(MaterialNameSearch));
}
}
private string titleName;
public string TitleName
{
get { return titleName; }
set
{
titleName = value;
RaisePropertyChanged(nameof(TitleName));
}
}
/// <summary>
/// 计划列表DataGrid
/// </summary>
private ObservableCollection<BaseSpaceDetail> spaceDetailDataGrid;
public ObservableCollection<BaseSpaceDetail> SpaceDetailDataGrid
{
get { return spaceDetailDataGrid; }
set { spaceDetailDataGrid = value; RaisePropertyChanged(() => SpaceDetailDataGrid); }
}
#endregion
#region 事件定义
/// <summary>
/// 关闭事件
/// </summary>
public RelayCommand<object> CloseWindowCommand { get; set; }
/// <summary>
/// 查询事件
/// </summary>
public RelayCommand QueryCommand { get; set; }
/// <summary>
/// 重置事件
/// </summary>
public RelayCommand ResetCommand { get; set; }
#endregion
private void CloseWindow(object parameter)
{
var window = parameter as Window;
if (window != null)
{
window.Close();
}
}
/// <summary>
/// 查询
/// </summary>
private void Query()
{
var list = inventoryInfoBusiness.GetBaseSpaceDetails(this.storeCode, this.spaceCode);
if (!string.IsNullOrEmpty(materialCodeSearch))
{
list = list.Where(x => x.materialCode == materialCodeSearch).ToList();
}
else if (!string.IsNullOrEmpty(materialNameSearch))
{
list = list.Where(x => x.materialName == materialNameSearch).ToList();
}
RefreshSpaceDetails(list);
}
public void Reset()
{
MaterialCodeSearch = string.Empty;
MaterialNameSearch = string.Empty;
this.Query();
}
/// <summary>
/// 刷新货道明细列表
/// </summary>
/// <param name="spaceDetails"></param>
private void RefreshSpaceDetails(List<BaseSpaceDetail> spaceDetails)
{
SpaceDetailDataGrid = new ObservableCollection<BaseSpaceDetail>();
if (spaceDetails != null)
{
spaceDetails.ForEach(
arg =>
{
SpaceDetailDataGrid.Add(arg);
});
}
}
}
}

BIN
HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.AssemblyReference.cache
View File

Binary file not shown.

BIN
HighWayIot.Config/obj/Debug/HighWayIot.Config.csproj.AssemblyReference.cache
View File

Binary file not shown.

BIN
HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.csproj.AssemblyReference.cache
View File

Binary file not shown.

1
HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.csproj.FileListAbsolute.txt
Unescape Escape View File

@ -27,4 +27,3 @@ C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Log4net\obj\Debug\High
C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Log4net\obj\Debug\HighWayIot.Log4net.csproj.CopyComplete C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Log4net\obj\Debug\HighWayIot.Log4net.csproj.CopyComplete
C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Log4net\obj\Debug\HighWayIot.Log4net.dll C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Log4net\obj\Debug\HighWayIot.Log4net.dll
C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Log4net\obj\Debug\HighWayIot.Log4net.pdb C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Log4net\obj\Debug\HighWayIot.Log4net.pdb
C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Log4net\obj\Debug\HighWayIot.Log4net.csproj.AssemblyReference.cache

BIN
HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.csproj.AssemblyReference.cache
View File

Binary file not shown.

1
HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.csproj.FileListAbsolute.txt
Unescape Escape View File

@ -33,4 +33,3 @@ C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Mqtt\obj\Debug\HighWay
C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Mqtt\obj\Debug\HighWayIot.Mqtt.csproj.CopyComplete C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Mqtt\obj\Debug\HighWayIot.Mqtt.csproj.CopyComplete
C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Mqtt\obj\Debug\HighWayIot.Mqtt.dll C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Mqtt\obj\Debug\HighWayIot.Mqtt.dll
C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Mqtt\obj\Debug\HighWayIot.Mqtt.pdb C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Mqtt\obj\Debug\HighWayIot.Mqtt.pdb
C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Mqtt\obj\Debug\HighWayIot.Mqtt.csproj.AssemblyReference.cache

BIN
HighWayIot.Plc/obj/Debug/HighWayIot.Plc.csproj.AssemblyReference.cache
View File

Binary file not shown.

3
HighWayIot.Repository/HighWayIot.Repository.csproj
Unescape Escape View File

@ -61,6 +61,7 @@
<ItemGroup> <ItemGroup>
<Compile Include="domain\BaseBomInfo.cs" /> <Compile Include="domain\BaseBomInfo.cs" />
<Compile Include="domain\BaseSpaceInfo.cs" /> <Compile Include="domain\BaseSpaceInfo.cs" />
<Compile Include="domain\BaseSpaceDetail.cs" />
<Compile Include="domain\ExecutePlanInfo.cs" /> <Compile Include="domain\ExecutePlanInfo.cs" />
<Compile Include="domain\ProductPlanInfo.cs" /> <Compile Include="domain\ProductPlanInfo.cs" />
<Compile Include="domain\RealTaskInfo.cs" /> <Compile Include="domain\RealTaskInfo.cs" />
@ -69,9 +70,11 @@
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Repository.cs" /> <Compile Include="Repository.cs" />
<Compile Include="service\IBaseBomInfoService.cs" /> <Compile Include="service\IBaseBomInfoService.cs" />
<Compile Include="service\IBaseSpaceDetailService.cs" />
<Compile Include="service\IBaseSpaceInfoService.cs" /> <Compile Include="service\IBaseSpaceInfoService.cs" />
<Compile Include="service\IExecutePlanInfoService.cs" /> <Compile Include="service\IExecutePlanInfoService.cs" />
<Compile Include="service\Impl\BaseBomInfoServiceImpl.cs" /> <Compile Include="service\Impl\BaseBomInfoServiceImpl.cs" />
<Compile Include="service\Impl\BaseSpaceDetailServiceImpl.cs" />
<Compile Include="service\Impl\BaseSpaceInfoServiceImpl.cs" /> <Compile Include="service\Impl\BaseSpaceInfoServiceImpl.cs" />
<Compile Include="service\Impl\ExecutePlanInfoServiceImpl.cs" /> <Compile Include="service\Impl\ExecutePlanInfoServiceImpl.cs" />
<Compile Include="service\Impl\ProductPlanInfoServiceImpl.cs" /> <Compile Include="service\Impl\ProductPlanInfoServiceImpl.cs" />

BIN
HighWayIot.Repository/bin/Debug/HighWayIot.Repository.dll
View File

Binary file not shown.

BIN
HighWayIot.Repository/bin/Debug/HighWayIot.Repository.pdb
View File

Binary file not shown.

70
HighWayIot.Repository/domain/BaseSpaceDetail.cs
Unescape Escape View File

@ -0,0 +1,70 @@
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace HighWayIot.Repository.domain
{
/// <summary>
/// 货道明细
/// </summary>
[SugarTable("BASE_SPACEDETAIL")]
public class BaseSpaceDetail
{
/// <summary>
/// 主键标识
///</summary>
[SugarColumn(ColumnName = "OBJ_ID", IsPrimaryKey = true, IsIdentity = true, OracleSequenceName = "SEQ_BASE_SPACEDETAIL")]
public int objId { get; set; }
/// <summary>
/// 货道编号
/// </summary>
[SugarColumn(ColumnName = "SPACE_CODE")]
public string spaceCode { get; set; }
/// <summary>
/// 物料编号
/// </summary>
[SugarColumn(ColumnName = "MATERIAL_CODE")]
public string materialCode { get; set; }
/// <summary>
/// 物料名称
/// </summary>
[SugarColumn(ColumnName = "MATERIAL_NAME")]
public string materialName { get; set; }
/// <summary>
/// 物料类型
/// </summary>
[SugarColumn(ColumnName = "MATERIAL_TYPE")]
public string materialType { get; set; }
/// <summary>
/// 物料数量
/// </summary>
[SugarColumn(ColumnName = "MATERIAL_AMOUNT")]
public int materialAmount { get; set; }
/// <summary>
/// 所属仓库
/// </summary>
[SugarColumn(ColumnName = "STORE_CODE")]
public string storeCode { get; set; }
/// <summary>
/// 是否标识
/// </summary>
[SugarColumn(ColumnName = "IS_FLAG")]
public int isFlag { get; set; }
/// <summary>
/// 创建时间
/// </summary>
[SugarColumn(ColumnName = "CREATED_TIME")]
public DateTime? createTime { get; set; }
}
}

BIN
HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache
View File

Binary file not shown.

2
HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.CoreCompileInputs.cache
Unescape Escape View File

@ -1 +1 @@
f67e7ac2fcc2dfb86e23aca5b504230bc515ed15 02e3c82efe2a32533ea9a95f089edf7f992976b1

BIN
HighWayIot.Repository/obj/Debug/HighWayIot.Repository.dll
View File

Binary file not shown.

BIN
HighWayIot.Repository/obj/Debug/HighWayIot.Repository.pdb
View File

Binary file not shown.

50
HighWayIot.Repository/service/IBaseSpaceDetailService.cs
Unescape Escape View File

@ -0,0 +1,50 @@
using HighWayIot.Repository.domain;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace HighWayIot.Repository.service
{
public interface IBaseSpaceDetailService
{
/// <summary>
/// 通过货道号获取货道明细
/// </summary>
/// <param name="storeCode"></param>
/// <param name="spaceCode"></param>
/// <returns></returns>
List<BaseSpaceDetail> GetSpaceDetailsBySpaceCode(string storeCode, string spaceCode);
/// <summary>
/// 通过物料编号获取货道明细
/// </summary>
/// <param name="materialCode"></param>
/// <returns></returns>
BaseSpaceDetail GetSpaceDetailByMaterialCode(string materialCode);
/// <summary>
/// 添加货道明细
/// </summary>
/// <param name="spaceDetail"></param>
/// <returns></returns>
bool InsertSpaceDetail(BaseSpaceDetail spaceDetail);
/// <summary>
/// 修改货道明细
/// </summary>
/// <param name="spaceDetail"></param>
/// <returns></returns>
bool UpdateSpaceDetail(BaseSpaceDetail spaceDetail);
/// <summary>
/// 根据物料编号删除货道明细
/// </summary>
/// <param name="materialCode"></param>
/// <returns></returns>
bool DeleteSpaceDetailByMaterialCode(string materialCode);
}
}

130
HighWayIot.Repository/service/Impl/BaseSpaceDetailServiceImpl.cs
Unescape Escape View File

@ -0,0 +1,130 @@
using HighWayIot.Common;
using HighWayIot.Log4net;
using HighWayIot.Repository.domain;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Linq.Expressions;
using System.Text;
using System.Threading.Tasks;
namespace HighWayIot.Repository.service.Impl
{
public class BaseSpaceDetailServiceImpl : IBaseSpaceDetailService
{
private Repository<BaseSpaceDetail> _mesRepository = new Repository<BaseSpaceDetail>("mes");
private LogHelper logHelper = LogHelper.Instance;
private JsonChange jsonChange = JsonChange.Instance;
/// <summary>
/// 根据物料编号删除货道明细
/// </summary>
/// <param name="materialCode"></param>
/// <returns></returns>
public bool DeleteSpaceDetailByMaterialCode(string materialCode)
{
bool result = false;
try
{
BaseSpaceDetail spaceDetail = this.GetSpaceDetailByMaterialCode(materialCode);
result = _mesRepository.Delete(spaceDetail);
}
catch (Exception ex)
{
logHelper.Error("根据物料编号删除货道明细异常", ex);
}
return result;
}
/// <summary>
/// 通过物料编号获取货道明细
/// </summary>
/// <param name="materialCode"></param>
/// <returns></returns>
public BaseSpaceDetail GetSpaceDetailByMaterialCode(string materialCode)
{
BaseSpaceDetail spaceDetail = null;
try
{
Expression<Func<BaseSpaceDetail, bool>> exp = s1 => true;
exp = exp.And(x => x.materialCode == materialCode);
spaceDetail = _mesRepository.GetFirst(exp);
logHelper.Info($"根据物料编号{materialCode}；获取到的货道明细信息：{jsonChange.ModeToJson(spaceDetail)}");
}
catch (Exception ex)
{
logHelper.Error("通过物料编号获取货道明细", ex);
}
return spaceDetail;
}
/// <summary>
/// 通过货道号获取货道明细
/// </summary>
/// <param name="storeCode"></param>
/// <param name="spaceCode"></param>
/// <returns></returns>
public List<BaseSpaceDetail> GetSpaceDetailsBySpaceCode(string storeCode, string spaceCode)
{
List<BaseSpaceDetail> spaceDetails = null;
try
{
Expression<Func<BaseSpaceDetail, bool>> exp = s1 => true;
exp = exp.And(x => x.storeCode == storeCode && x.spaceCode == spaceCode);
spaceDetails = _mesRepository.GetList(exp);
logHelper.Info($"根据仓库编号：{storeCode}；货道编号：{spaceCode}；获取到的执货道明细：{jsonChange.ModeToJson(spaceDetails)}");
}
catch (Exception ex)
{
logHelper.Error("通过货道号获取货道明细异常", ex);
}
return spaceDetails;
}
/// <summary>
/// 添加货道明细
/// </summary>
/// <param name="spaceDetail"></param>
/// <returns></returns>
public bool InsertSpaceDetail(BaseSpaceDetail spaceDetail)
{
bool result = false;
try
{
result = _mesRepository.Insert(spaceDetail);
}
catch (Exception ex)
{
logHelper.Error("添加货道明细异常", ex);
}
return result;
}
/// <summary>
/// 更新货道明细
/// </summary>
/// <param name="spaceDetail"></param>
/// <returns></returns>
public bool UpdateSpaceDetail(BaseSpaceDetail spaceDetail)
{
bool result = false;
try
{
result = _mesRepository.Update(spaceDetail);
}
catch (Exception ex)
{
logHelper.Error("更新货道明细异常", ex);
}
return result;
}
}
}

BIN
HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.csproj.AssemblyReference.cache
View File

Binary file not shown.

BIN
HighWayIot/bin/Debug/HighWayIot.Repository.dll
View File

Binary file not shown.

BIN
HighWayIot/bin/Debug/HighWayIot.Repository.pdb
View File

Binary file not shown.

BIN
HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache
View File

Binary file not shown.
Write Preview
Loading…
Cancel
Save