From 82c668779dfb374a4661574896a54fef96cb38d2 Mon Sep 17 00:00:00 2001 From: yibo <361071264@qq.com> Date: Tue, 8 Jan 2019 08:24:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BL/FourComponentWeightBL.cs | 4 +- FourComponentWeightClient/FCWeightForm.xaml | 603 +++++++++++++++++- .../FCWeightForm.xaml.cs | 44 +- .../FourComponentWeightClient.csproj | 7 +- .../GoodsSettingWindow.xaml | 8 +- .../GoodsSettingWindow.xaml.cs | 15 +- FourComponentWeightClient/logo.ico | Bin 0 -> 99678 bytes 7 files changed, 647 insertions(+), 34 deletions(-) create mode 100644 FourComponentWeightClient/logo.ico diff --git a/FourComponentWeightClient/BL/FourComponentWeightBL.cs b/FourComponentWeightClient/BL/FourComponentWeightBL.cs index 473367c..3dea3da 100644 --- a/FourComponentWeightClient/BL/FourComponentWeightBL.cs +++ b/FourComponentWeightClient/BL/FourComponentWeightBL.cs @@ -12,9 +12,9 @@ namespace FourComponentWeightClient.BL { public static class FourComponentWeightBL { - public static ObservableCollection LoadList(DateTime date) + public static ObservableCollection LoadList(DateTime date, int? minDiaoPai, int? maxDiaoPai) { - var json = RpcFacade.Call("/MainSystem/B3DaHongMen/Rpcs/FourComponentWeightRpc/GetList", date); + var json = RpcFacade.Call("/MainSystem/B3DaHongMen/Rpcs/FourComponentWeightRpc/GetList", date, minDiaoPai, maxDiaoPai); var list = JsonConvert.DeserializeObject>(json); var idx = list.Count; foreach (var item in list) diff --git a/FourComponentWeightClient/FCWeightForm.xaml b/FourComponentWeightClient/FCWeightForm.xaml index ddbface..e3bf9be 100644 --- a/FourComponentWeightClient/FCWeightForm.xaml +++ b/FourComponentWeightClient/FCWeightForm.xaml @@ -1,11 +1,585 @@  + Title="四分体称重" Height="700" Width="920" WindowState="Maximized" FontSize="15" > + + + + + + + + + + + + + - + @@ -14,22 +588,25 @@ - + + +