sc
/
DyeingComputer
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

部分触摸界面修改，新建功能错误修改，信息按钮逻辑错误修改

master
sc 2 months ago
parent
0b9b01c772 c069291ae8
commit
7666f88e12
7 changed files with 280 additions and 265 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      View/HistoryRecordsView.xaml
  2. 3
      View/ParameterSetView.xaml
  3. 4
      View/ProgramgroupView.xaml
  4. 4
      View/ProgramstepsView .xaml
  5. 2
      View/SysSetView.xaml
  6. 6
      View/TechnologicalProcessView.xaml
  7. 28
      View/WorkOrderView.xaml.cs

2
View/HistoryRecordsView.xaml
View File

@ -10,7 +10,6 @@
d:DataContext="{d:DesignInstance Type=viewmodel:HistoryRecordsViewModel}"
d:DesignHeight="630" d:DesignWidth="1280">
<Grid>
<ScrollViewer VerticalScrollBarVisibility="Auto" PanningMode="VerticalOnly" >
<DataGrid x:Name="gridH" AlternationCount="2" IsReadOnly="True" SelectionChanged="Grid_SelectionChanged"
d:ItemsSource="{d:SampleData ItemCount=90}" AutoGenerateColumns="False" MinColumnWidth="30"
HorizontalGridLinesBrush="#FFC9C9C9" VerticalGridLinesBrush="#FFC9C9C9" GridLinesVisibility="All" BorderBrush="{x:Null}"
@ -58,7 +57,6 @@
<DataGridTextColumn Header="{x:Static lang:Resources.Remark}" Width="*" Binding="{Binding Remark}" IsReadOnly="True"/>
</DataGrid.Columns>
</DataGrid>
</ScrollViewer>
<lvc:CartesianChart Margin="0,300,0,0" x:Name="chart" Series="{Binding Series}" YAxes="{Binding YAxes}" XAxes="{Binding XAxes}"/>
</Grid>
</UserControl>

3
View/ParameterSetView.xaml
View File

@ -9,7 +9,7 @@
mc:Ignorable="d" Loaded="UserControl_Loaded"
d:DesignHeight="630" d:DesignWidth="1280">
<Grid>
<ScrollViewer VerticalScrollBarVisibility="Auto" PanningMode="VerticalOnly" >
<DataGrid x:Name="Grid" AlternationCount="2" Margin="0,0,0,0" d:ItemsSource="{d:SampleData ItemCount=99}" AutoGenerateColumns="False"
HorizontalGridLinesBrush="#FFC9C9C9" VerticalGridLinesBrush="#FFC9C9C9" GridLinesVisibility="All" BorderBrush="#CCCCCC"
BorderThickness="1,1,1,1" ColumnHeaderHeight="40" HorizontalContentAlignment="Right" Grid.ColumnSpan="2" AllowDrop="False"
@ -52,6 +52,5 @@
<localUserClass:NumericTextColumn Header="{x:Static lang:Resources.ParameterSet}" Width="200" Binding="{Binding Value}"/>
</DataGrid.Columns>
</DataGrid>
</ScrollViewer>
</Grid>
</UserControl>

4
View/ProgramgroupView.xaml
View File

@ -15,9 +15,8 @@
<Button Content="{x:Static lang:Resources.Rename}" x:Name="ProgramgroupView_Rename" FontSize="20" HorizontalAlignment="Left" Height="40" Margin="400,0,0,0" VerticalAlignment="Top" Width="200" Background="White" Click="ProgramgroupView_Rename_Click"/>
<Button Content="{x:Static lang:Resources.Remark}" x:Name="ProgramgroupView_Remark" FontSize="20" HorizontalAlignment="Left" Height="40" Margin="600,0,0,0" VerticalAlignment="Top" Width="200" Background="White" Click="ProgramgroupView_Remark_Click"/>
<ScrollViewer VerticalScrollBarVisibility="Auto" PanningMode="VerticalOnly" Margin="0,40,0,0" >
<DataGrid x:Name="Grid" AlternationCount="2" IsReadOnly="True" SelectionChanged="Grid_SelectionChanged"
d:ItemsSource="{d:SampleData ItemCount=90}" AutoGenerateColumns="False" MinColumnWidth="30"
d:ItemsSource="{d:SampleData ItemCount=90}" AutoGenerateColumns="False" MinColumnWidth="30" Margin="0,40,0,0"
HorizontalGridLinesBrush="#FFC9C9C9" VerticalGridLinesBrush="#FFC9C9C9" GridLinesVisibility="All" BorderBrush="#CCCCCC"
BorderThickness="1,1,1,1" ColumnHeaderHeight="40" HorizontalContentAlignment="Right" Grid.ColumnSpan="2" AllowDrop="False"
CanUserReorderColumns="False" CanUserSortColumns="False" CanUserResizeRows="False" CanUserResizeColumns="False"
@ -60,7 +59,6 @@
<DataGridTextColumn Header="{x:Static lang:Resources.Remark}" Width="*" Binding="{Binding Notes}" IsReadOnly="True"/>
</DataGrid.Columns>
</DataGrid>
</ScrollViewer>
<ContentControl x:Name="container"/>
</Grid>
</UserControl>

