diff --git a/.vs/SGGL_SeDin_New/v17/.wsuo b/.vs/SGGL_SeDin_New/v17/.wsuo
index b1a52360..0df3bca8 100644
Binary files a/.vs/SGGL_SeDin_New/v17/.wsuo and b/.vs/SGGL_SeDin_New/v17/.wsuo differ
diff --git a/SGGL/FineUIPro.Web/CLGL/ArrivalStatistics.aspx.cs b/SGGL/FineUIPro.Web/CLGL/ArrivalStatistics.aspx.cs
index 6ddedc2e..f88c0779 100644
--- a/SGGL/FineUIPro.Web/CLGL/ArrivalStatistics.aspx.cs
+++ b/SGGL/FineUIPro.Web/CLGL/ArrivalStatistics.aspx.cs
@@ -31,14 +31,23 @@ namespace FineUIPro.Web.CLGL
         /// 绑定数据
         /// </summary>
         private void BindGrid()
-        {  
+        {
             var tb = BLL.TwArrivalStatisticsService.GetStatistics(this.CurrUser.LoginProjectId, txtMaterialCode.Text.Trim(), drpWarehouse.SelectedValue);
 
-            lbRate.Text="总体匹配率："+  Math.Round( tb.Sum(x=>x.MatchRate)*100/tb.Count() ,4) + "%";
+            if (tb.Count() > 0)
+            {
+                lbRate.Text = "总体匹配率：" + Math.Round(tb.Sum(x => x.MatchRate) * 100 / tb.Count(), 4) + "%";
+            }
+            else
+            {
+                lbRate.Text = "总体匹配率：0%";
+            }
+
             //tb = GetFilteredTable(Grid1.FilteredData, tb);
             Grid1.DataSource = tb;
             Grid1.DataBind();
         }
+
         #endregion
 
         #region GV 数据操作
diff --git a/SGGL/FineUIPro.Web/CLGL/InPlanMasterEdit.aspx.cs b/SGGL/FineUIPro.Web/CLGL/InPlanMasterEdit.aspx.cs
index 13d9bd8c..49375642 100644
--- a/SGGL/FineUIPro.Web/CLGL/InPlanMasterEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/CLGL/InPlanMasterEdit.aspx.cs
@@ -35,7 +35,7 @@ namespace FineUIPro.Web.CLGL
                     txtCreateDate.Text = string.Format("{0:yyyy-MM-dd}", model.CreateDate);
                     txtCreateMan.Text = Person_PersonsService.GetPersonsNameById(model.CreateMan);
                     txtReqUnitName.Text = UnitService.GetUnitNameByUnitId(model.ReqUnitId);
-
+                    txtRemark.Text = model.Remark;
 
                     var queryModel = new Model.Tw_InOutDetailOutput()
                     {