diff --git a/BPASmartClient.Tourism/Model/AccessoriesInfo.cs b/BPASmartClient.Tourism/Model/AccessoriesInfo.cs new file mode 100644 index 00000000..cfb879ba --- /dev/null +++ b/BPASmartClient.Tourism/Model/AccessoriesInfo.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BPASmartClient.TourismCollege.Model +{ + /// + /// 辅料信息 + /// + internal class AccessoriesInfo : RawMaterial + { + /// + /// 辅料位置 + /// + public int Loc { get; set; } + } +} diff --git a/BPASmartClient.Tourism/Model/RawMaterialInfo.cs b/BPASmartClient.Tourism/Model/IngredientsInfo.cs similarity index 62% rename from BPASmartClient.Tourism/Model/RawMaterialInfo.cs rename to BPASmartClient.Tourism/Model/IngredientsInfo.cs index d6d6751f..03faca12 100644 --- a/BPASmartClient.Tourism/Model/RawMaterialInfo.cs +++ b/BPASmartClient.Tourism/Model/IngredientsInfo.cs @@ -6,7 +6,12 @@ using System.Threading.Tasks; namespace BPASmartClient.TourismCollege.Model { - internal class RawMaterialInfo : NotifyBase + /// + /// 主料信息 + /// + internal class IngredientsInfo : RawMaterial { + + } } diff --git a/BPASmartClient.Tourism/Model/RawMaterial.cs b/BPASmartClient.Tourism/Model/RawMaterial.cs new file mode 100644 index 00000000..e274f60c --- /dev/null +++ b/BPASmartClient.Tourism/Model/RawMaterial.cs @@ -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 + { + /// + /// 原料ID + /// + public string Id { get; set; } + + /// + /// 原料名称 + /// + public string Name { get; set; } + } +} diff --git a/BPASmartClient.Tourism/Model/SeasoningInfo.cs b/BPASmartClient.Tourism/Model/SeasoningInfo.cs new file mode 100644 index 00000000..eadf7faf --- /dev/null +++ b/BPASmartClient.Tourism/Model/SeasoningInfo.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BPASmartClient.TourismCollege.Model +{ + /// + /// 调料信息 + /// + internal class SeasoningInfo : RawMaterial + { + /// + /// 调料位置 + /// + public int Loc { get; set; } + } +} diff --git a/BPASmartClient.Tourism/View/ItemStorageView.xaml b/BPASmartClient.Tourism/View/ItemStorageView.xaml index 3310ea7e..1012a498 100644 --- a/BPASmartClient.Tourism/View/ItemStorageView.xaml +++ b/BPASmartClient.Tourism/View/ItemStorageView.xaml @@ -1,11 +1,14 @@ - + @@ -25,36 +28,47 @@ - + - + - + - + -