From 8bb93b36f9030c2fbd18b4b8cc4e86a21d8227d0 Mon Sep 17 00:00:00 2001
From: fei550 <1420031550@qq.com>
Date: Mon, 18 Nov 2024 18:09:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=85=A5=E5=BA=93=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E5=A4=87=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .vs/SGGL_SeDin_New/v17/.wsuo                  | Bin 65536 -> 65024 bytes
 .../CLGL/ArrivalStatistics.aspx.cs            |  13 +++++++++++--
 .../CLGL/InPlanMasterEdit.aspx.cs             |   2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/.vs/SGGL_SeDin_New/v17/.wsuo b/.vs/SGGL_SeDin_New/v17/.wsuo
index b1a523605bb026c0830a4961ec6e3424b769315f..0df3bca815196f37d13cc8e63de2c350df2017dc 100644
GIT binary patch
delta 1143
zcmd7RO>YuG90u^6VSxp=ErlvE7=o}St#K9DmIB5EYm>H#X^O2_+p4r~>l@ZLh!;({
zd8r3>JeZhRv!B4g7vSIrFfpEbu_y11BpwX-%nGK(gH61+$uBeepWR{R*`Zt(%Rg-I
z3)Gcgf4RGr+9t<YiEfZ7)}WsxMG%A*E>`g?<P2-rv{(S89_WRBaDxg>Jaz=_A>gmb
z?Y3FT`iPfhMSm)cQUv&{gY9AdD8Ghq-`7<;je8Gd*?IemjZ5gw!W>+N99)5UxC#rf
z2upAcuEPz;!!oSEP0(Q#*5DT0hC6T<?m+?W!#X^Ghww-cyuxF2o<I>w@C?fe*q@`<
zWDWAvH8b(|0G*MeJU|x=01xoj{#z|SGV%@a2%W$q<q`5&IS2ZkCwY6YM15Uv@k9^9
z|D0%#m1t+LjJPAr;})6X{_dK@(yc%$+3l))jO;J;eh_84XT$u^vTxow$<{7fg`)4H
zY)63~ME)bz(VnQ42BsbCLg-vIFix!TQ1|#7!aU)mbZSq%Rt$e8k=5a(u4`+WswY-7
zbvPc2tIMN$LXF2plBv<eNKDgNL3z!;rjYyk<?PPZ!bMgIMp@=Wy_N~q340gJm?3Ho
zQbU>gr|Ha-^!JQLNMvF<BlB-A?OSwulNiy-uAM|Too0d>>2aC=<^FiVOj2{qVU9`W
dw8NYcjog72S}WvU*{Vx*Vqk~!wA0JK{RyZ*S9JgY

delta 1309
zcmc)KUr19?90%~7yQ{mdHRs=EiLIQv%IVa3%@CV9-7L2pbDEo=b8Y=IdPvI(Y(x;0
zLGIT}4@KOk9%c8fCm(t*kchB{9(#)*!63H2CmqaQv>>|h;hgh3zkBaFzxyZoLz_&B
z%QHgJr)LjVd*wA&Lvz9%=Am_ART4BBO%?|&6<e8u*0pU%_9L_xOi&CNOjo1T!!a<z
z9xzagRJJrFR+M4DufY@faS-FWt;wo-3>v@&C9s*2&6e_n>J~&=p$(kS4l;BAebk$M
z-RPVI7xX|c^nn}tVE{bfg+Vw4r(p<u;D<9X4A(c;bnnm&4Cdh`+=AP%0J*hg=sUYs
zv~1hCT)NsgFIN$i120$ZBKx-bx$@=WywzdO0J(A&=AF0eYF6Z(RQdm^S+`>~`HqR{
zYssV+$*SMrZ2^B+nWey5+EC552aK;pgBG)mTl?d$CVeX%kqYtyvt@6|UFl$6b*|iB
zNPR}1YC7O#27WV3UgEEWhm2MtuJqv*rdWkkjaO>Q%TQ-)-m%)2L@W_IJ{`43<IYaI
zQ=V?OcgCYJdm<K<<&M^P$GNCFGx~(3!z;}6C~&21`Mp~4YN~OgEB^E@J&u^oeUrgZ
zZ@?SupBxK$Lp}b9pvN;bF>q0-7nGwy$};#5?~!u+z9+|`PU#X-O>Tn~dzH5Bw`q|n
zvY>Q}id$0rg5nhwznC7r!02VbOqT*S-ZBkc4m9vyYIN62*V5OqD)qzId8Q`EUBaIg
zDiwB-YaGH?=}WjoV))#fgCi$Mip=ZIzTy8L4c(7)QZiywKTn#Uvjw~x&Ge$!@>d*!
F=_m8onH2y4

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()
                     {