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

change -调整页面

Browse Source
collectionStore
liuwf 1 year ago
parent 1d9e8c540e
commit 3cf05e4d25
4 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File

2
Aucma.Scada.Business/AssemblyPlanBusiness.cs
Unescape Escape View File

@ -155,7 +155,7 @@ namespace Aucma.Scada.Business
List<BaseSpaceDetail> spaceDetails = _spaceDetailService.GetSpaceDetailsByMaterialType(storeCode, materialType); List<BaseSpaceDetail> spaceDetails = _spaceDetailService.GetSpaceDetailsByMaterialType(storeCode, materialType);
if (spaceDetails.Count > transmitAmount) if (spaceDetails.Count >= transmitAmount)
{ {
result = true; result = true;
} }

22
Aucma.Scada.UI/Page/AssemblyPlan/AssemblyPlanControl.xaml
Unescape Escape View File

@ -286,24 +286,22 @@
<RowDefinition Height="1.3*"/> <RowDefinition Height="1.3*"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<DataGrid Grid.Row="0" ItemsSource="{Binding PlanInfoDataGrid}" Background="Transparent" <DataGrid x:Name="grid" Grid.Row="0" ItemsSource="{Binding PlanInfoDataGrid}" Background="#00000000"
FontSize="20" ColumnHeaderHeight="35" ColumnHeaderHeight="35"
RowHeight="31" AutoGenerateColumns="False" RowHeaderWidth="0" RowHeight="50" AutoGenerateColumns="False" RowHeaderWidth="0"
GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden" GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden"
ScrollViewer.VerticalScrollBarVisibility="Hidden" BorderThickness="0" CanUserAddRows="False" ScrollViewer.VerticalScrollBarVisibility="Hidden" BorderThickness="0" CanUserAddRows="False" SelectionMode="Single" IsReadOnly="True"
Foreground="#FFFFFF" > Foreground="White" >
<!--resourceStyle 399行修改选中字体颜色--> <!--resourceStyle 399行修改选中字体颜色-->
<DataGrid.Columns> <DataGrid.Columns>
<DataGridTextColumn Binding="{Binding executePlanCode}" Header="计划编号" Width="1*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/> <DataGridTextColumn Binding="{Binding executePlanCode}" Header="计划编号" Width="*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" Visibility="Hidden"/>
<!--<DataGridTextColumn Binding="{Binding productPlanCode}" Header="生产计划" Width="1*" IsReadOnly="True"/>--> <DataGridTextColumn Binding="{Binding materialName}" Header="产品型号" Width="3*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding materialName}" Header="产品型号" Width="1*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding planAmount}" Header="计划数量" Width="1*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/> <DataGridTextColumn Binding="{Binding planAmount}" Header="计划数量" Width="1*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding completeAmount}" Header="完成数量" Width="1*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/> <DataGridTextColumn Binding="{Binding completeAmount}" Header="完成数量" Width="1*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding beginTime ,StringFormat=\{0:MM月dd日 HH:mm\}}" Header="开始时间" Width="1*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/> <DataGridTextColumn Binding="{Binding beginTime ,StringFormat=\{0:MM月dd日 HH:mm\}}" Header="开始时间" Width="2*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding executeStatus,Converter={StaticResource PlanStatusConverter}}" Header="执行状态" Width="1*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/> <DataGridTextColumn Binding="{Binding executeStatus,Converter={StaticResource PlanStatusConverter}}" Header="执行状态" Width="1*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<!--<DataGridTextColumn Binding="{Binding endTime ,StringFormat=\{0:MM月dd日 HH:mm\}}" Header="完成时间" Width="1*" IsReadOnly="True"/>-->
<!--<DataGridTextColumn Binding="{Binding createdTime ,StringFormat=\{0:MM月dd日 HH:mm\}}" Header="创建时间" Width="1*" IsReadOnly="True"/>--> <DataGridTemplateColumn Header="操作" Width="3*">
<DataGridTemplateColumn Header="操作" Width="2*">
<DataGridTemplateColumn.CellTemplate> <DataGridTemplateColumn.CellTemplate>
<DataTemplate> <DataTemplate>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">

6
Aucma.Scada.UI/bin/Debug/config/App.Ini
Unescape Escape View File

@ -4,7 +4,7 @@ mesConnStr=Data Source=175.27.215.92/helowin;User ID=aucma_mes;Password=aucma
scadaConnStr=Data Source=175.27.215.92/helowin;User ID=aucma_scada;Password=aucma scadaConnStr=Data Source=175.27.215.92/helowin;User ID=aucma_scada;Password=aucma
#¹¤Î»±àºÅ #¹¤Î»±àºÅ
stationCode=ZZ-01 stationCode=1002
#¹¤Î»Ãû³Æ #¹¤Î»Ãû³Æ
stationName=Ïä¿ÇÄÚµ¨×é×° stationName=Ïä¿ÇÄÚµ¨×é×°
@ -14,9 +14,9 @@ shellStoreCode=XKJCK-001
linerStoreCode=NDJCK-001 linerStoreCode=NDJCK-001
#Ïä¿ÇÎïÁÏÀàÐͱàºÅ #Ïä¿ÇÎïÁÏÀàÐͱàºÅ
shellMaterialType =3 shellMaterialType =400
#ÄÚµ¨ÎïÁÏÀàÐͱàºÅ #ÄÚµ¨ÎïÁÏÀàÐͱàºÅ
linerMaterialType=4 linerMaterialType=500
#Èë¿âÈÎÎñÀàÐͱàºÅ #Èë¿âÈÎÎñÀàÐͱàºÅ
instoreTaskType=1 instoreTaskType=1

10
Aucma.Scada.UI/viewModel/AssemblyPlan/AssemblyPlanViewModel.cs
Unescape Escape View File

@ -48,6 +48,15 @@ namespace Aucma.Scada.UI.viewModel.AssemblyPlan
#region 参数定义 #region 参数定义
/// <summary> /// <summary>
/// 序号
/// </summary>
private int no;
public int NO
{
get { return no; }
set { no = value; RaisePropertyChanged(nameof(NO)); }
}
/// <summary>
/// 工位名称 /// 工位名称
/// </summary> /// </summary>
private string stationName = string.Empty; private string stationName = string.Empty;
@ -294,6 +303,7 @@ namespace Aucma.Scada.UI.viewModel.AssemblyPlan
public void RefreshDataGrid(List<ExecutePlanInfo> executePlanInfos) public void RefreshDataGrid(List<ExecutePlanInfo> executePlanInfos)
{ {
int count = 0;
PlanInfoDataGrid = new ObservableCollection<ExecutePlanInfo>(); PlanInfoDataGrid = new ObservableCollection<ExecutePlanInfo>();
if (executePlanInfos != null) if (executePlanInfos != null)
{ {

Write Preview
Loading…
Cancel
Save