Merge branch 'master' of http://www.scserverddns.top:13000/sc/DyeingComputer
This commit is contained in:
commit
c0d3ad29fc
2 files changed
+6
-3
No files matched your search
@@ -61,14 +61,14 @@
|
|||||||
|
|
||||||
<DataGrid.Columns>
|
<DataGrid.Columns>
|
||||||
<!--列信息绑定-->
|
<!--列信息绑定-->
|
||||||
<DataGridTextColumn Header="{x:Static lang:Resources.WorkOrderNumder}" Width="200" Binding="{Binding WorkOrder}" IsReadOnly="True">
|
<DataGridTextColumn Header="{x:Static lang:Resources.WorkOrderNumder}" Width="250" Binding="{Binding WorkOrder}" IsReadOnly="True">
|
||||||
<DataGridTextColumn.ElementStyle>
|
<DataGridTextColumn.ElementStyle>
|
||||||
<Style TargetType="{x:Type TextBlock}">
|
<Style TargetType="{x:Type TextBlock}">
|
||||||
<Setter Property="Foreground" Value="{Binding Path=lock,Converter={StaticResource GramsSQLConvert}}"/>
|
<Setter Property="Foreground" Value="{Binding Path=lock,Converter={StaticResource GramsSQLConvert}}"/>
|
||||||
</Style>
|
</Style>
|
||||||
</DataGridTextColumn.ElementStyle>
|
</DataGridTextColumn.ElementStyle>
|
||||||
</DataGridTextColumn>
|
</DataGridTextColumn>
|
||||||
<DataGridTextColumn Header="{x:Static lang:Resources.ProcessName}" Width="200" Binding="{Binding ProcessName}" IsReadOnly="True"/>
|
<DataGridTextColumn Header="{x:Static lang:Resources.ProcessName}" Width="300" Binding="{Binding ProcessName}" IsReadOnly="True"/>
|
||||||
<DataGridTextColumn Header="ProcessID" Binding="{Binding ProcessID}" Width="0" MinWidth="0" MaxWidth="0"/>
|
<DataGridTextColumn Header="ProcessID" Binding="{Binding ProcessID}" Width="0" MinWidth="0" MaxWidth="0"/>
|
||||||
<DataGridTextColumn Header="lock" Binding="{Binding lock}" Width="0" MinWidth="0" MaxWidth="0"/>
|
<DataGridTextColumn Header="lock" Binding="{Binding lock}" Width="0" MinWidth="0" MaxWidth="0"/>
|
||||||
<DataGridTextColumn Header="{x:Static lang:Resources.State}" Width="90" IsReadOnly="True">
|
<DataGridTextColumn Header="{x:Static lang:Resources.State}" Width="90" IsReadOnly="True">
|
||||||
|
|||||||
@@ -96,7 +96,8 @@ namespace DyeingComputer.View
|
|||||||
{
|
{
|
||||||
lock_v.Add("lock", 1);
|
lock_v.Add("lock", 1);
|
||||||
SQLiteHelpers.Update("WorkOrder", lock_v, "WorkOrder='" + WorkOrder_Numder + "'", null);
|
SQLiteHelpers.Update("WorkOrder", lock_v, "WorkOrder='" + WorkOrder_Numder + "'", null);
|
||||||
}else
|
}
|
||||||
|
else
|
||||||
{
|
{
|
||||||
lock_v.Add("lock", 0);
|
lock_v.Add("lock", 0);
|
||||||
SQLiteHelpers.Update("WorkOrder", lock_v, "WorkOrder='" + WorkOrder_Numder + "'", null);
|
SQLiteHelpers.Update("WorkOrder", lock_v, "WorkOrder='" + WorkOrder_Numder + "'", null);
|
||||||
@@ -151,5 +152,7 @@ namespace DyeingComputer.View
|
|||||||
_lock = (Grid.Columns[3].GetCellContent(Grid.Items[rownum]) as TextBlock).Text;//定位第1列,
|
_lock = (Grid.Columns[3].GetCellContent(Grid.Items[rownum]) as TextBlock).Text;//定位第1列,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Reference in new issue
Block a user