111

BPASmartClient.CustomResource/Themes/MyStyle.xaml

@@ -388,7 +388,7 @@
             </Setter>
             <Setter Property="Background">
                 <Setter.Value>
-                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/AGV/物流车.png" />
+                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/AGV/agv.png" />
                 </Setter.Value>
             </Setter>
         </Style.Setters>
@@ -458,8 +458,9 @@
 
     <Style x:Key="border碗" TargetType="Border">
         <Style.Setters>
-            <Setter Property="Height" Value="34"/>
+            <Setter Property="Height" Value="80"/>
             <Setter Property="Width" Value="40"/>
+            <Setter Property="Margin" Value="0,-20,0,-20"/>
             <Setter Property="VerticalAlignment" Value="Bottom"/>
             <Setter Property="Background">
                 <Setter.Value>
@@ -471,9 +472,9 @@
 
     <Style x:Key="border菜" TargetType="Border">
         <Style.Setters>
-            <Setter Property="Margin" Value="0,-7,0,0"/>
-            <Setter Property="Height" Value="20"/>
-            <Setter Property="Width" Value="28"/>
+            <Setter Property="Margin" Value="0,-17,0,0"/>
+            <Setter Property="Height" Value="30"/>
+            <Setter Property="Width" Value="35"/>
             <Setter Property="VerticalAlignment" Value="Top"/>
             <Setter Property="Background">
                 <Setter.Value>

FryPot_DosingSystem/AGV/WhichCart.cs

@@ -59,7 +59,8 @@ namespace FryPot_DosingSystem.AGV
     public enum IsBool
     {
         Yes,
-        No
+        No,
+        OnllYes
     }
     /// <summary>
     /// 是否运行

FryPot_DosingSystem/View/AgvView.xaml

@@ -506,11 +506,21 @@
                     <Setter.Value>
                         <ControlTemplate TargetType="{x:Type TextBox}">
                             <Grid  Width="60" Height="55">
+                                
                                 <Ellipse x:Name="name_11"  VerticalAlignment="Bottom" Visibility="Collapsed" Margin="0,0,0,0" Fill="#FF9E4C4C" Stroke="#FF9E4141" Width="60" Height="20"></Ellipse>
                                 <Ellipse x:Name="name_12"  VerticalAlignment="Bottom" Visibility="Collapsed"  Margin="0,0,0,5" Fill="#FFAD2121" Stroke="#FF9E4141" Width="40" Height="10"></Ellipse>
                                 <Ellipse x:Name="name_21"  VerticalAlignment="Bottom" Visibility="Visible" Margin="0,0,0,0" Fill="#FF4CA756" Stroke="#FF419E53" Width="60" Height="20"></Ellipse>
                                 <Ellipse x:Name="name_22"  VerticalAlignment="Bottom" Visibility="Visible" Margin="0,0,0,5" Fill="#FF1CAB3F" Stroke="#FF2D842A" Width="40" Height="10"></Ellipse>
-                                <Border x:Name="chezi" Style="{DynamicResource border车}"  Width="60" Height="60" HorizontalAlignment="Right" VerticalAlignment="Top"></Border>
+                                <Border x:Name="chezi" Style="{DynamicResource border车}" Margin="0,-3,0,0" Width="60" Height="60" HorizontalAlignment="Right" VerticalAlignment="Top" RenderTransformOrigin="0.5,0.5">
+                                    <Border.RenderTransform>
+                                        <TransformGroup>
+                                            <ScaleTransform ScaleX="-0.8" ScaleY="-0.6"/>
+                                            <SkewTransform/>
+                                            <RotateTransform Angle="185"/>
+                                            <TranslateTransform X="1" Y="0.5"/>
+                                        </TransformGroup>
+                                    </Border.RenderTransform>
+                                </Border>
                             </Grid>
                             <ControlTemplate.Triggers>
                                 <Trigger Property="Text" Value="Yes">
@@ -634,7 +644,7 @@
             <Style x:Key="运输车新"  BasedOn="{x:Null}" TargetType="{x:Type TextBox}">
                 <Setter Property="Foreground" Value="#FF1F4D69"/>
                 <Setter Property="Tag" Value="Stop"/>
-                <Setter Property="Text" Value="Yes"/>
+                <Setter Property="Text" Value="CaiYes"/>
                 <Setter Property="Template">
                     <Setter.Value>
                         <ControlTemplate TargetType="{x:Type TextBox}">
@@ -850,9 +860,11 @@
                                         </TransformGroup>
                                     </Grid.RenderTransform>
                                     <Border Style="{DynamicResource border车}"  Width="60" Height="60" HorizontalAlignment="Right"></Border>