4
View/ProgramstepsView .xaml
View File

@ -21,9 +21,8 @@
<Button Content="{x:Static lang:Resources.Save}" x:Name="ProgramgroupView_Save" FontSize="20" HorizontalAlignment="Left" Height="40" Margin="600,0,0,0" VerticalAlignment="Top" Width="200" Background="White" Click="ProgramgroupView_Save_Click"/>
<TextBlock x:Name="p_title" FontSize="20" VerticalAlignment="Top" Height="40" Margin="1000,0,0,0" />
<ScrollViewer VerticalScrollBarVisibility="Auto" PanningMode="VerticalOnly" Margin="0,40,0,0" >
<DataGrid x:Name="Grid" AlternationCount="2" IsReadOnly="True" SelectionChanged="Grid_SelectionChanged"
d:ItemsSource="{d:SampleData ItemCount=90}" AutoGenerateColumns="False" MinColumnWidth="30"
d:ItemsSource="{d:SampleData ItemCount=90}" AutoGenerateColumns="False" MinColumnWidth="30" Margin="0,40,0,0"
HorizontalGridLinesBrush="#FFC9C9C9" VerticalGridLinesBrush="#FFC9C9C9" GridLinesVisibility="All" BorderBrush="#CCCCCC"
BorderThickness="1,1,1,1" ColumnHeaderHeight="40" HorizontalContentAlignment="Right" Grid.ColumnSpan="2" AllowDrop="False"
CanUserReorderColumns="False" CanUserSortColumns="False" CanUserResizeRows="False" CanUserResizeColumns="False"
@ -130,6 +129,5 @@
</DataGridTemplateColumn>
</DataGrid.Columns>
</DataGrid>
</ScrollViewer>
</Grid>
</UserControl>

2
View/SysSetView.xaml
View File

@ -8,7 +8,6 @@
mc:Ignorable="d" Loaded="UserControl_Loaded"
d:DesignHeight="630" d:DesignWidth="1280">
<Grid>
<ScrollViewer VerticalScrollBarVisibility="Auto" PanningMode="VerticalOnly">
<DataGrid x:Name="Grid" AlternationCount="2" Margin="0,0,0,0" d:ItemsSource="{d:SampleData ItemCount=99}" AutoGenerateColumns="False"
HorizontalGridLinesBrush="#FFC9C9C9" VerticalGridLinesBrush="#FFC9C9C9" GridLinesVisibility="All" BorderBrush="#CCCCCC"
BorderThickness="1,1,1,1" ColumnHeaderHeight="40" HorizontalContentAlignment="Right" Grid.ColumnSpan="2" AllowDrop="False"
@ -51,6 +50,5 @@
<DataGridTextColumn Header="{x:Static lang:Resources.ParameterSet}" Width="400" Binding="{Binding Value}"/>
</DataGrid.Columns>
</DataGrid>
</ScrollViewer>
</Grid>
</UserControl>

6
View/TechnologicalProcessView.xaml
View File

