From f7876bccda11992d98c08199387469a0f90b9851 Mon Sep 17 00:00:00 2001 From: yibo <361071264@qq.com> Date: Tue, 19 Sep 2017 23:16:36 +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 --- BO/Utils/BillRpc/SecondOrderRpc.cs | 2 +- ButcherOrder/ButcherOrderForm.cs | 2 +- ButcherOrder/ViewDetail.cs | 2 +- WeighAndGrading/GradeFrom.cs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/BO/Utils/BillRpc/SecondOrderRpc.cs b/BO/Utils/BillRpc/SecondOrderRpc.cs index f530abe..97cd00a 100644 --- a/BO/Utils/BillRpc/SecondOrderRpc.cs +++ b/BO/Utils/BillRpc/SecondOrderRpc.cs @@ -29,7 +29,7 @@ namespace BO.Utils.BillRpc order.ID = RpcFacade.Call(method, dJson, mJson); } - public static void DetailDetail(SecondOrder_Detail detail) + public static void DeleteDetail(SecondOrder_Detail detail) { const string method = "/MainSystem/B3ClientService/Rpcs/BillRpc/SecondOrderRpc/DetailDetail"; RpcFacade.Call(method, detail.ID, detail.SecondOrder_ID, detail.Number); diff --git a/ButcherOrder/ButcherOrderForm.cs b/ButcherOrder/ButcherOrderForm.cs index 69deed4..d5ccb28 100644 --- a/ButcherOrder/ButcherOrderForm.cs +++ b/ButcherOrder/ButcherOrderForm.cs @@ -84,7 +84,7 @@ namespace ButcherOrder void BindGrid() { - secondOrderGridView.DataSource = orderList.OrderByDescending(x => x.IsOk).OrderBy(x => x.Order).ToList(); + secondOrderGridView.DataSource = orderList.OrderBy(x => x.Order).OrderBy(x => x.IsOk).ToList(); foreach (DataGridViewRow row in secondOrderGridView.Rows) { if ((bool)row.Cells["IsOk"].Value) diff --git a/ButcherOrder/ViewDetail.cs b/ButcherOrder/ViewDetail.cs index 8a2f20f..97bd9ed 100644 --- a/ButcherOrder/ViewDetail.cs +++ b/ButcherOrder/ViewDetail.cs @@ -45,7 +45,7 @@ namespace ButcherOrder if (e.ColumnIndex != detailGridView1.ColumnCount - 1) return; var entity = detailGridView1.CurrentRow.DataBoundItem as SecondOrder_Detail; - SecondOrderRpc.DetailDetail(entity); + SecondOrderRpc.DeleteDetail(entity); secondOrder.HotFadeNumber -= entity.Number; hotFadeNumberLabel.Text = secondOrder.HotFadeNumber.ToString(); details.Remove(entity); diff --git a/WeighAndGrading/GradeFrom.cs b/WeighAndGrading/GradeFrom.cs index f2961f3..ad8ad25 100644 --- a/WeighAndGrading/GradeFrom.cs +++ b/WeighAndGrading/GradeFrom.cs @@ -222,7 +222,7 @@ namespace WeighAndGrading void BindDataGrid() { - dataGridView.DataSource = list.OrderBy(x => new { x.Finish, x.Order }).ToList(); + dataGridView.DataSource = list.OrderBy(x => x.Order).OrderBy(x => x.Finish).ToList(); foreach (DataGridViewRow row in dataGridView.Rows) { if ((bool)row.Cells["D_Finish"].Value)