Quellcode durchsuchen

Merge branch 'reconfiguration' of http://111.9.47.105:10244/bpa/BPASmartClient into reconfiguration

JXJAgvReake
ZhaoGang vor 1 Jahr
Ursprung
Commit
3f25e86d5c
5 geänderte Dateien mit 100 neuen und 22 gelöschten Zeilen
  1. +19
    -0
      BPASmartClient.Tourism/Model/AccessoriesInfo.cs
  2. +6
    -1
      BPASmartClient.Tourism/Model/IngredientsInfo.cs
  3. +21
    -0
      BPASmartClient.Tourism/Model/RawMaterial.cs
  4. +19
    -0
      BPASmartClient.Tourism/Model/SeasoningInfo.cs
  5. +35
    -21
      BPASmartClient.Tourism/View/ItemStorageView.xaml

+ 19
- 0
BPASmartClient.Tourism/Model/AccessoriesInfo.cs Datei anzeigen

@@ -0,0 +1,19 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace BPASmartClient.TourismCollege.Model
{
/// <summary>
/// 辅料信息
/// </summary>
internal class AccessoriesInfo : RawMaterial
{
/// <summary>
/// 辅料位置
/// </summary>
public int Loc { get; set; }
}
}

BPASmartClient.Tourism/Model/RawMaterialInfo.cs → BPASmartClient.Tourism/Model/IngredientsInfo.cs Datei anzeigen

@@ -6,7 +6,12 @@ using System.Threading.Tasks;

namespace BPASmartClient.TourismCollege.Model
{
internal class RawMaterialInfo : NotifyBase
/// <summary>
/// 主料信息
/// </summary>
internal class IngredientsInfo : RawMaterial
{


}
}

+ 21
- 0
BPASmartClient.Tourism/Model/RawMaterial.cs Datei anzeigen

@@ -0,0 +1,21 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace BPASmartClient.TourismCollege.Model
{
internal class RawMaterial : NotifyBase
{
/// <summary>
/// 原料ID
/// </summary>
public string Id { get; set; }

/// <summary>
/// 原料名称
/// </summary>
public string Name { get; set; }
}
}

+ 19
- 0
BPASmartClient.Tourism/Model/SeasoningInfo.cs Datei anzeigen

@@ -0,0 +1,19 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace BPASmartClient.TourismCollege.Model
{
/// <summary>
/// 调料信息
/// </summary>
internal class SeasoningInfo : RawMaterial
{
/// <summary>
/// 调料位置
/// </summary>
public int Loc { get; set; }
}
}

+ 35
- 21
BPASmartClient.Tourism/View/ItemStorageView.xaml Datei anzeigen

@@ -1,11 +1,14 @@
<UserControl x:Class="BPASmartClient.TourismCollege.View.ItemStorageView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:BPASmartClient.TourismCollege.View"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800" Name="库位状态">
<UserControl
x:Class="BPASmartClient.TourismCollege.View.ItemStorageView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:BPASmartClient.TourismCollege.View"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
Name="库位状态"
d:DesignHeight="450"
d:DesignWidth="800"
mc:Ignorable="d">
<UserControl.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
@@ -25,36 +28,47 @@
</Grid.RowDefinitions>


<!--#region 入库电子称状态 -->
<!--#region 入库电子称状态-->
<StackPanel>
<TextBlock Text="{Binding Weight,StringFormat=当前重量:{0}g}" Width="200"/>
<TextBlock Width="200" Text="{Binding Weight, StringFormat=当前重量:{0}g}" />
</StackPanel>
<!--#endregion-->

<!--#region 入库操作 -->
<!--#region 入库操作-->
<StackPanel Grid.Row="1" Margin="5">
<TextBlock Text="入库名称:"/>
<TextBlock Text="入库名称:" />
<ComboBox />

<Button Content="入库" Margin="0,10"/>
<Button Margin="0,10" Content="入库" />
</StackPanel>
<!--#endregion-->
<!--#region 辅料仓 -->
<UniformGrid Columns="8" Grid.Column="1" Margin="3" Background="ForestGreen">

</UniformGrid>
<!--#region 辅料仓-->
<UniformGrid
Grid.Column="1"
Margin="3"
Background="ForestGreen"
Columns="8" />
<!--#endregion-->
<!--#region 原料仓 -->
<ListView Grid.Row="1" Grid.Column="1" Margin="3" BorderThickness="1" Background="AliceBlue">
<!--#region 原料仓-->
<ListView
Grid.Row="1"
Grid.Column="1"
Margin="3"
Background="AliceBlue"
BorderThickness="1">
<ListView.ItemsPanel>
<ItemsPanelTemplate>
<UniformGrid Columns="4" Rows="3" HorizontalAlignment="Left" VerticalAlignment="Top"/>
<UniformGrid
HorizontalAlignment="Left"
VerticalAlignment="Top"
Columns="4"
Rows="3" />
</ItemsPanelTemplate>
</ListView.ItemsPanel>

<ListView.ItemTemplate>
<DataTemplate>
<Border Background="Black"/>
<Border Background="Black" />
</DataTemplate>
</ListView.ItemTemplate>
</ListView>


Laden…
Abbrechen
Speichern