@ -112,21 +112,21 @@
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
<DataGridTemplateColumn Header="{x:Static lang:Resources.Directives}" Width="100" IsReadOnly="True">
<DataGridTemplateColumn Header="{x:Static lang:Resources.Subroutine}" Width="100" IsReadOnly="True">
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<Image Source="{Binding Path=StepID_S1,Converter={StaticResource StatenToImageConvert}}" Height="100" Width="100"/>
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
<DataGridTemplateColumn Header="{x:Static lang:Resources.Directives}" Width="100" IsReadOnly="True">
<DataGridTemplateColumn Header="{x:Static lang:Resources.Subroutine}" Width="100" IsReadOnly="True">
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<Image Source="{Binding Path=StepID_S2,Converter={StaticResource StatenToImageConvert}}" Height="100" Width="100"/>
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
<DataGridTemplateColumn Header="{x:Static lang:Resources.Directives}" Width="100" IsReadOnly="True">
<DataGridTemplateColumn Header="{x:Static lang:Resources.Subroutine}" Width="100" IsReadOnly="True">
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<Image Source="{Binding Path=StepID_S3 ,Converter={StaticResource StatenToImageConvert}}" Height="100" Width="100"/>

28
View/WorkOrderView.xaml.cs
View File

@ -132,7 +132,7 @@ namespace DyeingComputer.View
viewProgram.AddressUpdated += new ViewProgram.AddressUpdateHandler(Address_ButtonClicked);
viewProgram.ShowDialog();
}
private void Address_ButtonClicked(object sender, AddressUpdateEventArgs e)//编辑返回结果
private void Address_ButtonClicked(object sender, AddressUpdateEventArgs e)//新建返回结果
{
SQL_UPDATE = false;
@ -157,7 +157,29 @@ namespace DyeingComputer.View
SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
SQLiteHelpers.Open(); //打开数据库
/*插入表头信息*/
SQLiteHelpers.InsertData("WorkOrder", WorkOrder_new);//
/*获取转并插入步骤信息*/
DataTable step_dat = SQLiteHelpers.ExecuteDataSet(
"select * from ProgramSteps where ProgramID='" + Process_id + "'", null).Tables[0]; //读取表写入缓存
DataTable _t = step_dat.Clone();
_t.Columns.Add("WorkOrder", System.Type.GetType("System.String"));
_t.Columns.Add("DYELOT", System.Type.GetType("System.String"));
int a = step_dat.Rows.Count;
for (int i = 0; i < a; i++)
{
_t.Clear();//清空
DataRow dt = step_dat.Rows[i];//行转
DataRow dr = _t.NewRow();
dr.ItemArray = dt.ItemArray;
dr.BeginEdit(); //添加订单号
dr["WorkOrder"] = WorkOrder_Numder;
dr["DYELOT"] = WorkOrder_Numder;
dr.EndEdit();
_t.Rows.InsertAt(dr, 0); //行转换
SQLiteHelpers.InsertData("WorkorderSteps", SQLiteHelpers.DataTableToDictionary(_t));//行插入
}
SQLiteHelpers.Close();
}
private void WorkOrderView_del_Click(object sender, RoutedEventArgs e)//删除按钮
@ -234,7 +256,9 @@ namespace DyeingComputer.View
dataGrid.Columns.Add(new DataGridTextColumn() { Header = Properties.Resources.Step, Width = 60, Binding = new Binding("Step") });
dataGrid.Columns.Add(new DataGridTextColumn() { Header = Properties.Resources.Directives, Width = 300, Binding = new Binding("StepName") });
dataGrid.Columns.Add(new DataGridTextColumn() { Header = Properties.Resources.ParameterSet, Width = 500, Binding = new Binding("ParameterName") });
dataGrid.Columns.Add(new DataGridTextColumn() { Header = Properties.Resources.Remark, Width = Picture.ActualWidth - 885, Binding = new Binding("Remark") });
dataGrid.Columns.Add(new DataGridTextColumn() { Header = Properties.Resources.Subroutine +1, Width = 300, Binding = new Binding("StepName_S1") });
dataGrid.Columns.Add(new DataGridTextColumn() { Header = Properties.Resources.Subroutine +2, Width = 300, Binding = new Binding("StepName_S2") });
dataGrid.Columns.Add(new DataGridTextColumn() { Header = Properties.Resources.Subroutine +3, Width = 300, Binding = new Binding("StepName_S3") });
dataGrid.AutoGenerateColumns = false;
dataGrid.CanUserReorderColumns = false;
dataGrid.CanUserSortColumns = false;

Write Preview
Loading…
Cancel
Save