소스 검색

临时更新

样式分支
taoye 2 년 전
부모
커밋
4eae7261e8
3개의 변경된 파일5개의 추가작업 그리고 5개의 파일을 삭제
  1. +2
    -2
      BPASmartClient.CustomResource/UserControls/Cylinder.xaml
  2. +1
    -1
      BPASmartClient.JXJFoodBigStation/Model/ProcessControl.cs
  3. +2
    -2
      BPASmartClient.JXJFoodBigStation/View/RecipeReceiveView.xaml

+ 2
- 2
BPASmartClient.CustomResource/UserControls/Cylinder.xaml 파일 보기

@@ -66,9 +66,9 @@
<Trigger Property="IsChecked" Value="True"> <Trigger Property="IsChecked" Value="True">
<Setter TargetName="el" Property="Fill" Value="Green" /> <Setter TargetName="el" Property="Fill" Value="Green" />
</Trigger> </Trigger>
<Trigger Property="IsChecked" Value="False">
<!--<Trigger Property="IsChecked" Value="False">
<Setter TargetName="el" Property="Fill" Value="red" /> <Setter TargetName="el" Property="Fill" Value="red" />
</Trigger>
</Trigger>-->
</ControlTemplate.Triggers> </ControlTemplate.Triggers>
</ControlTemplate> </ControlTemplate>
</Setter.Value> </Setter.Value>


+ 1
- 1
BPASmartClient.JXJFoodBigStation/Model/ProcessControl.cs 파일 보기

@@ -61,7 +61,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
RawMaterials.Clear(); RawMaterials.Clear();
for (int i = 0; i < 15; i++) for (int i = 0; i < 15; i++)
{ {
if (RawMaterialsNamePos.ContainsKey(res.RecipeName)
if (RawMaterialsNamePos.ContainsKey(res.RecipeName))
{ {
RawMaterials.Add(new RemoteRecipeRawMaterial() RawMaterials.Add(new RemoteRecipeRawMaterial()
{ {


+ 2
- 2
BPASmartClient.JXJFoodBigStation/View/RecipeReceiveView.xaml 파일 보기

@@ -149,7 +149,7 @@
</UserControl.Resources> </UserControl.Resources>


<UserControl.DataContext> <UserControl.DataContext>
<vm:RecipeReceiveViewModel />
<vm:RecipeReceiveViewModel/>
</UserControl.DataContext> </UserControl.DataContext>


<Grid> <Grid>
@@ -192,7 +192,7 @@
IsEnabled="True" IsEnabled="True"
Style="{StaticResource IcoButtonStyle}" /> Style="{StaticResource IcoButtonStyle}" />
</StackPanel> </StackPanel>
<ScrollViewer Grid.Row="1">
<ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Hidden">
<ListBox <ListBox
Grid.Row="2" Grid.Row="2"
Margin="5" Margin="5"


불러오는 중...
취소
저장