|
|
@@ -2672,24 +2672,24 @@
|
|
|
</StackPanel>
|
|
|
<!-- 扫码模式选择 -->
|
|
|
<StackPanel Grid.Row="11"
|
|
|
- Grid.ColumnSpan="2"
|
|
|
- Orientation="Horizontal"
|
|
|
- HorizontalAlignment="Left"
|
|
|
- VerticalAlignment="Center"
|
|
|
- Margin="5">
|
|
|
+ Grid.ColumnSpan="2"
|
|
|
+ Orientation="Horizontal"
|
|
|
+ HorizontalAlignment="Left"
|
|
|
+ VerticalAlignment="Center"
|
|
|
+ Margin="5">
|
|
|
<CheckBox IsChecked="{Binding IsBasePartCodeGetSN,Mode=TwoWay}"
|
|
|
- VerticalAlignment="Center"
|
|
|
- HorizontalAlignment="Right"
|
|
|
- FontSize="{DynamicResource Font.Size.Body3}"
|
|
|
- Margin="0,0,6,0">是否基于零件码获取流程码</CheckBox>
|
|
|
+ VerticalAlignment="Center"
|
|
|
+ HorizontalAlignment="Right"
|
|
|
+ FontSize="{DynamicResource Font.Size.Body3}"
|
|
|
+ Margin="0,0,6,0">是否基于零件码获取流程码</CheckBox>
|
|
|
<CheckBox IsChecked="{Binding IsBasePartCodeChooseScrew,Mode=TwoWay}"
|
|
|
- VerticalAlignment="Center"
|
|
|
- HorizontalAlignment="Right"
|
|
|
- FontSize="{DynamicResource Font.Size.Body3}"
|
|
|
- Margin="0,0,6,0">是否通过零件码判断螺丝型号</CheckBox>
|
|
|
+ VerticalAlignment="Center"
|
|
|
+ HorizontalAlignment="Right"
|
|
|
+ FontSize="{DynamicResource Font.Size.Body3}"
|
|
|
+ Margin="0,0,6,0">是否通过零件码判断螺丝型号</CheckBox>
|
|
|
<TextBox MinWidth="300"
|
|
|
- Text="{Binding ChooseScrewModel,Mode=TwoWay}"
|
|
|
- ToolTip="螺丝型号判断，如******123**，*为忽略字符"/>
|
|
|
+ Text="{Binding ChooseScrewModel,Mode=TwoWay}"
|
|
|
+ ToolTip="螺丝型号判断，如******123**，*为忽略字符" />
|
|
|
|
|
|
</StackPanel>
|
|
|
<Button Grid.Row="12"
|
|
|
@@ -2871,23 +2871,23 @@
|
|
|
<TabItem.Header>
|
|
|
<StackPanel HorizontalAlignment="Stretch">
|
|
|
<materialDesign:PackIcon Width="24"
|
|
|
- Height="24"
|
|
|
- HorizontalAlignment="Center"
|
|
|
- Kind="LanConnect" />
|
|
|
+ Height="24"
|
|
|
+ HorizontalAlignment="Center"
|
|
|
+ Kind="BallotOutline" />
|
|
|
<TextBlock Style="{StaticResource TabHeaderTextBlockStyle}"
|
|
|
- FontSize="{DynamicResource Font.Size.Body2}"
|
|
|
- Text="产品信息"
|
|
|
- HorizontalAlignment="Stretch" />
|
|
|
+ FontSize="{DynamicResource Font.Size.Body2}"
|
|
|
+ Text="产品信息"
|
|
|
+ HorizontalAlignment="Stretch" />
|
|
|
</StackPanel>
|
|
|
</TabItem.Header>
|
|
|
|
|
|
<StackPanel Margin="16">
|
|
|
-
|
|
|
+
|
|
|
<GroupBox HorizontalAlignment="Left"
|
|
|
- Margin="10,5"
|
|
|
- Header="产品与mes参数绑定设置"
|
|
|
- Width="400"
|
|
|
- FontSize="{DynamicResource Font.Size.Title4}">
|
|
|
+ Margin="10,5"
|
|
|
+ Header="产品与mes参数绑定设置"
|
|
|
+ Width="400"
|
|
|
+ FontSize="{DynamicResource Font.Size.Title4}">
|
|
|
<Grid Margin="20">
|
|
|
<Grid.ColumnDefinitions>
|
|
|
<ColumnDefinition Width="auto" />
|
|
|
@@ -2901,10 +2901,10 @@
|
|
|
</Grid.RowDefinitions>
|
|
|
|
|
|
<TextBlock Margin="0,0,0,8"
|
|
|
- Text="产品名称:"
|
|
|
- VerticalAlignment="Center"
|
|
|
- FontSize="{DynamicResource Font.Size.Body3}"
|
|
|
- HorizontalAlignment="Right" />
|
|
|
+ Text="产品名称:"
|
|
|
+ VerticalAlignment="Center"
|
|
|
+ FontSize="{DynamicResource Font.Size.Body3}"
|
|
|
+ HorizontalAlignment="Right" />
|
|
|
<ComboBox x:Name="selectProduct"
|
|
|
Grid.Column="1"
|
|
|
Width="100"
|
|
|
@@ -2922,74 +2922,74 @@
|
|
|
<TextBlock Text="{Binding Name}" />
|
|
|
</StackPanel>
|
|
|
<TextBlock Text="{Binding Description}"
|
|
|
- MinHeight="0"
|
|
|
- MaxWidth="300"
|
|
|
- Foreground="Gray"
|
|
|
- TextTrimming="CharacterEllipsis"
|
|
|
- FontSize="{DynamicResource Font.Size.Captions4}"
|
|
|
- TextWrapping="Wrap" />
|
|
|
+ MinHeight="0"
|
|
|
+ MaxWidth="300"
|
|
|
+ Foreground="Gray"
|
|
|
+ TextTrimming="CharacterEllipsis"
|
|
|
+ FontSize="{DynamicResource Font.Size.Captions4}"
|
|
|
+ TextWrapping="Wrap" />
|
|
|
</StackPanel>
|
|
|
</DataTemplate>
|
|
|
</ComboBox.ItemTemplate>
|
|
|
</ComboBox>
|
|
|
<TextBlock Margin="0,0,0,8"
|
|
|
- Grid.Row="1"
|
|
|
- Text="产品编码(model):"
|
|
|
- VerticalAlignment="Center"
|
|
|
- FontSize="{DynamicResource Font.Size.Body3}"
|
|
|
- HorizontalAlignment="Right" />
|
|
|
+ Grid.Row="1"
|
|
|
+ Text="产品编码(model):"
|
|
|
+ VerticalAlignment="Center"
|
|
|
+ FontSize="{DynamicResource Font.Size.Body3}"
|
|
|
+ HorizontalAlignment="Right" />
|
|
|
<TextBox Grid.Row="1"
|
|
|
- Grid.Column="1"
|
|
|
- Margin="10,4"
|
|
|
- MinWidth="100"
|
|
|
- FontSize="{DynamicResource Font.Size.Body3}"
|
|
|
- TextAlignment="Center"
|
|
|
- HorizontalAlignment="Left"
|
|
|
- VerticalAlignment="Center">
|
|
|
+ Grid.Column="1"
|
|
|
+ Margin="10,4"
|
|
|
+ MinWidth="100"
|
|
|
+ FontSize="{DynamicResource Font.Size.Body3}"
|
|
|
+ TextAlignment="Center"
|
|
|
+ HorizontalAlignment="Left"
|
|
|
+ VerticalAlignment="Center">
|
|
|
<TextBox.Text>
|
|
|
<Binding Path="ProMesInfo.ProductCode"
|
|
|
- Mode="TwoWay">
|
|
|
+ Mode="TwoWay">
|
|
|
</Binding>
|
|
|
</TextBox.Text>
|
|
|
</TextBox>
|
|
|
-
|
|
|
+
|
|
|
<TextBlock Margin="0,0,0,8"
|
|
|
- Grid.Row="2"
|
|
|
- VerticalAlignment="Center"
|
|
|
- Text="产品颜色:"
|
|
|
- FontSize="{DynamicResource Font.Size.Body3}"
|
|
|
- HorizontalAlignment="Right" />
|
|
|
+ Grid.Row="2"
|
|
|
+ VerticalAlignment="Center"
|
|
|
+ Text="产品颜色:"
|
|
|
+ FontSize="{DynamicResource Font.Size.Body3}"
|
|
|
+ HorizontalAlignment="Right" />
|
|
|
<TextBox Grid.Row="2"
|
|
|
- Grid.Column="1"
|
|
|
- Margin="10,4"
|
|
|
- MinWidth="100"
|
|
|
- FontSize="{DynamicResource Font.Size.Body3}"
|
|
|
- TextAlignment="Center"
|
|
|
- HorizontalAlignment="Left"
|
|
|
- VerticalAlignment="Center">
|
|
|
+ Grid.Column="1"
|
|
|
+ Margin="10,4"
|
|
|
+ MinWidth="100"
|
|
|
+ FontSize="{DynamicResource Font.Size.Body3}"
|
|
|
+ TextAlignment="Center"
|
|
|
+ HorizontalAlignment="Left"
|
|
|
+ VerticalAlignment="Center">
|
|
|
<TextBox.Text>
|
|
|
<Binding Path="ProMesInfo.ProductColor"
|
|
|
- Mode="TwoWay">
|
|
|
+ Mode="TwoWay">
|
|
|
</Binding>
|
|
|
</TextBox.Text>
|
|
|
</TextBox>
|
|
|
|
|
|
<StackPanel Grid.Row="5"
|
|
|
- Grid.ColumnSpan="2"
|
|
|
- Margin="0,6"
|
|
|
+ Grid.ColumnSpan="2"
|
|
|
+ Margin="0,6"
|
|
|
Orientation="Horizontal"
|
|
|
HorizontalAlignment="Center">
|
|
|
<Button Margin="5"
|
|
|
- Style="{StaticResource MaterialDesignRaisedButton}"
|
|
|
- materialDesign:ButtonAssist.CornerRadius="10"
|
|
|
- MinWidth="100"
|
|
|
- Command="{Binding GetProWithMesCommand}">
|
|
|
+ Style="{StaticResource MaterialDesignRaisedButton}"
|
|
|
+ materialDesign:ButtonAssist.CornerRadius="10"
|
|
|
+ MinWidth="100"
|
|
|
+ Command="{Binding GetProWithMesCommand}">
|
|
|
<StackPanel Orientation="Horizontal"
|
|
|
- HorizontalAlignment="Center">
|
|
|
+ HorizontalAlignment="Center">
|
|
|
<materialDesign:PackIcon Kind="PuzzleEditOutline"
|
|
|
- Margin="0,0,6,0" />
|
|
|
+ Margin="0,0,6,0" />
|
|
|
<TextBlock VerticalAlignment="Center"
|
|
|
- Text="获取" />
|
|
|
+ Text="获取" />
|
|
|
</StackPanel>
|
|
|
</Button>
|
|
|
<Button Margin="5"
|
|
|
@@ -3006,25 +3006,25 @@
|
|
|
</StackPanel>
|
|
|
</Button>
|
|
|
<Button Margin="5"
|
|
|
- Style="{StaticResource MaterialDesignRaisedButton}"
|
|
|
- materialDesign:ButtonAssist.CornerRadius="10"
|
|
|
- MinWidth="100"
|
|
|
- Command="{Binding SaveProWithMesCommand}">
|
|
|
+ Style="{StaticResource MaterialDesignRaisedButton}"
|
|
|
+ materialDesign:ButtonAssist.CornerRadius="10"
|
|
|
+ MinWidth="100"
|
|
|
+ Command="{Binding SaveProWithMesCommand}">
|
|
|
<StackPanel Orientation="Horizontal"
|
|
|
- HorizontalAlignment="Center">
|
|
|
+ HorizontalAlignment="Center">
|
|
|
<materialDesign:PackIcon Kind="ContentSaveCheck"
|
|
|
- Margin="0,0,6,0" />
|
|
|
+ Margin="0,0,6,0" />
|
|
|
<TextBlock VerticalAlignment="Center"
|
|
|
- Text="保存" />
|
|
|
+ Text="保存" />
|
|
|
</StackPanel>
|
|
|
</Button>
|
|
|
</StackPanel>
|
|
|
-
|
|
|
+
|
|
|
</Grid>
|
|
|
</GroupBox>
|
|
|
</StackPanel>
|
|
|
</TabItem>
|
|
|
-
|
|
|
+
|
|
|
<!--生产排班-->
|
|
|
<TabItem>
|
|
|
<TabItem.Header>
|
wanghan