-                                    <Grid HorizontalAlignment="Right" VerticalAlignment="Top" x:Name="caiping">
-                                        <Border  Margin="0,50,15,0" Width="20" Height="10" Style="{DynamicResource border菜}"></Border>
-                                        <Border  Margin="0,50,5,0" Width="20" Height="10" Style="{DynamicResource border菜}"></Border>
+                                    <Grid HorizontalAlignment="Right" VerticalAlignment="Center"  Margin="20,-35,10,0" x:Name="caiping">
+                                        <Grid x:Name="c1"  VerticalAlignment="Top"  Width="40" Height="60">
+                                            <Border Style="{DynamicResource border碗}" Margin="0,-10,0,-6"></Border>
+                                            <Border x:Name="cai"  VerticalAlignment="Top" Margin="0,0,0,0" Style="{DynamicResource border菜}"></Border>
+                                        </Grid>
                                     </Grid>
                                     <Grid x:Name="biaoji" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,20,0,0">
                                         <Path  x:Name="path1" Visibility="Collapsed" Data="M142.25,37 L128.75,44 146.40385,53.25" Fill="#26ECCE09" HorizontalAlignment="Right" Height="17" Margin="128,37,54,0" Stroke="#7FECCE09" StrokeThickness="3" Stretch="Fill" VerticalAlignment="Top" Width="18"/>
@@ -866,9 +878,15 @@
                                 <!--#region 是否有物品-->
                                 <Trigger Property="Text" Value="Yes">
                                     <Setter TargetName="caiping" Property="Visibility" Value="Visible" />
+                                    <Setter TargetName="cai" Property="Visibility" Value="Visible" />
                                 </Trigger>
                                 <Trigger Property="Text" Value="No">
                                     <Setter TargetName="caiping" Property="Visibility" Value="Collapsed" />
+                                    <Setter TargetName="cai" Property="Visibility" Value="Visible" />
+                                </Trigger>
+                                <Trigger Property="Text" Value="OnllYes">
+                                    <Setter TargetName="caiping" Property="Visibility" Value="Visible" />
+                                    <Setter TargetName="cai" Property="Visibility" Value="Collapsed" />
                                 </Trigger>
                                 <!--#endregion-->
 
@@ -1138,7 +1156,9 @@
                 <StackPanel>
                     <TextBlock Margin="5">小车?物品</TextBlock>
                     <TextBox x:Name="xiaochewuping_text" Margin="5">1</TextBox>
-                    <Button Margin="5" Click="Button_Click" Tag="有物品" Cursor="Hand">有物品</Button>
+                    <Button Margin="5" Click="Button_Click" Tag="有菜和碗" Cursor="Hand">有菜和碗</Button>
+                    <Button Margin="5" Click="Button_Click" Tag="只有碗" Cursor="Hand">只有碗</Button>
+
                     <Button Margin="5" Click="Button_Click" Tag="无物品" Cursor="Hand">无物品</Button>
 
 
@@ -1146,7 +1166,7 @@
             </StackPanel>
         </Grid>
 
-       
+
         <!--#endregion-->
 
         <!--#region 墙体-->
@@ -1406,8 +1426,8 @@
                 </StackPanel>
             </Grid>
         </Grid>
-        
-        
+
+
         <!--#endregion-->
 
         <!--#region 滚筒线,IsEnabled True代表有菜 false 空碗.Text:Start 执行动画  Tag：代表传输带上有几个菜碗-->
@@ -1454,6 +1474,6 @@
             <TextBox Style="{StaticResource 停车位}" Margin="0,25,0,0" Text="{Binding ParkingPileModel_6.Text,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
         </StackPanel>
         <!--#endregion-->
-        
+
     </Grid>
 </UserControl>

FryPot_DosingSystem/View/AgvView.xaml.cs

@@ -127,7 +127,7 @@ namespace FryPot_DosingSystem.View
                             }
                             AgvViewModel.GetInstance().Set小车运动(id, AgvViewModel.GetInstance().GetCommandValue(控制命令.Text));
                             break;
-                        case "有物品":
+                        case "有菜和碗":
                             try
                             {
                                 id = int.Parse(xiaochewuping_text.Text.ToString());
@@ -139,6 +139,18 @@ namespace FryPot_DosingSystem.View
                             }
                             AgvViewModel.GetInstance().Set小车是否承载物品(id, IsBool.Yes);
                             break;
+                        case "只有碗":
+                            try
+                            {
+                                id = int.Parse(xiaochewuping_text.Text.ToString());
+                            }
+                            catch (Exception ex)
+                            {
+                                MessageBox.Show("只能输入 1-4 的数字！");
+                                return;
+                            }
+                            AgvViewModel.GetInstance().Set小车是否承载物品(id, IsBool.OnllYes);
+                            break;
                         case "无物品":
                             try
                             {

FryPot_DosingSystem/ViewModel/AgvViewModel.cs

@@ -205,7 +205,7 @@ namespace FryPot_DosingSystem.ViewModel
             }
         }
         /// <summary>
-        /// 小车是否承载物品
+        /// 滚筒线状态
         /// </summary>
         /// <param name="id">默认：1 2 3 4,代表四条滚筒线,（4 代表空桶线）</param>
         /// <param name="cart"></param>