diff --git a/QualityAndOrder/QualityOrderFormForTab2.cs b/QualityAndOrder/QualityOrderFormForTab2.cs index 744564f..aeb805e 100644 --- a/QualityAndOrder/QualityOrderFormForTab2.cs +++ b/QualityAndOrder/QualityOrderFormForTab2.cs @@ -239,10 +239,7 @@ namespace QualityAndOrder BindOrderGrid(); } else - { - lastPreOrder.Show = !lastPreOrder.Show; - OrderDetailRpc.ChangeShowType(lastPreOrder.WeightBill_ID, lastPreOrder.Show); - } + OrderDetailRpc.ChangeShowType((long)preOrderGrid.CurrentRow.Cells["P_WeightBill_ID"].Value, (bool)preOrderGrid.CurrentRow.Cells["P_Show"].Value); BindPreOrderGrid(); } diff --git a/WeighAndGrading/GradeFrom.cs b/WeighAndGrading/GradeFrom.cs index 4b6cf0f..2b80e4e 100644 --- a/WeighAndGrading/GradeFrom.cs +++ b/WeighAndGrading/GradeFrom.cs @@ -225,7 +225,13 @@ namespace WeighAndGrading { VerifyConnection(); if (connection) - tangList = GradeAndWeightRpc.GetGradeAndWeightList(butcherTimeInput.Date.Value, true); + { + try + { + tangList = GradeAndWeightRpc.GetGradeAndWeightList(butcherTimeInput.Date.Value, true); + } + catch (TimeoutException) { } + } else { if (tangList == null) @@ -269,7 +275,13 @@ namespace WeighAndGrading { VerifyConnection(); if (connection) - maoList = GradeAndWeightRpc.GetGradeAndWeightList(butcherTimeInput.Date.Value, false); + { + try + { + maoList = GradeAndWeightRpc.GetGradeAndWeightList(butcherTimeInput.Date.Value, false); + } + catch (TimeoutException) { } + } else { if (maoList == null) @@ -1012,7 +1024,8 @@ namespace WeighAndGrading SyncDiscontToSever(); LocalGradeAndWeightBL.Sync(); } - catch(Exception ex) { + catch (Exception ex) + { File.WriteAllText(string.Format("{0:yyyyMMddHHmmss}log.txt", DateTime.Now), "错误:" + ex.Message + " \n详细信息:" + ex.StackTrace); } }