9cw_I``h%(vk`*7MFstN2({x(0B`)H2&MOVsX|CrDODWPfz+E0~{bsMk#iJy3Pk
z#EWB2(u@OJ`}31aHDpUR*jC&w*;Q%2?^saU>Z2Asg|sy$`$i1?sr|+@kB7N_K+9%nMd(>a2)ij2&Gg~iqze-S64!h~cphq;V(LJqS
z?_}7pDf5HtK-KH~8&Rudv}q|JHsJ=ZdtNE8;gqn$Ldzp-hO9jJ<_75SHy?ZDz;J;p#N({JBMIT~K*aj;C(0K_q>cX?AJQ`RCM%y*|(
z<<$h=>Gz3KPjuU~@94v0F*Qjk7OT(d6bAY;X@Q(AqK>roi8^B=(1OAjpE
zZWoy3YPHxN&Ny?KQS2jKE*gB#@ul*e{_)P><>k2<$>&ol4Y?cBf7J+d*dWsSu2b!d
zl6}W&cuQQV{oYvg%Mo!EryKW*`*OVQHCDCu)x7K&e;!0W*KQfEl3n-d+@Xeb5r1rI
z&FQW0^y7FtvhKHCbUsQiTADE2sL*ubSi=5Fmqc2`wTg|pA-A6BB#P+kZ4plhb~sjh
zT=oe+fS*4v=zZ9sPS1n88C$gXvsAK`5+xi*Gq+l2=w-yPiHG6btF;BoeXHKSS>spw
z{G$H3!`U~_yo#$Mtt%fH`>?-3FUKhB6im$u9c-^Vvbc2Ud2u26(P{UUO4;%*Dm_Xg
zSn0&M)O5A@{OjGn2R9zOdQ~E1L<&CERpA~t2@=6R!U=OG) Aj8F|4X;DacPJyRQ
z6`-!ACV@hQ4^6dTyruNifBNH=$=E{3u;O4*FwaU+xx)tkStDa!AOr-Xziq$}B%z8j
z6h5+YaNX^8HBaLv#X3{nA3Y|j0>uZ3j^%y*5fQd;7I6RLM
zu#oA?aYXk7Q80w
zxCp#3G$&`IDU88@2tw2uL_`RU$(eE`0av{CpF(7W@U6uM!;rMA;JP716ol|gh7eH^
z!mk!WBnG|%_=52TU`Wpcu#iqGnuHIUr94POSEK^uPvGSuFKIyGQStc+P8MvpbHgyG
zX|GMibAji92G`pwBQC~%ha%2lg541lJBcD%D81<1k|D`KLksW0_W^(6`7g(01@VXw
zaKaI)F&ntdfv$s3SCNdaXz17iU(`HM6T0yELK!|Em#N0KqJSVVJdxoTzVXn`={RQ2
zb#qL`1P?mK9dxE)nXZ}?eDqIzKA&sg+J}iAAOzKt|C|cs5duCJ7%Thyeib2s$gQFG&Ch3xtAwAPOXaD0Cem7|kPC
z<9`Yq*G69u+RJ;1;s_#wmJt=uIZ`5&=1J7@Qz93HsYE!)7HUBNL1d`C3{njScW3{0{P8Is^s+US^383&RWm-h{6&yU24vAQY7r
z1Cm?jg8*PIB__Yf--ZHq;dQZb^Z-mz5YbY{TD}8?zwv9(8fgUsCcl^Zw_fEHcp7Gf
zQ24gg6?BwV;2C^dRqRevSV3pO7A=w1S@5z_gtQe#;K#OLYp{aOKWC@M&rWp(+keas
z)sy`fLPecr1Jns{PSbF3C1=QFYq~WZ-~@Y&01O2D7xcEQCG~&Q@XKn#=nryQ1ZS|%
z=$Dh_jdBhW$R?Dhwgz#+?x=~nQhBO+gBX%oZl|w_2ph$G7&?ox7|}QjO|*|u!dB3W
z^7n02{-n-v^YQiRHmOb7c`q>KMsQ+Q_&4iIrydI*Mv5x$eT9mp
zqm9v-7>4>?hFY6kvwMe2#o=i~@plGSr)L`~%L2^pV6*u5#Fv>TQcWjmG^^RZ&REJAn`cz4
zpE5bQx|aP(ZT9yb@3MlFp{5qyx#16%v+tU=ezkVGa@U?=#hz{Xc$HB*Gt(VakjV4J
zoh%+#bIr7`Y$o>(i@XgJf4#+R(?IZ=?+iHYqAEg>Qtt|~RC&Ks!z}%dRy9_yzLYhS
zX2OwD@gd&K(;ewgF?3Vm=?`D8&tP{06XUY1jH6GD{xnp0s=JT&+K%=?-%Yi9ibIw2
z7}4lCaZF?AU-j1>kT)N*P5z!HJ@91A^2+x+4@78Jy^+lr^W@&=?mexhYMO2oaNACH
zyrp$Dy{h+S+n5EnzxC=Q(=>0J%$S6NS^Y%~6-PCeHqqo5;aG5+M24AV08%1<^Xjhlz+CBv1x
zZ+>VNB5li_s`~T(fxADb&8mJ$d+PZz^`uPG%iRixs*PgpFAy^e&WoO8L`jc5{1Di<
zDlbo0sN&@{u88aWb=LFQxjU@k&%aSd*~$0b^q6kDzP0|VnDYd)fO8OkD>&wOvTxxl
zueUs_fWoaUgDqt(A3emk?=U%h=N)rx;y?m#Dm!uDg-Kzy1UEa!w==$9=Fa698o^jN
zj-oZ#qj$W2+py7%*yxS9J>OsP|-a3{Iz6@tS%ZZ>?hK9^7!~on+(HqCbC?58J<%d-v|M6X6_l
zvlm-(D~`1ls=D|W6AoW7E^M;tpr+?`^EAtR>YIs%>$?&vEp=a9F5O`skaavHyGe68
zr|aMo$NjI1)V(NjPm+HN>}YB>yzbTC#qJDwmG(R-|C`Y64H-N8YfS#|Am7i}oqcXA
zN5i?Kx!EJ0E4iaBH!RIIzv8fn%7uP|=DPPDmAQEi(Gv2yLG^R3Axt03>97*_R@Xyj
zewp7^Gqgv!=`KzcCqh|v^)7>IbslZak7_&d<^E@J1$*Kxb-cRO6z2?d>c0PJZ*vIS
z)^_{;gi!nE?e~VRoY^W*KAf0xWD`qw%AhLXsP0=sj?9>)i$ez^de_y`NY0Ca{M9=r
z3tD-j8^V0DKgO1L-u^X2%%pI~qrg7hf%JX;Jttxnyc>$XXkGJ=cs+k!H`yw^CG*+M
zDQnWXMx4e)o!`^ML}cmqvNOmCR&QswOicNV-)&Gv|d(x$}|jK1!=f`(3V0
zMI6Cre06F#bjm{8dDUz?-RtqRzVqq9BQEyaALgEyKWHy0qCBEh#hIQ04bmf=3vWW}
zcy5jV`CPEOL%Y+}&G=RR7O$}yCUI`8y=j%9_Fz}g(+;^QhJ#U8>_%F3pB`hXuUI{q
z9o!dYoOOM}32L_YolLJQDsm4k)cvAMD&+Utyv_|%Q%Q{3wo6e@`Lg&=XHLxteWuB)
zl?T{Od}sFNv%4=jrL*H9okcG`$9kO}pMLwWMtJ_{C5ct8k4AD2RQB#^2usz8>8#dup*mu+>DJAr$VwGbQEpqRBXzV3V+7fnKA)X
zY9tgGo}8j9k=8%3fxEL19t|?1lv^=FgpgUZ$kZDDm`b5Dm0>Bb(Z?0shMX0^$k6VTBb6;^Ci51}u=cXpp%A5{M?5JNUW-
zSiX!qVTyn-PRAbN00_Yc4mM<=VR-Sf17hQf5TqkE0FY`CX&?>i5NjyUBP2iqU%*xz
zRuV~}!WPjxr~q*SNgxEo!U8W2h7bf>1lR@W@EOWy=EMp&p*#m4)WOP~4Ww=1TH`?~TzCZj
zMpc$E4%-DX%UB5R3~R|{j0eJSp_efM&dDe8GA05dsF0Id8lMD2Ko5BtivrON;Q0ap
za9D*c*m(T18<22V4UNeO*lq;Yh!megFb*}h_F-=V4$#F{m>}GLP{zaOJw6hFXfu?s
zK1|;c3l$(ZxM=X_w7}yaj}=)0Eg^{D8@7P(5RsOUFhn9thyW4v>A#>#gb+K^2!BBmxn3)DZNEf-L|`vl|Yr595-9+h-IM!S%t7=R;l^kj62mSiU$k-^Llip>J*0
zh+sit$q`W%TPoz3wuuTDhd>q&2!!*{;u&cWr~^FOV5>&Gg~;&rp$fbf-{pJAe$?GA
zgp7j>3lWA>f`E%c1R#Re*quf6%6Sg*2>Q}4fiKc==sLW}X(w&c-2D7JmQeXRry+#s
zk1O}C&T%eR-C~485Y)^?6D@Gra@utr!bJ^S*HE*eCYEp>Y}k>e2sZ2p(~2g!)3j(%
z!afh)@G#~H0^lc!37au61nc0P2}}X}YN3U$as+jI{@JnG)d7`u)V}5BCPXxWo$G-K
Jx_w*8e*uwJiv$1w
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChartNew.aspx b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChartNew.aspx
index f85d259d..3539a569 100644
--- a/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChartNew.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChartNew.aspx
@@ -94,8 +94,6 @@
-
-
@@ -233,6 +231,7 @@
+
@@ -244,6 +243,7 @@
+
@@ -253,6 +253,7 @@
+
@@ -262,6 +263,7 @@
+
@@ -271,6 +273,7 @@
+
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChartNew.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChartNew.aspx.cs
index 52de22e5..80e69fda 100644
--- a/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChartNew.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChartNew.aspx.cs
@@ -79,7 +79,7 @@ namespace FineUIPro.Web.Transfer.Chart
{
#region 加载尾项完成统计表(30天以内)
var nowDate = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd"));
- for (var i = nowDate.AddDays(-30); i <= nowDate; i=i.AddDays(1))
+ for (var i = nowDate.AddDays(-30); i <= nowDate; i = i.AddDays(1))
{
//i是日期
@@ -87,7 +87,7 @@ namespace FineUIPro.Web.Transfer.Chart
DateTime startTime = Convert.ToDateTime(i.ToString("yyyy-MM-dd") + " 00:00:00");
DateTime endTime = Convert.ToDateTime(i.ToString("yyyy-MM-dd") + " 23:59:59");
//当天计划完成量
- var dtjhwcl= forms.Where(x => x.Required_Date >= startTime && x.Required_Date <= endTime).Count();
+ var dtjhwcl = forms.Where(x => x.Required_Date >= startTime && x.Required_Date <= endTime).Count();
wcl1 += "'" + dtjhwcl + "',";
//当天实际完成量
var dtsjwcl = forms.Where(x => x.Actual_Date >= startTime && x.Actual_Date <= endTime).Count();
@@ -96,12 +96,12 @@ namespace FineUIPro.Web.Transfer.Chart
var ljjhwcl = forms.Where(x => x.Required_Date <= endTime).Count();
wcl3 += "'" + ljjhwcl + "',";
//累计实际完成量
- var ljsjwcl= forms.Where(x => x.Actual_Date <= endTime).Count();
+ var ljsjwcl = forms.Where(x => x.Actual_Date <= endTime).Count();
wcl4 += "'" + ljsjwcl + "',";
- AllxDate += "'"+ d + "',";
+ AllxDate += "'" + d + "',";
}
- if (AllxDate.Length>0)
+ if (AllxDate.Length > 0)
{
AllxDate = AllxDate.Substring(0, AllxDate.Length - 1);
wcl1 = wcl1.Substring(0, wcl1.Length - 1);
@@ -403,7 +403,7 @@ namespace FineUIPro.Web.Transfer.Chart
cat_C_Count += Convert.ToInt32(row["Cat_C_Count"]);
cat_D_Count += Convert.ToInt32(row["Cat_D_Count"]);
//
- Cat_A_Countf+= Convert.ToInt32(row["Cat_A_Countf"]);
+ Cat_A_Countf += Convert.ToInt32(row["Cat_A_Countf"]);
Cat_A_CountWUH += Convert.ToInt32(row["Cat_A_CountWUH"]);
Cat_A_CountBASF += Convert.ToInt32(row["Cat_A_CountBASF"]);
@@ -604,7 +604,7 @@ namespace FineUIPro.Web.Transfer.Chart
protected void TabStrip1_TabIndexChanged(object sender, EventArgs e)
{
- if (TabStrip1.ActiveTabIndex ==0)
+ if (TabStrip1.ActiveTabIndex == 0)
{
ddlSystemNo.Hidden = true;
ddlDateType.Hidden = true;
@@ -636,7 +636,8 @@ namespace FineUIPro.Web.Transfer.Chart
BtnAnalyse.Hidden = false;
BindGrid3();
}
- else {
+ else
+ {
this.AnalyseData();
ddlSystemNo.Hidden = false;
ddlDateType.Hidden = false;
@@ -667,14 +668,14 @@ namespace FineUIPro.Web.Transfer.Chart
strSql.AppendLine(@" select System_No,
cast(0 as decimal(18, 2)) Cat_A_Count,
- cast(0 as decimal(18, 2)) Cat_A_Countf, cast(0 as decimal(18, 2)) Cat_A_CountWUH, cast(0 as decimal(18, 2)) Cat_A_CountBASF,
+ cast(0 as decimal(18, 2)) Cat_A_Countf,cast(0 as decimal(18, 2)) Cat_A_CountPercent, cast(0 as decimal(18, 2)) Cat_A_CountWUH, cast(0 as decimal(18, 2)) Cat_A_CountBASF,
cast(0 as decimal(18, 2)) Cat_B_Count,
- cast(0 as decimal(18, 2)) Cat_B_Countf, cast(0 as decimal(18, 2)) Cat_B_CountWUH, cast(0 as decimal(18, 2)) Cat_B_CountBASF,
+ cast(0 as decimal(18, 2)) Cat_B_Countf,cast(0 as decimal(18, 2)) Cat_B_CountPercent, cast(0 as decimal(18, 2)) Cat_B_CountWUH, cast(0 as decimal(18, 2)) Cat_B_CountBASF,
cast(0 as decimal(18, 2)) Cat_C_Count,
- cast(0 as decimal(18, 2)) Cat_C_Countf, cast(0 as decimal(18, 2)) Cat_C_CountWUH, cast(0 as decimal(18, 2)) Cat_C_CountBASF,
+ cast(0 as decimal(18, 2)) Cat_C_Countf,cast(0 as decimal(18, 2)) Cat_C_CountPercent, cast(0 as decimal(18, 2)) Cat_C_CountWUH, cast(0 as decimal(18, 2)) Cat_C_CountBASF,
cast(0 as decimal(18, 2)) Cat_D_Count,
- cast(0 as decimal(18, 2)) Cat_D_Countf, cast(0 as decimal(18, 2)) Cat_D_CountWUH, cast(0 as decimal(18, 2)) Cat_D_CountBASF,
- cast(0 as decimal(18, 2)) allCount, cast(0 as decimal(18, 2)) allfinshedCount, cast(0 as decimal(18, 2)) allWUH, cast(0 as decimal(18, 2)) allBASF
+ cast(0 as decimal(18, 2)) Cat_D_Countf,cast(0 as decimal(18, 2)) Cat_D_CountPercent, cast(0 as decimal(18, 2)) Cat_D_CountWUH, cast(0 as decimal(18, 2)) Cat_D_CountBASF,
+ cast(0 as decimal(18, 2)) allCount,cast(0 as decimal(18, 2)) allfinshedCount,cast(0 as decimal(18, 2)) allCountPercent,cast(0 as decimal(18, 2)) allWUH, cast(0 as decimal(18, 2)) allBASF
INTO #PunchlistFromProgressTemp
from #AllPunchlistFromProgressTemp Group by System_No; ");
strSql.AppendLine(@" update a set
@@ -710,7 +711,14 @@ namespace FineUIPro.Web.Transfer.Chart
from #PunchlistFromProgressTemp a;");
-
+ strSql.AppendLine(@" update a set
+ a.Cat_A_CountPercent=(case ISNULL(a.Cat_A_Count,0) when 0 then 0 else CONVERT(DECIMAL(10,2),100*(ISNULL(a.Cat_A_Countf,0)*1.0/ISNULL(a.Cat_A_Count,0))) end ),
+ a.Cat_B_CountPercent=(case ISNULL(a.Cat_B_Count,0) when 0 then 0 else CONVERT(DECIMAL(10,2),100*(ISNULL(a.Cat_B_Countf,0)*1.0/ISNULL(a.Cat_B_Count,0))) end ),
+ a.Cat_C_CountPercent=(case ISNULL(a.Cat_C_Count,0) when 0 then 0 else CONVERT(DECIMAL(10,2),100*(ISNULL(a.Cat_C_Countf,0)*1.0/ISNULL(a.Cat_C_Count,0))) end ),
+ a.Cat_D_CountPercent=(case ISNULL(a.Cat_D_Count,0) when 0 then 0 else CONVERT(DECIMAL(10,2),100*(ISNULL(a.Cat_D_Countf,0)*1.0/ISNULL(a.Cat_D_Count,0))) end ),
+ a.allCountPercent=(case ISNULL(a.allCount,0) when 0 then 0 else CONVERT(DECIMAL(10,2),100*(ISNULL(a.allfinshedCount,0)*1.0/ISNULL(a.allCount,0))) end )
+ from #PunchlistFromProgressTemp a; ");
+
strSql.AppendLine(" select * from #PunchlistFromProgressTemp ");
List listStr = new List();
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
@@ -734,13 +742,14 @@ namespace FineUIPro.Web.Transfer.Chart
Cat_C_Countf = 0, Cat_C_CountWUH = 0, Cat_C_CountBASF = 0,
Cat_D_Countf = 0, Cat_D_CountWUH = 0, Cat_D_CountBASF = 0,
allCount = 0, allfinshedCount = 0, allWUH = 0, allBASF = 0;
+
foreach (DataRow row in tb.Rows)
{
cat_A_Count += Convert.ToInt32(row["Cat_A_Count"]);
cat_B_Count += Convert.ToInt32(row["Cat_B_Count"]);
cat_C_Count += Convert.ToInt32(row["Cat_C_Count"]);
cat_D_Count += Convert.ToInt32(row["Cat_D_Count"]);
- //
+
Cat_A_Countf += Convert.ToInt32(row["Cat_A_Countf"]);
Cat_A_CountWUH += Convert.ToInt32(row["Cat_A_CountWUH"]);
Cat_A_CountBASF += Convert.ToInt32(row["Cat_A_CountBASF"]);
@@ -763,6 +772,11 @@ namespace FineUIPro.Web.Transfer.Chart
allBASF += Convert.ToInt32(row["allBASF"]);
}
+ var Cat_A_CountPercent = 100 * ((float)Cat_A_Countf / (float)cat_A_Count);
+ var Cat_B_CountPercent = 100 * ((float)Cat_B_Countf / (float)cat_B_Count);
+ var Cat_C_CountPercent = 100 * ((float)Cat_C_Countf / (float)cat_C_Count);
+ var Cat_D_CountPercent = 100 * ((float)Cat_D_Countf / (float)cat_D_Count);
+ var allCountPercent = 100 * ((float)allfinshedCount / (float)allCount);
JObject summary = new JObject();
summary.Add("System_No", "合计");
@@ -772,27 +786,31 @@ namespace FineUIPro.Web.Transfer.Chart
summary.Add("Cat_D_Count", cat_D_Count.ToString());
summary.Add("Cat_A_Countf", Cat_A_Countf.ToString());
+ summary.Add("Cat_A_CountPercent", Cat_A_CountPercent.ToString("F2"));
summary.Add("Cat_A_CountWUH", Cat_A_CountWUH.ToString());
summary.Add("Cat_A_CountBASF", Cat_A_CountBASF.ToString());
summary.Add("Cat_B_Countf", Cat_B_Countf.ToString());
+ summary.Add("Cat_B_CountPercent", Cat_B_CountPercent.ToString("F2"));
summary.Add("Cat_B_CountWUH", Cat_B_CountWUH.ToString());
summary.Add("Cat_B_CountBASF", Cat_B_CountBASF.ToString());
summary.Add("Cat_C_Countf", Cat_C_Countf.ToString());
+ summary.Add("Cat_C_CountPercent", Cat_C_CountPercent.ToString("F2"));
summary.Add("Cat_C_CountWUH", Cat_C_CountWUH.ToString());
summary.Add("Cat_C_CountBASF", Cat_C_CountBASF.ToString());
summary.Add("Cat_D_Countf", Cat_D_Countf.ToString());
+ summary.Add("Cat_D_CountPercent", Cat_D_CountPercent.ToString("F2"));
summary.Add("Cat_D_CountWUH", Cat_D_CountWUH.ToString());
summary.Add("Cat_D_CountBASF", Cat_D_CountBASF.ToString());
summary.Add("allCount", allCount.ToString());
summary.Add("allfinshedCount", allfinshedCount.ToString());
+ summary.Add("allCountPercent", allCountPercent.ToString("F2"));
summary.Add("allWUH", allWUH.ToString());
summary.Add("allBASF", allBASF.ToString());
-
Grid3.SummaryData = summary;
}
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx b/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx
index 9fdbb1db..75552ffc 100644
--- a/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx
@@ -15,7 +15,7 @@
@@ -28,21 +28,21 @@
-
+
-
- <%--
--%>
@@ -53,17 +53,30 @@
+ FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" EnableLock="true" Locked="true" />
+ FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" EnableLock="true" Locked="true" />
+ FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" EnableLock="true" Locked="true" />
+
+
+
+
-
+
+
+
+
+
+
+
@@ -75,6 +88,19 @@
HeaderText="完成率(%)" TextAlign="Center" />
+
+
+
+
+
+
+
+
+
+
@@ -115,7 +141,7 @@
-
+
@@ -154,7 +180,7 @@
-
+ <%--
@@ -165,23 +191,31 @@
-
+ --%>
-
+
+
+
-
+
+
+ FieldType="String" />
-
-
+ <%--
@@ -192,7 +226,7 @@
-
+ --%>
-
+ <%--
@@ -211,7 +245,7 @@
-
+ --%>
-
+ FieldType="String" />
-
+ FieldType="String" />
-
+ FieldType="String" />
-
+ FieldType="String" />
-
+ FieldType="String" />
+ FieldType="String" />
-
+
@@ -261,11 +295,11 @@
-
-
diff --git a/SGGL/FineUIPro.Web/Transfer/InstrumentationDataIn.aspx.cs b/SGGL/FineUIPro.Web/Transfer/InstrumentationDataIn.aspx.cs
index 670c27aa..5a8f1225 100644
--- a/SGGL/FineUIPro.Web/Transfer/InstrumentationDataIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/InstrumentationDataIn.aspx.cs
@@ -327,12 +327,19 @@ namespace FineUIPro.Web.Transfer
model.Subsystem = pds.Rows[i][2 + 1].ToString().Trim();
model.Test_Package = pds.Rows[i][3 + 1].ToString().Trim();
- var obj0 = model.Calibration = pds.Rows[i][5].ToString().Trim();
- var obj1 = model.InstallationCalibration = pds.Rows[i][6].ToString().Trim();
- var obj2 = model.PipingPressuretest = pds.Rows[i][7].ToString().Trim();
- var obj3 = model.PipingLeak = pds.Rows[i][8].ToString().Trim();
- var obj4 = model.PipingBlowing = pds.Rows[i][9].ToString().Trim();
- var obj5 = model.Looptest = pds.Rows[i][10].ToString().Trim();
+ //var obj0 = model.Calibration = pds.Rows[i][5].ToString().Trim();
+ //var obj1 = model.InstallationCalibration = pds.Rows[i][6].ToString().Trim();
+ //var obj2 = model.PipingPressuretest = pds.Rows[i][7].ToString().Trim();
+ //var obj3 = model.PipingLeak = pds.Rows[i][8].ToString().Trim();
+ //var obj4 = model.PipingBlowing = pds.Rows[i][9].ToString().Trim();
+ //var obj5 = model.Looptest = pds.Rows[i][10].ToString().Trim();
+
+ var obj1 = model.InstallationCalibration = pds.Rows[i][5].ToString().Trim();
+ var obj2 = model.PipingPressuretest = pds.Rows[i][6].ToString().Trim();
+ var obj3 = model.PipingLeak = pds.Rows[i][7].ToString().Trim();
+ var obj4 = model.PipingBlowing = pds.Rows[i][8].ToString().Trim();
+ var obj5 = model.Looptest = pds.Rows[i][9].ToString().Trim();
+
#region 判断状态
var listObj = new List();
listObj.Add(obj1);
@@ -340,9 +347,9 @@ namespace FineUIPro.Web.Transfer
listObj.Add(obj3);
listObj.Add(obj4);
listObj.Add(obj5);
- listObj.Add(obj0);
+ //listObj.Add(obj0);
//全是NA或Completed 状态是Completed
- if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 6)
+ if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 5)
{
model.FINAL_Status = "Completed";
list.Add(model);
@@ -351,7 +358,7 @@ namespace FineUIPro.Web.Transfer
//如果全是Not Start 就是 Not Start
- if (listObj.Where(x => x == "Not Start").ToList().Count == 6)
+ if (listObj.Where(x => x == "Not Start").ToList().Count == 5)
{
model.FINAL_Status = "Not Start";
list.Add(model);
diff --git a/SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx b/SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx
index 96108c87..ee95e0a5 100644
--- a/SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx
@@ -50,12 +50,12 @@
-
+ <%--
-
+ --%>
diff --git a/SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx.cs b/SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx.cs
index f7c1eed8..80abe14c 100644
--- a/SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx.cs
@@ -60,7 +60,7 @@ namespace FineUIPro.Web.Transfer
ddlPipingLeak.SelectedValue = model.PipingLeak;
ddlPipingBlowing.SelectedValue = model.PipingBlowing;
ddlLooptest.SelectedValue = model.Looptest;
- ddlCalibration.SelectedValue = model.Calibration;
+ //ddlCalibration.SelectedValue = model.Calibration;
txtDescriptions.Text = model.Descriptions;
}
}
@@ -81,7 +81,7 @@ namespace FineUIPro.Web.Transfer
PipingLeak = ddlPipingLeak.SelectedValue,
PipingBlowing = ddlPipingBlowing.SelectedValue,
Looptest = ddlLooptest.SelectedValue,
- Calibration= ddlCalibration.SelectedValue,
+ //Calibration= ddlCalibration.SelectedValue,
Descriptions = txtDescriptions.Text
};
@@ -126,7 +126,7 @@ namespace FineUIPro.Web.Transfer
newModel.PipingLeak = ddlPipingLeak.SelectedValue;
newModel.PipingBlowing = ddlPipingBlowing.SelectedValue;
newModel.Looptest = ddlLooptest.SelectedValue;
- newModel.Calibration = ddlCalibration.SelectedValue;
+ //newModel.Calibration = ddlCalibration.SelectedValue;
newModel.FINAL_Status = model.FINAL_Status;
newModel.Descriptions = txtDescriptions.Text;
}
diff --git a/SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx.designer.cs
index 2f84802f..2f26b40a 100644
--- a/SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx.designer.cs
@@ -86,15 +86,6 @@ namespace FineUIPro.Web.Transfer
///
protected global::FineUIPro.TextBox txtDescriptions;
- ///
- /// ddlCalibration 控件。
- ///
- ///
- /// 自动生成的字段。
- /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
- ///
- protected global::FineUIPro.DropDownList ddlCalibration;
-
///
/// ddlInstallationCalibration 控件。
///
diff --git a/SGGL/FineUIPro.Web/Transfer/Piping.aspx b/SGGL/FineUIPro.Web/Transfer/Piping.aspx
index 260ce638..73b1959c 100644
--- a/SGGL/FineUIPro.Web/Transfer/Piping.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/Piping.aspx
@@ -27,17 +27,17 @@
-
-
-
-
+
+
+
+
-
+
@@ -49,21 +49,21 @@
+ HeaderTextAlign="Center" MinWidth="220px">
-
-
+
+
-
--%>
-
+ <%--
@@ -110,9 +110,9 @@
HeaderTextAlign="Center" Width="120px">
-
+ --%>
-
+ <%--
@@ -126,9 +126,45 @@
HeaderTextAlign="Center" Width="150px">
+ --%>
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -164,7 +200,7 @@
-
+ <%----%>
@@ -63,7 +63,7 @@
-
+ <%----%>
@@ -78,7 +78,7 @@
-
+ <%--
@@ -102,7 +102,7 @@
-
+ --%>
diff --git a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.cs b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.cs
index 2c47563e..b7e95582 100644
--- a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.cs
@@ -62,36 +62,36 @@ namespace FineUIPro.Web.Transfer
strSql += " AND Sub_Sys_No like @Sub_Sys_No";
listStr.Add(new SqlParameter("@Sub_Sys_No", "%" + this.txtSub_Sys_No.Text.Trim() + "%"));
}
- if (!string.IsNullOrEmpty(txtStartDate_Raised.Text.Trim()))
- {
- strSql += " AND Date_Raised >= @StartDate_Raised";
- listStr.Add(new SqlParameter("@StartDate_Raised", Funs.GetNewDateTime(txtStartDate_Raised.Text.Trim())));
- }
- if (!string.IsNullOrEmpty(txtEndDate_Raised.Text.Trim()))
- {
- strSql += " AND Date_Raised <= @EndDate_Raised";
- listStr.Add(new SqlParameter("@EndDate_Raised", Funs.GetNewDateTime(txtEndDate_Raised.Text.Trim())));
- }
- if (!string.IsNullOrEmpty(txtStartRequired_Date.Text.Trim()))
- {
- strSql += " AND Required_Date >= @StartRequired_Date";
- listStr.Add(new SqlParameter("@StartRequired_Date", Funs.GetNewDateTime(txtStartRequired_Date.Text.Trim())));
- }
- if (!string.IsNullOrEmpty(txtEndRequired_Date.Text.Trim()))
- {
- strSql += " AND Required_Date <= @EndRequired_Date";
- listStr.Add(new SqlParameter("@EndRequired_Date", Funs.GetNewDateTime(txtEndRequired_Date.Text.Trim())));
- }
- if (!string.IsNullOrEmpty(txtStartActual_Date.Text.Trim()))
- {
- strSql += " AND Actual_Date >= @StartActual_Date";
- listStr.Add(new SqlParameter("@StartActual_Date", Funs.GetNewDateTime(txtStartActual_Date.Text.Trim())));
- }
- if (!string.IsNullOrEmpty(txtEndActual_Date.Text.Trim()))
- {
- strSql += " AND Actual_Date <= @EndActual_Date";
- listStr.Add(new SqlParameter("@EndActual_Date", Funs.GetNewDateTime(txtEndActual_Date.Text.Trim())));
- }
+ //if (!string.IsNullOrEmpty(txtStartDate_Raised.Text.Trim()))
+ //{
+ // strSql += " AND Date_Raised >= @StartDate_Raised";
+ // listStr.Add(new SqlParameter("@StartDate_Raised", Funs.GetNewDateTime(txtStartDate_Raised.Text.Trim())));
+ //}
+ //if (!string.IsNullOrEmpty(txtEndDate_Raised.Text.Trim()))
+ //{
+ // strSql += " AND Date_Raised <= @EndDate_Raised";
+ // listStr.Add(new SqlParameter("@EndDate_Raised", Funs.GetNewDateTime(txtEndDate_Raised.Text.Trim())));
+ //}
+ //if (!string.IsNullOrEmpty(txtStartRequired_Date.Text.Trim()))
+ //{
+ // strSql += " AND Required_Date >= @StartRequired_Date";
+ // listStr.Add(new SqlParameter("@StartRequired_Date", Funs.GetNewDateTime(txtStartRequired_Date.Text.Trim())));
+ //}
+ //if (!string.IsNullOrEmpty(txtEndRequired_Date.Text.Trim()))
+ //{
+ // strSql += " AND Required_Date <= @EndRequired_Date";
+ // listStr.Add(new SqlParameter("@EndRequired_Date", Funs.GetNewDateTime(txtEndRequired_Date.Text.Trim())));
+ //}
+ //if (!string.IsNullOrEmpty(txtStartActual_Date.Text.Trim()))
+ //{
+ // strSql += " AND Actual_Date >= @StartActual_Date";
+ // listStr.Add(new SqlParameter("@StartActual_Date", Funs.GetNewDateTime(txtStartActual_Date.Text.Trim())));
+ //}
+ //if (!string.IsNullOrEmpty(txtEndActual_Date.Text.Trim()))
+ //{
+ // strSql += " AND Actual_Date <= @EndActual_Date";
+ // listStr.Add(new SqlParameter("@EndActual_Date", Funs.GetNewDateTime(txtEndActual_Date.Text.Trim())));
+ //}
if (!string.IsNullOrEmpty(txtDisc.Text.Trim()))
{
strSql += " AND Disc = @Disc";
@@ -117,11 +117,11 @@ namespace FineUIPro.Web.Transfer
strSql += " AND Cat = @Cat";
listStr.Add(new SqlParameter("@Cat", ddlCat.SelectedValue.Trim()));
}
- if (!string.IsNullOrEmpty(txtAction_By.Text.Trim()))
- {
- strSql += " AND Action_By = @Action_By";
- listStr.Add(new SqlParameter("@Action_By", txtAction_By.Text.Trim()));
- }
+ //if (!string.IsNullOrEmpty(txtAction_By.Text.Trim()))
+ //{
+ // strSql += " AND Action_By = @Action_By";
+ // listStr.Add(new SqlParameter("@Action_By", txtAction_By.Text.Trim()));
+ //}
if (!string.IsNullOrEmpty(txtPIC.Text.Trim()))
{
strSql += " AND PIC = @PIC";
diff --git a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.designer.cs
index 043fe382..f4f8bceb 100644
--- a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.designer.cs
@@ -167,15 +167,6 @@ namespace FineUIPro.Web.Transfer
///
protected global::FineUIPro.DropDownList ddlPunchType;
- ///
- /// txtAction_By 控件。
- ///
- ///
- /// 自动生成的字段。
- /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
- ///
- protected global::FineUIPro.TextBox txtAction_By;
-
///
/// txtPIC 控件。
///
@@ -212,96 +203,6 @@ namespace FineUIPro.Web.Transfer
///
protected global::FineUIPro.Button btnOut;
- ///
- /// Toolbar1 控件。
- ///
- ///
- /// 自动生成的字段。
- /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
- ///
- protected global::FineUIPro.Toolbar Toolbar1;
-
- ///
- /// txtStartDate_Raised 控件。
- ///
- ///
- /// 自动生成的字段。
- /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
- ///
- protected global::FineUIPro.DatePicker txtStartDate_Raised;
-
- ///
- /// Label1 控件。
- ///
- ///
- /// 自动生成的字段。
- /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
- ///
- protected global::FineUIPro.Label Label1;
-
- ///
- /// txtEndDate_Raised 控件。
- ///
- ///
- /// 自动生成的字段。
- /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
- ///
- protected global::FineUIPro.DatePicker txtEndDate_Raised;
-
- ///
- /// txtStartRequired_Date 控件。
- ///
- ///
- /// 自动生成的字段。
- /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
- ///
- protected global::FineUIPro.DatePicker txtStartRequired_Date;
-
- ///
- /// Label2 控件。
- ///
- ///
- /// 自动生成的字段。
- /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
- ///
- protected global::FineUIPro.Label Label2;
-
- ///
- /// txtEndRequired_Date 控件。
- ///
- ///
- /// 自动生成的字段。
- /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
- ///
- protected global::FineUIPro.DatePicker txtEndRequired_Date;
-
- ///
- /// txtStartActual_Date 控件。
- ///
- ///
- /// 自动生成的字段。
- /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
- ///
- protected global::FineUIPro.DatePicker txtStartActual_Date;
-
- ///
- /// Label3 控件。
- ///
- ///
- /// 自动生成的字段。
- /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
- ///
- protected global::FineUIPro.Label Label3;
-
- ///
- /// txtEndActual_Date 控件。
- ///
- ///
- /// 自动生成的字段。
- /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
- ///
- protected global::FineUIPro.DatePicker txtEndActual_Date;
-
///
/// lbPhotoesImageUrl 控件。
///
diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs
index f436b9c9..5bf4a81c 100644
--- a/SGGL/Model/Model.cs
+++ b/SGGL/Model/Model.cs
@@ -1925,6 +1925,15 @@ namespace Model
partial void InsertProject_Sys_Set(Project_Sys_Set instance);
partial void UpdateProject_Sys_Set(Project_Sys_Set instance);
partial void DeleteProject_Sys_Set(Project_Sys_Set instance);
+ partial void InsertProject_Wbsconstruct(Project_Wbsconstruct instance);
+ partial void UpdateProject_Wbsconstruct(Project_Wbsconstruct instance);
+ partial void DeleteProject_Wbsconstruct(Project_Wbsconstruct instance);
+ partial void InsertProject_Wbsconstruct_Construct(Project_Wbsconstruct_Construct instance);
+ partial void UpdateProject_Wbsconstruct_Construct(Project_Wbsconstruct_Construct instance);
+ partial void DeleteProject_Wbsconstruct_Construct(Project_Wbsconstruct_Construct instance);
+ partial void InsertProject_Wbsconstruct_Package(Project_Wbsconstruct_Package instance);
+ partial void UpdateProject_Wbsconstruct_Package(Project_Wbsconstruct_Package instance);
+ partial void DeleteProject_Wbsconstruct_Package(Project_Wbsconstruct_Package instance);
partial void InsertProjectAccident_AccidentAnalysis(ProjectAccident_AccidentAnalysis instance);
partial void UpdateProjectAccident_AccidentAnalysis(ProjectAccident_AccidentAnalysis instance);
partial void DeleteProjectAccident_AccidentAnalysis(ProjectAccident_AccidentAnalysis instance);
@@ -7831,6 +7840,30 @@ namespace Model
}
}
+ public System.Data.Linq.Table Project_Wbsconstruct
+ {
+ get
+ {
+ return this.GetTable();
+ }
+ }
+
+ public System.Data.Linq.Table Project_Wbsconstruct_Construct
+ {
+ get
+ {
+ return this.GetTable();
+ }
+ }
+
+ public System.Data.Linq.Table Project_Wbsconstruct_Package
+ {
+ get
+ {
+ return this.GetTable();
+ }
+ }
+
public System.Data.Linq.Table ProjectAccident_AccidentAnalysis
{
get
@@ -101510,7 +101543,7 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitWorkId", DbType="NVarChar(500)")]
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitWorkId", DbType="NVarChar(2000)")]
public string UnitWorkId
{
get
@@ -302196,6 +302229,768 @@ namespace Model
}
}
+ [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Project_Wbsconstruct")]
+ public partial class Project_Wbsconstruct : INotifyPropertyChanging, INotifyPropertyChanged
+ {
+
+ private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
+
+ private string _Id;
+
+ private string _ProjectId;
+
+ private string _ParentId;
+
+ private string _ItemName;
+
+ private string _ItemNum;
+
+ private string _PathCode;
+
+ private System.Nullable _PlanEnd;
+
+ private System.Nullable _PlanStart;
+
+ private System.Nullable _RealityEnd;
+
+ private string _ItemLevel;
+
+ #region 可扩展性方法定义
+ partial void OnLoaded();
+ partial void OnValidate(System.Data.Linq.ChangeAction action);
+ partial void OnCreated();
+ partial void OnIdChanging(string value);
+ partial void OnIdChanged();
+ partial void OnProjectIdChanging(string value);
+ partial void OnProjectIdChanged();
+ partial void OnParentIdChanging(string value);
+ partial void OnParentIdChanged();
+ partial void OnItemNameChanging(string value);
+ partial void OnItemNameChanged();
+ partial void OnItemNumChanging(string value);
+ partial void OnItemNumChanged();
+ partial void OnPathCodeChanging(string value);
+ partial void OnPathCodeChanged();
+ partial void OnPlanEndChanging(System.Nullable value);
+ partial void OnPlanEndChanged();
+ partial void OnPlanStartChanging(System.Nullable value);
+ partial void OnPlanStartChanged();
+ partial void OnRealityEndChanging(System.Nullable value);
+ partial void OnRealityEndChanged();
+ partial void OnItemLevelChanging(string value);
+ partial void OnItemLevelChanged();
+ #endregion
+
+ public Project_Wbsconstruct()
+ {
+ OnCreated();
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Id", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
+ public string Id
+ {
+ get
+ {
+ return this._Id;
+ }
+ set
+ {
+ if ((this._Id != value))
+ {
+ this.OnIdChanging(value);
+ this.SendPropertyChanging();
+ this._Id = value;
+ this.SendPropertyChanged("Id");
+ this.OnIdChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")]
+ public string ProjectId
+ {
+ get
+ {
+ return this._ProjectId;
+ }
+ set
+ {
+ if ((this._ProjectId != value))
+ {
+ this.OnProjectIdChanging(value);
+ this.SendPropertyChanging();
+ this._ProjectId = value;
+ this.SendPropertyChanged("ProjectId");
+ this.OnProjectIdChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ParentId", DbType="NVarChar(50)")]
+ public string ParentId
+ {
+ get
+ {
+ return this._ParentId;
+ }
+ set
+ {
+ if ((this._ParentId != value))
+ {
+ this.OnParentIdChanging(value);
+ this.SendPropertyChanging();
+ this._ParentId = value;
+ this.SendPropertyChanged("ParentId");
+ this.OnParentIdChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ItemName", DbType="NVarChar(50)")]
+ public string ItemName
+ {
+ get
+ {
+ return this._ItemName;
+ }
+ set
+ {
+ if ((this._ItemName != value))
+ {
+ this.OnItemNameChanging(value);
+ this.SendPropertyChanging();
+ this._ItemName = value;
+ this.SendPropertyChanged("ItemName");
+ this.OnItemNameChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ItemNum", DbType="NVarChar(50)")]
+ public string ItemNum
+ {
+ get
+ {
+ return this._ItemNum;
+ }
+ set
+ {
+ if ((this._ItemNum != value))
+ {
+ this.OnItemNumChanging(value);
+ this.SendPropertyChanging();
+ this._ItemNum = value;
+ this.SendPropertyChanged("ItemNum");
+ this.OnItemNumChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PathCode", DbType="NVarChar(50)")]
+ public string PathCode
+ {
+ get
+ {
+ return this._PathCode;
+ }
+ set
+ {
+ if ((this._PathCode != value))
+ {
+ this.OnPathCodeChanging(value);
+ this.SendPropertyChanging();
+ this._PathCode = value;
+ this.SendPropertyChanged("PathCode");
+ this.OnPathCodeChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PlanEnd", DbType="DateTime")]
+ public System.Nullable PlanEnd
+ {
+ get
+ {
+ return this._PlanEnd;
+ }
+ set
+ {
+ if ((this._PlanEnd != value))
+ {
+ this.OnPlanEndChanging(value);
+ this.SendPropertyChanging();
+ this._PlanEnd = value;
+ this.SendPropertyChanged("PlanEnd");
+ this.OnPlanEndChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PlanStart", DbType="DateTime")]
+ public System.Nullable PlanStart
+ {
+ get
+ {
+ return this._PlanStart;
+ }
+ set
+ {
+ if ((this._PlanStart != value))
+ {
+ this.OnPlanStartChanging(value);
+ this.SendPropertyChanging();
+ this._PlanStart = value;
+ this.SendPropertyChanged("PlanStart");
+ this.OnPlanStartChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RealityEnd", DbType="DateTime")]
+ public System.Nullable RealityEnd
+ {
+ get
+ {
+ return this._RealityEnd;
+ }
+ set
+ {
+ if ((this._RealityEnd != value))
+ {
+ this.OnRealityEndChanging(value);
+ this.SendPropertyChanging();
+ this._RealityEnd = value;
+ this.SendPropertyChanged("RealityEnd");
+ this.OnRealityEndChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ItemLevel", DbType="NVarChar(50)")]
+ public string ItemLevel
+ {
+ get
+ {
+ return this._ItemLevel;
+ }
+ set
+ {
+ if ((this._ItemLevel != value))
+ {
+ this.OnItemLevelChanging(value);
+ this.SendPropertyChanging();
+ this._ItemLevel = value;
+ this.SendPropertyChanged("ItemLevel");
+ this.OnItemLevelChanged();
+ }
+ }
+ }
+
+ public event PropertyChangingEventHandler PropertyChanging;
+
+ public event PropertyChangedEventHandler PropertyChanged;
+
+ protected virtual void SendPropertyChanging()
+ {
+ if ((this.PropertyChanging != null))
+ {
+ this.PropertyChanging(this, emptyChangingEventArgs);
+ }
+ }
+
+ protected virtual void SendPropertyChanged(String propertyName)
+ {
+ if ((this.PropertyChanged != null))
+ {
+ this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Project_Wbsconstruct_Construct")]
+ public partial class Project_Wbsconstruct_Construct : INotifyPropertyChanging, INotifyPropertyChanged
+ {
+
+ private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
+
+ private string _Id;
+
+ private string _WorkPackageId;
+
+ private string _Name;
+
+ private System.Nullable _PlanEnd;
+
+ private System.Nullable _RealityEnd;
+
+ private string _CheckIndex;
+
+ private System.Nullable _Check37curPercent;
+
+ private System.Nullable _Check37Percent;
+
+ #region 可扩展性方法定义
+ partial void OnLoaded();
+ partial void OnValidate(System.Data.Linq.ChangeAction action);
+ partial void OnCreated();
+ partial void OnIdChanging(string value);
+ partial void OnIdChanged();
+ partial void OnWorkPackageIdChanging(string value);
+ partial void OnWorkPackageIdChanged();
+ partial void OnNameChanging(string value);
+ partial void OnNameChanged();
+ partial void OnPlanEndChanging(System.Nullable value);
+ partial void OnPlanEndChanged();
+ partial void OnRealityEndChanging(System.Nullable value);
+ partial void OnRealityEndChanged();
+ partial void OnCheckIndexChanging(string value);
+ partial void OnCheckIndexChanged();
+ partial void OnCheck37curPercentChanging(System.Nullable value);
+ partial void OnCheck37curPercentChanged();
+ partial void OnCheck37PercentChanging(System.Nullable value);
+ partial void OnCheck37PercentChanged();
+ #endregion
+
+ public Project_Wbsconstruct_Construct()
+ {
+ OnCreated();
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Id", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
+ public string Id
+ {
+ get
+ {
+ return this._Id;
+ }
+ set
+ {
+ if ((this._Id != value))
+ {
+ this.OnIdChanging(value);
+ this.SendPropertyChanging();
+ this._Id = value;
+ this.SendPropertyChanged("Id");
+ this.OnIdChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageId", DbType="NVarChar(50)")]
+ public string WorkPackageId
+ {
+ get
+ {
+ return this._WorkPackageId;
+ }
+ set
+ {
+ if ((this._WorkPackageId != value))
+ {
+ this.OnWorkPackageIdChanging(value);
+ this.SendPropertyChanging();
+ this._WorkPackageId = value;
+ this.SendPropertyChanged("WorkPackageId");
+ this.OnWorkPackageIdChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Name", DbType="NVarChar(50)")]
+ public string Name
+ {
+ get
+ {
+ return this._Name;
+ }
+ set
+ {
+ if ((this._Name != value))
+ {
+ this.OnNameChanging(value);
+ this.SendPropertyChanging();
+ this._Name = value;
+ this.SendPropertyChanged("Name");
+ this.OnNameChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PlanEnd", DbType="DateTime")]
+ public System.Nullable PlanEnd
+ {
+ get
+ {
+ return this._PlanEnd;
+ }
+ set
+ {
+ if ((this._PlanEnd != value))
+ {
+ this.OnPlanEndChanging(value);
+ this.SendPropertyChanging();
+ this._PlanEnd = value;
+ this.SendPropertyChanged("PlanEnd");
+ this.OnPlanEndChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RealityEnd", DbType="DateTime")]
+ public System.Nullable RealityEnd
+ {
+ get
+ {
+ return this._RealityEnd;
+ }
+ set
+ {
+ if ((this._RealityEnd != value))
+ {
+ this.OnRealityEndChanging(value);
+ this.SendPropertyChanging();
+ this._RealityEnd = value;
+ this.SendPropertyChanged("RealityEnd");
+ this.OnRealityEndChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CheckIndex", DbType="NVarChar(50)")]
+ public string CheckIndex
+ {
+ get
+ {
+ return this._CheckIndex;
+ }
+ set
+ {
+ if ((this._CheckIndex != value))
+ {
+ this.OnCheckIndexChanging(value);
+ this.SendPropertyChanging();
+ this._CheckIndex = value;
+ this.SendPropertyChanged("CheckIndex");
+ this.OnCheckIndexChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Check37curPercent", DbType="Float")]
+ public System.Nullable Check37curPercent
+ {
+ get
+ {
+ return this._Check37curPercent;
+ }
+ set
+ {
+ if ((this._Check37curPercent != value))
+ {
+ this.OnCheck37curPercentChanging(value);
+ this.SendPropertyChanging();
+ this._Check37curPercent = value;
+ this.SendPropertyChanged("Check37curPercent");
+ this.OnCheck37curPercentChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Check37Percent", DbType="Float")]
+ public System.Nullable Check37Percent
+ {
+ get
+ {
+ return this._Check37Percent;
+ }
+ set
+ {
+ if ((this._Check37Percent != value))
+ {
+ this.OnCheck37PercentChanging(value);
+ this.SendPropertyChanging();
+ this._Check37Percent = value;
+ this.SendPropertyChanged("Check37Percent");
+ this.OnCheck37PercentChanged();
+ }
+ }
+ }
+
+ public event PropertyChangingEventHandler PropertyChanging;
+
+ public event PropertyChangedEventHandler PropertyChanged;
+
+ protected virtual void SendPropertyChanging()
+ {
+ if ((this.PropertyChanging != null))
+ {
+ this.PropertyChanging(this, emptyChangingEventArgs);
+ }
+ }
+
+ protected virtual void SendPropertyChanged(String propertyName)
+ {
+ if ((this.PropertyChanged != null))
+ {
+ this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Project_Wbsconstruct_Package")]
+ public partial class Project_Wbsconstruct_Package : INotifyPropertyChanging, INotifyPropertyChanged
+ {
+
+ private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
+
+ private string _Id;
+
+ private string _WorkPackageCode;
+
+ private string _WorkPackageName;
+
+ private System.Nullable _PlanQuantities;
+
+ private System.Nullable _TotalNum;
+
+ private System.Nullable _CurNum;
+
+ private System.Nullable _CurPercent;
+
+ private System.Nullable _PercentTotal;
+
+ private System.Nullable _CreateTime;
+
+ #region 可扩展性方法定义
+ partial void OnLoaded();
+ partial void OnValidate(System.Data.Linq.ChangeAction action);
+ partial void OnCreated();
+ partial void OnIdChanging(string value);
+ partial void OnIdChanged();
+ partial void OnWorkPackageCodeChanging(string value);
+ partial void OnWorkPackageCodeChanged();
+ partial void OnWorkPackageNameChanging(string value);
+ partial void OnWorkPackageNameChanged();
+ partial void OnPlanQuantitiesChanging(System.Nullable value);
+ partial void OnPlanQuantitiesChanged();
+ partial void OnTotalNumChanging(System.Nullable value);
+ partial void OnTotalNumChanged();
+ partial void OnCurNumChanging(System.Nullable value);
+ partial void OnCurNumChanged();
+ partial void OnCurPercentChanging(System.Nullable value);
+ partial void OnCurPercentChanged();
+ partial void OnPercentTotalChanging(System.Nullable value);
+ partial void OnPercentTotalChanged();
+ partial void OnCreateTimeChanging(System.Nullable value);
+ partial void OnCreateTimeChanged();
+ #endregion
+
+ public Project_Wbsconstruct_Package()
+ {
+ OnCreated();
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Id", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
+ public string Id
+ {
+ get
+ {
+ return this._Id;
+ }
+ set
+ {
+ if ((this._Id != value))
+ {
+ this.OnIdChanging(value);
+ this.SendPropertyChanging();
+ this._Id = value;
+ this.SendPropertyChanged("Id");
+ this.OnIdChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageCode", DbType="NVarChar(50)")]
+ public string WorkPackageCode
+ {
+ get
+ {
+ return this._WorkPackageCode;
+ }
+ set
+ {
+ if ((this._WorkPackageCode != value))
+ {
+ this.OnWorkPackageCodeChanging(value);
+ this.SendPropertyChanging();
+ this._WorkPackageCode = value;
+ this.SendPropertyChanged("WorkPackageCode");
+ this.OnWorkPackageCodeChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageName", DbType="NVarChar(50)")]
+ public string WorkPackageName
+ {
+ get
+ {
+ return this._WorkPackageName;
+ }
+ set
+ {
+ if ((this._WorkPackageName != value))
+ {
+ this.OnWorkPackageNameChanging(value);
+ this.SendPropertyChanging();
+ this._WorkPackageName = value;
+ this.SendPropertyChanged("WorkPackageName");
+ this.OnWorkPackageNameChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PlanQuantities", DbType="Decimal(18,2)")]
+ public System.Nullable PlanQuantities
+ {
+ get
+ {
+ return this._PlanQuantities;
+ }
+ set
+ {
+ if ((this._PlanQuantities != value))
+ {
+ this.OnPlanQuantitiesChanging(value);
+ this.SendPropertyChanging();
+ this._PlanQuantities = value;
+ this.SendPropertyChanged("PlanQuantities");
+ this.OnPlanQuantitiesChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TotalNum", DbType="Decimal(18,2)")]
+ public System.Nullable TotalNum
+ {
+ get
+ {
+ return this._TotalNum;
+ }
+ set
+ {
+ if ((this._TotalNum != value))
+ {
+ this.OnTotalNumChanging(value);
+ this.SendPropertyChanging();
+ this._TotalNum = value;
+ this.SendPropertyChanged("TotalNum");
+ this.OnTotalNumChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CurNum", DbType="Decimal(18,2)")]
+ public System.Nullable CurNum
+ {
+ get
+ {
+ return this._CurNum;
+ }
+ set
+ {
+ if ((this._CurNum != value))
+ {
+ this.OnCurNumChanging(value);
+ this.SendPropertyChanging();
+ this._CurNum = value;
+ this.SendPropertyChanged("CurNum");
+ this.OnCurNumChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CurPercent", DbType="Float")]
+ public System.Nullable CurPercent
+ {
+ get
+ {
+ return this._CurPercent;
+ }
+ set
+ {
+ if ((this._CurPercent != value))
+ {
+ this.OnCurPercentChanging(value);
+ this.SendPropertyChanging();
+ this._CurPercent = value;
+ this.SendPropertyChanged("CurPercent");
+ this.OnCurPercentChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PercentTotal", DbType="Float")]
+ public System.Nullable PercentTotal
+ {
+ get
+ {
+ return this._PercentTotal;
+ }
+ set
+ {
+ if ((this._PercentTotal != value))
+ {
+ this.OnPercentTotalChanging(value);
+ this.SendPropertyChanging();
+ this._PercentTotal = value;
+ this.SendPropertyChanged("PercentTotal");
+ this.OnPercentTotalChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CreateTime", DbType="DateTime")]
+ public System.Nullable CreateTime
+ {
+ get
+ {
+ return this._CreateTime;
+ }
+ set
+ {
+ if ((this._CreateTime != value))
+ {
+ this.OnCreateTimeChanging(value);
+ this.SendPropertyChanging();
+ this._CreateTime = value;
+ this.SendPropertyChanged("CreateTime");
+ this.OnCreateTimeChanged();
+ }
+ }
+ }
+
+ public event PropertyChangingEventHandler PropertyChanging;
+
+ public event PropertyChangedEventHandler PropertyChanged;
+
+ protected virtual void SendPropertyChanging()
+ {
+ if ((this.PropertyChanging != null))
+ {
+ this.PropertyChanging(this, emptyChangingEventArgs);
+ }
+ }
+
+ protected virtual void SendPropertyChanged(String propertyName)
+ {
+ if ((this.PropertyChanged != null))
+ {
+ this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+ }
+ }
+ }
+
[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.ProjectAccident_AccidentAnalysis")]
public partial class ProjectAccident_AccidentAnalysis : INotifyPropertyChanging, INotifyPropertyChanged
{
@@ -396793,6 +397588,22 @@ namespace Model
private string _Descriptions;
+ private string _TotalFactor;
+
+ private string _CompleteFactor;
+
+ private string _CompleteProportion;
+
+ private string _PressureTestCompleted;
+
+ private string _RinseAndBlowClean;
+
+ private string _Reduction;
+
+ private string _ElectricHeatTracing;
+
+ private string _Insulation;
+
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -396843,6 +397654,22 @@ namespace Model
partial void OnBlowingReportChanged();
partial void OnDescriptionsChanging(string value);
partial void OnDescriptionsChanged();
+ partial void OnTotalFactorChanging(string value);
+ partial void OnTotalFactorChanged();
+ partial void OnCompleteFactorChanging(string value);
+ partial void OnCompleteFactorChanged();
+ partial void OnCompleteProportionChanging(string value);
+ partial void OnCompleteProportionChanged();
+ partial void OnPressureTestCompletedChanging(string value);
+ partial void OnPressureTestCompletedChanged();
+ partial void OnRinseAndBlowCleanChanging(string value);
+ partial void OnRinseAndBlowCleanChanged();
+ partial void OnReductionChanging(string value);
+ partial void OnReductionChanged();
+ partial void OnElectricHeatTracingChanging(string value);
+ partial void OnElectricHeatTracingChanged();
+ partial void OnInsulationChanging(string value);
+ partial void OnInsulationChanged();
#endregion
public Transfer_Piping()
@@ -397310,6 +398137,166 @@ namespace Model
}
}
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TotalFactor", DbType="NVarChar(50)")]
+ public string TotalFactor
+ {
+ get
+ {
+ return this._TotalFactor;
+ }
+ set
+ {
+ if ((this._TotalFactor != value))
+ {
+ this.OnTotalFactorChanging(value);
+ this.SendPropertyChanging();
+ this._TotalFactor = value;
+ this.SendPropertyChanged("TotalFactor");
+ this.OnTotalFactorChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompleteFactor", DbType="NVarChar(50)")]
+ public string CompleteFactor
+ {
+ get
+ {
+ return this._CompleteFactor;
+ }
+ set
+ {
+ if ((this._CompleteFactor != value))
+ {
+ this.OnCompleteFactorChanging(value);
+ this.SendPropertyChanging();
+ this._CompleteFactor = value;
+ this.SendPropertyChanged("CompleteFactor");
+ this.OnCompleteFactorChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompleteProportion", DbType="NVarChar(50)")]
+ public string CompleteProportion
+ {
+ get
+ {
+ return this._CompleteProportion;
+ }
+ set
+ {
+ if ((this._CompleteProportion != value))
+ {
+ this.OnCompleteProportionChanging(value);
+ this.SendPropertyChanging();
+ this._CompleteProportion = value;
+ this.SendPropertyChanged("CompleteProportion");
+ this.OnCompleteProportionChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PressureTestCompleted", DbType="NVarChar(50)")]
+ public string PressureTestCompleted
+ {
+ get
+ {
+ return this._PressureTestCompleted;
+ }
+ set
+ {
+ if ((this._PressureTestCompleted != value))
+ {
+ this.OnPressureTestCompletedChanging(value);
+ this.SendPropertyChanging();
+ this._PressureTestCompleted = value;
+ this.SendPropertyChanged("PressureTestCompleted");
+ this.OnPressureTestCompletedChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RinseAndBlowClean", DbType="NVarChar(50)")]
+ public string RinseAndBlowClean
+ {
+ get
+ {
+ return this._RinseAndBlowClean;
+ }
+ set
+ {
+ if ((this._RinseAndBlowClean != value))
+ {
+ this.OnRinseAndBlowCleanChanging(value);
+ this.SendPropertyChanging();
+ this._RinseAndBlowClean = value;
+ this.SendPropertyChanged("RinseAndBlowClean");
+ this.OnRinseAndBlowCleanChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Reduction", DbType="NVarChar(50)")]
+ public string Reduction
+ {
+ get
+ {
+ return this._Reduction;
+ }
+ set
+ {
+ if ((this._Reduction != value))
+ {
+ this.OnReductionChanging(value);
+ this.SendPropertyChanging();
+ this._Reduction = value;
+ this.SendPropertyChanged("Reduction");
+ this.OnReductionChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ElectricHeatTracing", DbType="NVarChar(50)")]
+ public string ElectricHeatTracing
+ {
+ get
+ {
+ return this._ElectricHeatTracing;
+ }
+ set
+ {
+ if ((this._ElectricHeatTracing != value))
+ {
+ this.OnElectricHeatTracingChanging(value);
+ this.SendPropertyChanging();
+ this._ElectricHeatTracing = value;
+ this.SendPropertyChanged("ElectricHeatTracing");
+ this.OnElectricHeatTracingChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Insulation", DbType="NVarChar(50)")]
+ public string Insulation
+ {
+ get
+ {
+ return this._Insulation;
+ }
+ set
+ {
+ if ((this._Insulation != value))
+ {
+ this.OnInsulationChanging(value);
+ this.SendPropertyChanging();
+ this._Insulation = value;
+ this.SendPropertyChanged("Insulation");
+ this.OnInsulationChanged();
+ }
+ }
+ }
+
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;
From 625f1860efc0781ffb8b5b0b60631cc24634d5dc Mon Sep 17 00:00:00 2001
From: "754998852@qq.com" <754998852@qq.com>
Date: Fri, 1 Nov 2024 09:52:54 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?=
=?UTF-8?q?=E7=9C=8B=E6=9D=BF=E5=9C=A8=E7=BA=BF=E4=BA=BA=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
SGGL/FineUIPro.Web/common/mainProject2.aspx.cs | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs b/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs
index 1bd00c04..f2606cd6 100644
--- a/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs
+++ b/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs
@@ -140,8 +140,16 @@ namespace FineUIPro.Web.common
{
int AllCount = 0;
int MCount = 0;
- var getallin = APIPageDataService.getPersonNum(ProjectId, DateTime.Now);
- AllCount = getallin.Count();
+ //修改日期2024-10-30 16:53:50 为了和另一个看板相同
+ //Funs.DB.T_d_EmployInOutRecord.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.RecordDate.Value == DateTime.Now.Date)
+ //var getallin = APIPageDataService.getPersonNum(ProjectId, DateTime.Now);
+
+ var getallin = from x in Funs.DB.T_d_EmployInOutRecord
+ join z in Funs.DB.Base_WorkPost on x.PostId equals z.WorkPostId
+ where x.ProjectId == this.CurrUser.LoginProjectId && x.RecordDate.Value == DateTime.Now.Date
+ select new { z.PostType };
+
+ AllCount = getallin.Count();
if (AllCount > 0)
{
MCount = getallin.Where(x => x.PostType == Const.PostType_1).Count();
From b7c3b93e0d0319445d16d8ace88ef1f92569c7f3 Mon Sep 17 00:00:00 2001
From: liuhui11 <934408429@qq.com>
Date: Fri, 1 Nov 2024 14:29:55 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=E7=A7=BB=E4=BA=A4=E7=AE=A1=E7=90=86?=
=?UTF-8?q?=E8=A1=A8=E5=88=97=E5=AE=BD=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
SGGL/FineUIPro.Web/ErrLog.txt | 69 +++++++++++++++++++++
SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 2 +-
SGGL/FineUIPro.Web/Web.config | 4 +-
SGGL/FineUIPro.Web/common/Menu_CQMS.xml | 3 +-
SGGL/FineUIPro.Web/common/Menu_Transfer.xml | 30 +++++----
5 files changed, 87 insertions(+), 21 deletions(-)
diff --git a/SGGL/FineUIPro.Web/ErrLog.txt b/SGGL/FineUIPro.Web/ErrLog.txt
index 1479e4c1..aed81f67 100644
--- a/SGGL/FineUIPro.Web/ErrLog.txt
+++ b/SGGL/FineUIPro.Web/ErrLog.txt
@@ -1235,3 +1235,72 @@ IP地址:::1
出错时间:10/26/2024 15:49:59
+
+错误信息开始=====>
+错误类型:HttpParseException
+错误信息:未能加载文件或程序集“Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed”或它的某一个依赖项。找到的程序集清单定义与程序集引用不匹配。 (异常来自 HRESULT:0x80131040)
+错误堆栈:
+ 在 System.Web.UI.TemplateParser.ProcessException(Exception ex)
+ 在 System.Web.UI.TemplateParser.ParseStringInternal(String text, Encoding fileEncoding)
+ 在 System.Web.UI.TemplateParser.ParseString(String text, VirtualPath virtualPath, Encoding fileEncoding)
+----错误类型:FileLoadException
+----错误信息:
+----未能加载文件或程序集“Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed”或它的某一个依赖项。找到的程序集清单定义与程序集引用不匹配。 (异常来自 HRESULT:0x80131040)
+----错误堆栈:
+ 在 System.Signature.GetSignature(Void* pCorSig, Int32 cCorSig, RuntimeFieldHandleInternal fieldHandle, IRuntimeMethodInfo methodHandle, RuntimeType declaringType)
+ 在 System.Reflection.RuntimeMethodInfo.FetchNonReturnParameters()
+ 在 System.Reflection.RuntimeMethodInfo.GetParametersNoCopy()
+ 在 System.Reflection.RuntimePropertyInfo.GetIndexParametersNoCopy()
+ 在 System.Reflection.RuntimePropertyInfo.GetIndexParameters()
+ 在 System.ComponentModel.ReflectTypeDescriptionProvider.ReflectGetProperties(Type type)
+ 在 System.ComponentModel.ReflectTypeDescriptionProvider.ReflectedTypeData.GetProperties()
+ 在 System.ComponentModel.TypeDescriptor.TypeDescriptionNode.DefaultTypeDescriptor.System.ComponentModel.ICustomTypeDescriptor.GetProperties()
+ 在 System.ComponentModel.TypeDescriptor.GetProperties(Type componentType)
+ 在 System.Web.UI.TargetFrameworkUtil.GetPropertyDescriptorCollection(Type type)
+ 在 System.Web.UI.TargetFrameworkUtil.GetProperties(Type type)
+ 在 System.Web.UI.ControlBuilder.get_PropertyDescriptors()
+ 在 System.Web.UI.ControlBuilder.ValidatePersistable(PropertyInfo propInfo, Boolean usingSetAttribute, Boolean mainDirectiveMode, Boolean simplePropertyEntry, String filter)
+ 在 System.Web.UI.ControlBuilder.AddProperty(String filter, String name, String value, Boolean mainDirectiveMode)
+ 在 System.Web.UI.ControlBuilder.PreprocessAttribute(String filter, String attribname, String attribvalue, Boolean mainDirectiveMode, Int32 line, Int32 column)
+ 在 System.Web.UI.ControlBuilder.PreprocessAttributes(ParsedAttributeCollection attribs)
+ 在 System.Web.UI.ControlBuilder.Init(TemplateParser parser, ControlBuilder parentBuilder, Type type, String tagName, String id, IDictionary attribs)
+ 在 System.Web.UI.ControlBuilder.CreateBuilderFromType(TemplateParser parser, ControlBuilder parentBuilder, Type type, String tagName, String id, IDictionary attribs, Int32 line, String sourceFileName)
+ 在 System.Web.UI.ControlBuilder.CreateChildBuilder(String filter, String tagName, IDictionary attribs, TemplateParser parser, ControlBuilder parentBuilder, String id, Int32 line, VirtualPath virtualPath, Type& childType, Boolean defaultProperty)
+ 在 System.Web.UI.TemplateParser.ProcessBeginTag(Match match, String inputText)
+ 在 System.Web.UI.TemplateParser.ParseStringInternal(String text, Encoding fileEncoding)
+--------错误类型:FileLoadException
+--------错误信息:
+--------未能加载文件或程序集“Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed”或它的某一个依赖项。找到的程序集清单定义与程序集引用不匹配。 (异常来自 HRESULT:0x80131040)
+--------错误堆栈:
+ 出错时间:11/01/2024 10:24:33
+出错文件:http://localhost:8579/indexProject.aspx?projectId=9e7f3262-1cd2-45b6-852f-0276fef4529e
+IP地址:::1
+
+出错时间:11/01/2024 10:24:33
+
+
+错误信息开始=====>
+错误类型:HttpParseException
+错误信息:类型“FineUIPro.RenderField”不具有名为“mWidth”的公共属性。
+错误堆栈:
+ 在 System.Web.UI.TemplateParser.ProcessException(Exception ex)
+ 在 System.Web.UI.TemplateParser.ParseStringInternal(String text, Encoding fileEncoding)
+ 在 System.Web.UI.TemplateParser.ParseString(String text, VirtualPath virtualPath, Encoding fileEncoding)
+----错误类型:HttpException
+----错误信息:
+----类型“FineUIPro.RenderField”不具有名为“mWidth”的公共属性。
+----错误堆栈:
+ 在 System.Web.UI.ControlBuilder.AddProperty(String filter, String name, String value, Boolean mainDirectiveMode)
+ 在 System.Web.UI.ControlBuilder.PreprocessAttribute(String filter, String attribname, String attribvalue, Boolean mainDirectiveMode, Int32 line, Int32 column)
+ 在 System.Web.UI.ControlBuilder.PreprocessAttributes(ParsedAttributeCollection attribs)
+ 在 System.Web.UI.ControlBuilder.Init(TemplateParser parser, ControlBuilder parentBuilder, Type type, String tagName, String id, IDictionary attribs)
+ 在 System.Web.UI.ControlBuilder.CreateBuilderFromType(TemplateParser parser, ControlBuilder parentBuilder, Type type, String tagName, String id, IDictionary attribs, Int32 line, String sourceFileName)
+ 在 System.Web.UI.ControlBuilder.CreateChildBuilder(String filter, String tagName, IDictionary attribs, TemplateParser parser, ControlBuilder parentBuilder, String id, Int32 line, VirtualPath virtualPath, Type& childType, Boolean defaultProperty)
+ 在 System.Web.UI.TemplateParser.ProcessBeginTag(Match match, String inputText)
+ 在 System.Web.UI.TemplateParser.ParseStringInternal(String text, Encoding fileEncoding)
+出错时间:11/01/2024 11:29:03
+出错文件:http://localhost:8579/Transfer/Electrical.aspx
+IP地址:::1
+
+出错时间:11/01/2024 11:29:03
+
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index ffd79053..82edbd5b 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -19321,7 +19321,7 @@
-
+
-
+
@@ -188,7 +188,7 @@
-
+
diff --git a/SGGL/FineUIPro.Web/common/Menu_CQMS.xml b/SGGL/FineUIPro.Web/common/Menu_CQMS.xml
index cefc9ef0..c90f11c5 100644
--- a/SGGL/FineUIPro.Web/common/Menu_CQMS.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_CQMS.xml
@@ -8,10 +8,9 @@
-
+
-
diff --git a/SGGL/FineUIPro.Web/common/Menu_Transfer.xml b/SGGL/FineUIPro.Web/common/Menu_Transfer.xml
index e5eca709..283e3429 100644
--- a/SGGL/FineUIPro.Web/common/Menu_Transfer.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_Transfer.xml
@@ -1,21 +1,19 @@
-
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
\ No newline at end of file
From bcef47d5ccd19e88765b5f8745f2421d09c1ed12 Mon Sep 17 00:00:00 2001
From: liuhui11 <934408429@qq.com>
Date: Fri, 1 Nov 2024 14:30:39 +0800
Subject: [PATCH 7/8] =?UTF-8?q?=E7=A7=BB=E4=BA=A4=E7=AE=A1=E7=90=86?=
=?UTF-8?q?=E5=88=97=E5=AE=BD=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Transfer/Chart/PunchlistFromChartNew.aspx | 2 +-
.../Transfer/Chart/Systemstatus.aspx | 68 +++++++++----------
SGGL/FineUIPro.Web/Transfer/Electrical.aspx | 24 +++----
.../Transfer/Instrumentation.aspx | 24 +++----
.../FineUIPro.Web/Transfer/LHCSystemList.aspx | 12 ++--
SGGL/FineUIPro.Web/Transfer/Piping.aspx | 22 +++---
.../FineUIPro.Web/Transfer/PunchlistFrom.aspx | 10 +--
.../Transfer/RotatingEquipment.aspx | 16 ++---
.../Transfer/StaticEquipment.aspx | 18 ++---
9 files changed, 98 insertions(+), 98 deletions(-)
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChartNew.aspx b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChartNew.aspx
index 3539a569..897be673 100644
--- a/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChartNew.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChartNew.aspx
@@ -225,7 +225,7 @@
EnableRowDoubleClickEvent="true" EnableTextSelection="true" EnableSummary="true">
-
+
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx b/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx
index 75552ffc..a4046f7d 100644
--- a/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx
@@ -36,7 +36,7 @@
-
@@ -48,24 +48,24 @@
+ HeaderTextAlign="Center" Width="90px" EnableLock="true" Locked="true">
-
-
-
-
+
-
-
+
-
-
-
+
-
-
-
+
-
-
-
+
-
-
-
+
-
-
-
+
-
-
-
+
-
-
-
+
-
-
-
-
-
diff --git a/SGGL/FineUIPro.Web/Transfer/Electrical.aspx b/SGGL/FineUIPro.Web/Transfer/Electrical.aspx
index 445fbbbb..3564a904 100644
--- a/SGGL/FineUIPro.Web/Transfer/Electrical.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/Electrical.aspx
@@ -66,35 +66,35 @@
HeaderTextAlign="Center" minWidth="230px">
-
+
-
-
-
+
+
+
-
+
-
+
+ HeaderTextAlign="Center" Width="120px">
-
+
+ HeaderTextAlign="Center" Width="110px">
-
+
diff --git a/SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx b/SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx
index a406cb7d..c62ec96f 100644
--- a/SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx
@@ -58,7 +58,7 @@
-
+
@@ -66,43 +66,43 @@
HeaderTextAlign="Center" minWidth="240px">
-
+
-
-
-
+
+
+
-
+
<%--
--%>
+ HeaderTextAlign="Center" Width="90px">
+ HeaderTextAlign="Center" Width="150px">
+ HeaderTextAlign="Center" Width="120px">
+ HeaderTextAlign="Center" Width="120px">
+ HeaderTextAlign="Center" Width="90px">
-
+
diff --git a/SGGL/FineUIPro.Web/Transfer/LHCSystemList.aspx b/SGGL/FineUIPro.Web/Transfer/LHCSystemList.aspx
index 7ac24cb0..5b730723 100644
--- a/SGGL/FineUIPro.Web/Transfer/LHCSystemList.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/LHCSystemList.aspx
@@ -50,17 +50,17 @@
+ HeaderTextAlign="Center" Width="70px">
+ HeaderTextAlign="Center" Width="100px">
+ HeaderTextAlign="Center" Width="160px">
@@ -76,7 +76,7 @@
+ HeaderTextAlign="Center" Width="120px">
+ HeaderTextAlign="Center" Width="90px">
+ HeaderText="Actual Finished Date" TextAlign="Center" HeaderTextAlign="Center" MinWidth="160px">
diff --git a/SGGL/FineUIPro.Web/Transfer/Piping.aspx b/SGGL/FineUIPro.Web/Transfer/Piping.aspx
index 73b1959c..72acd268 100644
--- a/SGGL/FineUIPro.Web/Transfer/Piping.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/Piping.aspx
@@ -49,7 +49,7 @@
+ HeaderTextAlign="Center" MinWidth="230px">
@@ -61,13 +61,13 @@
+ HeaderTextAlign="Center" Width="90px">
+ HeaderTextAlign="Center" Width="110px">
@@ -131,13 +131,13 @@
+ HeaderTextAlign="Center" Width="90px">
+ HeaderTextAlign="Center" Width="100px">
+ HeaderTextAlign="Center" Width="100px">
@@ -145,23 +145,23 @@
+ HeaderTextAlign="Center" Width="90px">
+ HeaderTextAlign="Center" Width="90px">
+ HeaderTextAlign="Center" Width="90px">
+ HeaderTextAlign="Center" MinWidth="90px">
+ HeaderTextAlign="Center" MinWidth="90px">
--%>
-
+
-
+
-
+
@@ -162,13 +162,13 @@
<%----%>
-
+
-
+
diff --git a/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx b/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx
index fb503363..fb317476 100644
--- a/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx
@@ -60,7 +60,7 @@
--%>
+ HeaderTextAlign="Center" minWidth="100px">
+ HeaderTextAlign="Center" Width="90px">
+ HeaderTextAlign="Center" Width="100px">
+ HeaderTextAlign="Center" Width="120px">
+ HeaderTextAlign="Center" Width="120px">
+ HeaderTextAlign="Center" Width="120px">
+ HeaderTextAlign="Center" Width="120px">
+ HeaderTextAlign="Center" Width="160px">
diff --git a/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx b/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx
index 530683ee..3135d713 100644
--- a/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx
@@ -62,7 +62,7 @@
+ HeaderTextAlign="Center" minWidth="120px">
@@ -74,35 +74,35 @@
+ HeaderTextAlign="Center" Width="90px">
+ HeaderTextAlign="Center" Width="100px">
+ HeaderTextAlign="Center" Width="120px">
+ HeaderTextAlign="Center" Width="140px">
+ HeaderTextAlign="Center" Width="130px">
+ HeaderTextAlign="Center" Width="120px">
-
+
From 94ffbe821038272c8e195dab9aa6d83eee9b9a8e Mon Sep 17 00:00:00 2001
From: "754998852@qq.com" <754998852@qq.com>
Date: Mon, 4 Nov 2024 09:17:14 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=A1=B9=E7=9B=AE?=
=?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=91=BC=E5=8F=AB=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 10 +-
.../ProjectData/ProjectUserContact.aspx | 187 +++++++++++++++
.../ProjectData/ProjectUserContact.aspx.cs | 154 ++++++++++++
.../ProjectUserContact.aspx.designer.cs | 107 +++++++++
SGGL/FineUIPro.Web/indexProject.aspx | 21 ++
SGGL/FineUIPro.Web/indexProject.aspx.cs | 9 +
.../indexProject.aspx.designer.cs | 134 ++++++-----
SGGL/FineUIPro.Web/res/js/jssip-3.7.0.min.js | 9 +
.../res/js/mix-webrtc-1.0.0.min.js | 25 ++
SGGL/FineUIPro.Web/res/js/mixrtc.min.js | 223 ++++++++++++++++++
SGGL/FineUIPro.Web/res/wav/dududu.wav | Bin 0 -> 43146 bytes
SGGL/FineUIPro.Web/res/wav/ringin.wav | Bin 0 -> 770810 bytes
SGGL/FineUIPro.Web/res/wav/ringout.wav | Bin 0 -> 264644 bytes
13 files changed, 821 insertions(+), 58 deletions(-)
create mode 100644 SGGL/FineUIPro.Web/ProjectData/ProjectUserContact.aspx
create mode 100644 SGGL/FineUIPro.Web/ProjectData/ProjectUserContact.aspx.cs
create mode 100644 SGGL/FineUIPro.Web/ProjectData/ProjectUserContact.aspx.designer.cs
create mode 100644 SGGL/FineUIPro.Web/res/js/jssip-3.7.0.min.js
create mode 100644 SGGL/FineUIPro.Web/res/js/mix-webrtc-1.0.0.min.js
create mode 100644 SGGL/FineUIPro.Web/res/js/mixrtc.min.js
create mode 100644 SGGL/FineUIPro.Web/res/wav/dududu.wav
create mode 100644 SGGL/FineUIPro.Web/res/wav/ringin.wav
create mode 100644 SGGL/FineUIPro.Web/res/wav/ringout.wav
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index 82edbd5b..734d0de1 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -1606,6 +1606,7 @@
+
@@ -15365,6 +15366,13 @@
ProjectUser.aspx
+
+ ProjectUserContact.aspx
+ ASPXCodeBehind
+
+
+ ProjectUserContact.aspx
+
ProjectUserSave.aspx
ASPXCodeBehind
@@ -19321,7 +19329,7 @@
-
+
qLN+VXDv&l7#DlxNloeKAx12K`de-X!~v
zIQRb#*%;N0$8*=mo%tnNDduDHoMcKh**Lns{xd{{;oosLKF;ySKKQh6*_HdpV_R3k
zey%O9%UF*g4vqa5QPw0@s)W+xY9LHLkC}Rjedl*^~WWGHe8XV;s>h)1C^-uCBEa
zSz~QoDN5{{#*^T+ljCZwjD2y%5*}@A)Y>T4#ywrs+LO2b{+_6(RBOfgSSjl9XQjNd
zdEhGc++?E^zY`p-%+6wauoP`#%UR+|O`3m9_VD*}zfI26KAjwvpbzdCe^=M}CE7gD
zj?&o&*VPlQMt7RLGk9NE_eo`hS@jGD)lWSw5lz)`U9yoXN#JRP1-=US+
zxOVO4X(cAvu1%i(8fazxwRX;L-+q_0E3CsO5CZ*w04gjQsOsiGQT4+weCLI|H=h=r#xT!)Mt)&WLltHw1a^d$L;e
z;*8nfe{K?OEd0KmU&*^O`F3Rgt7pv;`$jlA%G~&-Wh^s!HV0gD9_;0MqQ+X`EcUs@
z_VTxL=YENl204_4R;YK9*$>zFqkQTuOW2cj?8i@*@cXmg))v?Hze%y9wdK*i3p-jX
z^tW;BXfjQLwc$usYOS@qHxHXDkM=|{X6!6@MR{%}uD8jIt-}?537n5>ZLO~Eij?fWO}{Mb2|4T+E0I@RkK>$w=!N!WN3y$c&(z<;
z#zJ4-p?@ZBeAL^V*}~*mIq%ctv6P>f0ne-rC9$o|7cH;{rA_4nwf=T&UAD|xSbMv+
z*8U^sfs)u(yi0pdsI&iZW^H-IwapmM%U^HLkG)Z2eciL-e5@QTSjRrBb#1JjmD}%y
zBU?M0k82INlxSyY>*{UZsAX@qbFHl{kFJ%QiH#mBnWH+HR?8CVBFj)hTY*unojdx!
zEwn&;*AmzE{2`U{WA72N@CWJsZnGBw3fj3{Y!8Pw7
zw%)F6{wBp)zu0Gk_FM(AoY!s^HWq5HE=6lsYI3YCYTa+R?6{nv^~RIKpFJnYMSuUF
zD?vNlk!#I%kbpCM;(w0eo`p%Xc6RN0;LO!JY1Wb@zkTH|wHa6$kC=%`=iFoE*>}p`
zY-#QNGmE_=w7?(7uqTP@vSYBFwdE+hcl2csJ9Dk99p(G$tqp5jJD%aw{_I~E&VXZC
zZ+Ap%C#CEa<(bs0?+tye)}334&A_Dc>97ad;Ed1JdRR+dTP;ds|0u)#*4?+m?;EX6
zhLepmH+or#R)=!aAtwc;HmV(2iz`UBIk-{K$N&4{wUcAgS&n`j*IGEasB^8|bMcq6
zHQJdJobwNL_`^5I`Ed-Mv&^-1_hK`#v8|=uEBg4)-Dv)^*cFY*uz5fN%S@8}&g`19
zOd^ifmo2S?M->+Rru}7T4VfIx+M$J&@d)XBiaf&={`matj%`)S8vo~Se?Mpe8Pp2<
zjxY<(3AM5R!un@ucZ@R1fh?T4qq|~_Jy({q9cE2gCdvBa+F$cqHrYLI8<%%uGodU>
z!QJqQ@m_iEzgK@RckZ7pXXG#8xNPlyAJ!X3JGU9SyJDR^6>Enh@5^6;UcAO3uOW
zy!`F>+wfa{o1?YDwfp5bx%T9oY**)gPxjlhRV1b2)B4%(%I0SGZ1?Eyh2MnrbM1L%
zBjL);7kz+wXJ5#|ctFVWmy37OsN*&2%1awy-{bWh@2IboR*-tW&%P|zz{KM{_a!L@
ze*L0g+Y9yoO7dR3YT#^X^}vbJT7g4?Mc+{x3hXTXYt{IK*IR8$of4XmR=v%t#FjPg
z7yNmO#9s}L{2ZPw@mF!jdka3QdZR9_?o6E6StiIwnANrPkhyjPt23}#HHoF6a2?65B~xD
zV3jET!{QTxA4Ghj;XlGV5uXVBM^%YWESC5y#Fu>J#qXvo{v$8rUcr9=e_kT-SBOt+
z6lyK;CHK@l<;Cv;Uu*btfBf!C5`X3JwZIP&|4~okOMpLLCh;Y}pMR?OTHvGn@mB+*
z_;ccGL&*QFXld_OTM5Nc{QhijUf$@mJ6f#$N$H
zxJLB@_^5X!es@#lEgGLVMdEkIN_-;lABK;5Elm7iCB@gSPkzC}M>X={KZqavLGd3q
zd-y2uGxQStMYSke+B$`Sn*NB4~9iQibX%lHUC87ufWd${P_@xzq)5JnA
zd-z(!@3!mkX7fRHfAR29jNd)r<7c?G{Yt@q0DoT9i%;CNYl-Ry;&jq8HkS>nK4S@cfZ?pT=WC+iO`RZ8sENGthg0CG^5LW&Y;G=-Ao!p^`hmS&h;^L@&)K>i%@EiOkv>(BYE21C3f0%xN
zpMm&V;Lk077yKo(AK+&|d?N5s7T?}W<9C7oI4tq)z@Ni@AbvMp@#o+#nSOMO#
z_)GQ*KI&LfC5_*$qxjlM8lMRK;Fp3Q{IlQ(CrbS8`5JdR6&KX0SK9mxz9(Y5Xqq1Nig!Nad^S$A^L+
z1pdSD=Q9-l0elqV+o2!pT78)ML1>tVKfgoqwZMOXzobC;eeMwZ0sR2}<6Xs{lfMM<
z?c*X}X?#2R8O960PlG6b3F3EwA6)I(5AZWM{KpiDZ+}$n2k;;J_BR)PhBt(tf$_V*
z*RE6k65yl2UouqjgNWaC_;d361XCQo*7zBKA3Ub|@#=+V%kcZW?%~f7zdK6#OHM@b
zgTU7U|B)y0yTI2%KjsTQ3iuD;2Md*-Ax+}jcSZ5%lYjkH*H;6>35p*CK8pBS#J9tK
zES2>Y@U_P8bC0aArpx;3ir}M&|Db*_zCD)T=L^Aq99I2c{4Vex8@>2ltgjHi>&Fk0
zzhtfQGXOt$B=eDQn%WQIqkyjkKLhmRq553}U)x3SAJ=>QB`+LUcxFtXsp1ErA7(#F
zFT#HK`5DMxLj7QTJMd8!zq{}%`vLqQ;@c+)zYp;r#18_0PX3a)QG9J3#h)|29r*LJ
zimx4brL)HGVtoaC)H;dZtt9d7hL4&f{65uA{!Q@bRV02F_>Tg?58ki%TH25JNCk~=
zzxPDAXnnQOg0BU?5A>sa;*-^96jwMoP4H3RFEM_GlByd;KbDAoz^)#wmz0!2kG6@E`O)zRG`4@loVwAig$P><9D%{64@(r7M4l;m?V$9ijMh_#fbB06ywv
z^*_k(WB3o~N2I-9KZqYBzYqM6nSvjr{n!-*Kf}!C_j>q2;G>2{`AdNRIMlRm`_OFZhqFEchR@#s2_51Ng6?A0O)a3i`2C*H^F~
z6+C{Qi0H?dgzH-a|B)>G4CNCi2tR}Imq0(p=6x#o59-H9q961>LV_P$eKOJGzj{IV
zudu!{{wv@=fIkPm7W`KOg#QZbt9w;HUX1elMAFKOf9~)f^CRl4KgbUUexFR?zaqbnvmaB$eryu{
zlHDEdi25JoFZn;g*8>0Xy{xak_wZ5VXQ;0B!}zb@e*pi{NBJ4R4+ne{`Qd;+pAv&V
zUnKbR&dOh6_z(CWDdK<36MQZB8Fni^3j99cXLwxkQRIgMzV=4N4-OUn65v0uzJh*W
zebv$PKgeJ5t@2;Nen3CK4>zFca^=6;>G8uk|J?Z>zz^Ok`Y}3`QU)J2F?`v>M?DZo
zj^V$8e||;yeZUVlRsD1F!_hw{KZD~hAwL}OwT>SS>nq}G$$xdD;-iSK#rg{TaQy^-
zZu}+Szv|`VFERT;{5kPa)DQUQ4-3DK(+}d$mnlC3{15QMVSNSvJYMm&fxY*se?BJa
zpZ`PgwT|D1`a%E0@iR1Tv&7?v1AfrfSLDBf{Q!Ot>np?8LO*Cf$PY*UtNOBk1%5c-
z}HT{wvsz_e4Lie?|QO{}uR4h(CAyaNuXa{uTTW;LmqQ*H?y*B0n7Qwd98z)x;
z{#A;sufU&Z{0#8V!G8t(An{R#KZkyRpJBc7!@>Vp;qfyV{v7-a_h;T7-M=#Z_^aTf
z$bWUA;E#%rY7)gqEfaigr2XY!p{%bAe-3`QM6nEc%3p&0EAn6Ml>MtV9)BYF;fOzX
z{&_*uTI!#Z-v{`pL&DDh{P{z|U-ET6_pk0!{P`WB9OZ{2{`_W-{|ffQ_eHct5A!0%)DLF`|BqWD_yCp!C)R^tw_AHWax6@DMb
zp9uWm)&58S?PERvoa-yc?*o2@PZdAdYyT?2*UnRZ2Jk16pTYPOpBMcwd@cA(uzz)2
z?MD;kznZB0SHus3{|fw~Pe=KE9DZ=5@-qNm3;q)Fi_-rfzbN;2X9@ls{yFf2z@L*p
z@jq%m=$}uG^7~+YMgJWB2l(NP|H|Rd!SC}|Szm$Q$NA^n-vvJd)>l8v{x0lCSK(&>
zz83tVj=zNbK8d0B%71lA_(h372frxz;WC6D&g_TdzXHD~`Qf;~i}lqUkKc#-0sn*i
zK8M8r2xV}6Mf~}#?Z&A6;Qkf)MSrLJSL7E3KLhr6J4gKw;Lo|g3;smn2jQPjX*}NB
z-|ejYi5r#Q2kWavk#D!(rTkY|U%`IN5q{A%%3nhM#MYu8;1@N1pF4y<5$mf#!Vd@i
zF#AFLIrx2muLXW^xZnqgue~VziR6bn==tYdUsdt;cc~xbzk>Y$|5e%j-K8=7CDae>
zUx6Qv{3YvEKj5Fken3CKp9ud0_;a%#-9z6S2Qb|9phUFZ#9OYZvPJ%J_G&
zzf1qTmHHpQQ~w<6t4qr7nrdln*RZQQQD6!YCmj$
zw|lD*vVTSXMEW1(FZojTugpKE{diOOsU1IDAKAZh{E4=I1^Z$AS6E-|_4s%B{=?Q+
z?Q~oRP!-c&4t5|+f+u!B;LG#a{AFoFFOK3lgUljUb`&ZzH!}^Nv
zKfr%Qerob3f}a}iKgbU^+4DbuKc|0A{5kl2uzwYh{VU^VF#ZzoGhls%{ax@=JANPI
zhlBm#{%#-P_o*xV)Zj0{`@t_{eU&f#)bD4G6n+N2|A7B-m-y%4-`%0>EAn4~pW40u
z@bi}#|1RDSVt;p%=YPB}{0zy$FADp?_aF5eTvGm$9Q$OH;Y!-gF8^nGj3xDEb
z+236){BVV0KNcN-AaA>@uiAR}^LIS_d24BPNceY0iGTjH;Lk7Tb;zzH$nuWa7xIRj
z_{qbc=cWELl#upC>%xR*s=pxk^Jn%h%&r}|68<{tZ4ZCGwlpQMr?g?cs;)>@SpFMDwJmZnq__TgJQXb3Q
z$n0q?t&e|f7k$H4PBL2Yk0av_aSbUpf{l$9_;VxS%A#U$UUnv~%+4U4?fA*DD3haF
zOCGJ28`X_&^RzbXk9)KGWr^z%`~BJd*+|xoM@Z-QX!89>j(`??P8b#Ax_R0)YwQkf
z4AlDncrSeRl*ke%57+oJd9im1Stgrv^FIR{3H{x<%?U@=@Y8=E*4~cnjdpl?Jo@V>
z!Ak6iUO4w(qs)G5IFJ3~cVoX6)Uhw`KDL}=T8r2jP%6sU-_3w$yo=beQDgt(tgI$*
zHk9Z-T@RZ{tW@@jEyKS>Cc!-omT=_QUjEh?uk3FDW%lQ!n2gw3E5+}`KX;b9=i+MJ
zZ;z6!mtU^?myh#c9p|Y7c^@dTYkOWcl9f}w{f=$EPA+~0_Dit2m@I2enO2Hc=wY+s
z(Mhx#SHd&&=P%ME#kSzT111ep@P{^5Ms4Ml|7lRFYlSmj`OBO<_uSadwWm~m+Q_cf
zNp*5jR`$xS?P&iN_`iFbKj&gntOt&E&Uv7nwT-PqJ^pxq>}B7m|95HgL<^4Y`nYHB
zuW?d!0G$zkNj5j$5wF~*jb!sg4QEF={_(BE+TgnEeNwW?;0!qidvP2a)mlRmM`ekX
zm%Xxbw0D2dL95}2e3mwfjfo!ClI=Nr>l=G?SDcv}k8{PfYr`wMwmMwf|0pZ_$M&2j
ze+L}P$#K118Ku~r*ev+Fh#kQ_0k&cvmb$S`vcJUUVP)v=+PQQ8FTln|J8R1)Y;(2W
zgZouk9~@mjj?Ow8ixORpjo`*IS*$U=vL5`G$4YH9j>$2wj>eyj6f4j4$L__ov)=x`
zEaUGD@*vsDOs>rV*O1D38=W)rkH&xfDUGctlPxL3$-rSUlWk}IBm4WMvzF5A9!<85=0E!XU3SkEJx~K}bI*zO9F6nyOR{-cJ+5QFH%j7c
ztj5NSm4qv{@IPrtq;yE)S?v5+ezh#?2MO+v66~72Vt?Z%iEUha&WhLWoTHmO_k{Q_
zi(iJ5WTh;*y4=m2cWj@0KDc|fV7Y&6oSQt(%&z!vD6X6)T5G!-d+wC)mu@BeotjME
zt^FHn(qj9WOw{81YHP@OT5lZj=X8?S__T338%ncM|EM-Ee;ND6O0d4}SauX%b3B~8
zS-EvM+xYJjCHOO~<`q6|=597NNB_)X=kMCGoH8iWUq|^iW~@BcSx^4n?aEs6`?34r
zyjW-FxZ+c{zHSy~cdUfJGG6&VAhXzhl>Ja@E!=2!W>0`^DIImLN9>i&2KD^?;LLjadr=ne1?BvoE%<5kv$?Q`jqR+p
z^|4W`9s0$}U`v)m4*t;EjvNVP?pI^~{`#e|9ZKAo=wp~e10}Zp
zvJudOy-gBpI5Vw`epr9&>v~cG8={rn1J2#uxK=3R6g$Ji^B+H7qM9IcE;H$T>yRBPq$iSMKAZ;xa9
zXW&0aZ+`EPSGLBD$Zy(Yb4;{$_iE3?WRyKp7E9eoI;i)QcxNnO3-@XL`0VY|de}Ve
z+2F`O&eZ?uBv~)so0YqMR^p_gginiQl*@KD2CiaDtj1ci)@EorWxZni`lb1QwI`g6AEZ<77<QRpqfpWmExrp7fT<4=7i`PCkYtO&Q1{O3K7&A9Ypl?e^M6@2Y1$&XVk
z`OiO+{5UO7-zxapMUh3}9LZmc_}zbNezo+J$)SM6Up=Sz+PxBA(n9c2Gs3TJ>z{k-
zNHvMSN@}ns`MHz{lK*3e#9uY4H9YX%ndcA8%qf=m#LnB&J^Uc^8yG%no91_}C;2~+
z|NNNdKY!iB59Uhz?i)emkD3~dFCo4*UGeAN2>u-T&l!K^&yPcVE%4{eKS=x_@E?dT
zVSY8sZ-D&H$j?dq2l6}r*TWC?l=yb!9~`Xl?Zukk8TmPpzn1wwfUgal@2>d=hkN;*
ze~#h@5nsam=g9wYNb*M!fBwjhwfVIrK5@3hwa5#_ux!`IBucNq){BHU9_lJI~VmoXG#N
z&coL-em6_=JIChdTpk`5&HrKfapp^Yga0S_KmMTciOfI9{O23J{DaJ|_MzgVfFE@E
zab^iV%HeC7{~Y+iuOxn#_;cpxydwDrGmAC~{=Bo|KahVA@wVC8kPz;wp*1IwkSDE45m0esY4$^XIpILzejMaKzdHY*#kW`W@((^B_z&nuy2Q6L{;HG2w^whE{A!Hf-J|)>8Q*UC
zYmwg>`PC4g2>r15UFJVG{Q&;_a_~ouzeiLKkCj9@gJ6d@QCEEHT+;(FTa|_CqAtBLB_WO
z|6%xZ%YXiq;GH?;0J;KK>l;&kGetP6FYnHiBBs(1M+hMU+ePMBEPfY2mhk^)!IaWAFQGH
zT0eepc*1JIN8K&)S0TZFRMhz0dnG>(^K&x48uHf?AN6`n{wUc@w|UoyqRpKne1gXqU_WSnqjq)=z6n+NgSNp`XAJ7lvS0nzM_$b&9
z#J6L8W%2D>1pndBKe$fTSIo}|{0H)%PZIl4B>AJdX#8#;$zMBG@U_fe+q2yY4?ozz
z%YRP(lBpM75d68ze}1cn|M*Jv1Ng!J`0}e!KdynqEzX80(?w2A;AwKzq9d|V14EAQH*bg{lNMP`JJ)8LjGFDx8JV#^Mf(?
zTIL_L_0@9C?+pDIDESAcd-pTVF1+~V8cmG#xX6+if2u^;63x&NBE%74{N^Vhy2
z`D>3IsVMmefseBM=kP!L>nq@Ek>9zyUx;6KvO{#p2ah#$20_EBm-4F6&Jf&8_Dgumox<-h8r
z_QUemf}a8L?Zih7_VS+-KgjrY;Lm3Z{)6_z@iPpP{O6wwKf|G>rXNkb{IvxV-%k6%
z{G5ny2mclFJ0rfG_;co0gMJwPgZT52g8yhI{0!i~GJXc;cXs&meUjgKLTHlW&o4=S
z=L24TXXuCHFB#u9Uih!Rm-W>KSznocEY$qxcM1NS`cYB&OKOXLzC!OAHdgc
zQT#dZwZNa3di+;ogrC9T&mR~3U+t7>
z|3Lm)@H23I1^rBI`U?0D=!fx_(0-7gVT|I>>j?fF`Ok^}*d_LZ{3XT@mzGhS
zlc@Oz;h+2SbHaXf5`G5y=d*I2Kk&ZrGZ25?MfrVJdHK%|2>#sVuRW~!Ij8FS>ebLz
z$$t)f)CToGz<)Jg@aKmAI3e~UJMFDdeV_ff+sn`SXIWo8rTit#KM4P$i}J%+{_`y!
zf5~Rae-3_z7J~mk{#y7S7rgxEz@L-f2mU$u8J4wfleRQ;FctQL`cdfNqo^O2-}$iM
zYr$U<7qh+sJ_`8ST8fV{{9t3TA3@E}34R9TcP4)DPH%lh|6`W$mmF1o2H*#|z5+hV
z><8CZ#1AsR^Xlyj1wXi5@Pn`)o5X(HB>W8I_ksWMZfUOaUu~83)fBZKz(*xXe$E%w
zKPNu}_xzFqR3j0@wWqtLq;0J+^dR6wXh(G^U
z^n>_w@cV#2ai8L&U_ZcL0(|XLVn2}o9QkX(f3-&ZbKs+H_xKrrudOZqhhINp`AbHM
zWmv5F&yl|t_;coWo}>IF)Q``UKau=Cmj4|7Ir)7Cp2(2=wcuws=<)lQ{{eoVRuSk2
z_^)b8{_~CEe|)U`S4~tuT>kT|;pejUYyR_YRT~OF!!YsB=cUaOeg@|JD5PHpzcZ{u1&tz&{5+1NcjTAH@0!{64oSzfYX#$Jfe#1%6T3
zkD;D_?$2Kfejnm%M+AGc1HP8|oq<0$`!V&xb5VZL8RDPA{{X%g{s;K4$nV4TmBSB`
zU-Uo1FPf|TqQDRK_3@V^dil@K3I5#q=Z+ta`JK)G_*DFl9KC_
z|M?vCKbXIk{65Hk9?|_>;A@E=wDncK;LrX1iCkYTZ#Ub+55j&ttNG8df5rUHgCxK6
zZlC>tf9~wZ)0)2)`OhDa{O90@1O6QRaNsW~_V#z3f4)TU=dd5d*CK!ID&hBme*7%>
zbMPmEzhr;O7lI!oKV02Z;0GrPKio}{zcyL;ea4G^F#oyv=kPzMA2+LiJ}GO9uCK6v
zMf=gR&1lgN*pIbhKjMoP`1Aw*x!Di$i>9f6{)6x{6ngtt*JYExWMj35JpM%55AZV}
z|M_&$567Q~{O4|cMgPOrS8o3b`JJI3SYMGpv5xxZ*xz;hSCgxZll`mu!VhQrS6E*m
z|2g;*vxUFJ&+h~O9Q>jqeEI?VVf?$`hXa4f^~zrY{Qy4$_II&=h4&wQmEWhM>|f#i
zM^DiY>|bGhbxHVlvA^s1Oa3MKo%#NQ{8!*le0awgwIAu?pQoSy#yWrnt
z{&VnO5no$H{PU5X|Ka$rUh(+hhIssm*x&tJ@aKlFB|n_yKOf}r`%I7W`w)LVNB9%Z
z>i!k{5Aa{@^Y}&kM%P#17p>y?=Y~JW{uT2(-=+Qs_pjE}dqVgb;D5k=klzRVaE{-{
z@}JZH!1@aI1Mfe;e}(rS9ew&y5`F)%Rrq&f`F*Cy`ilFzz}FhT5BNnLz83F4zz+xf
zIr$mDe}(+#;4c9`oUO0Ge+B$`Z{hdZBlvUhivnM3`OjOZe$akgRDL+KAG5P(MET*k
ze^rqBd+|T8zYBgi`scq_{~Y$i?O%~U(fF^pe+Byieuj;W)_VL5qu&l4Pc>KHnmHjL5
z!*PEX{M6tVeNFS98~@dMpZ&1+AK*`%B>M5a=byv>AU}iYNB>{yD1Qm~6MIYkbGN>_
zQ~2Tj;rZvVAMnpdD?c^#W4*i|Y}w*9;V)U`@iTlZ`T_j;`=TF16@LzX(NW@maR17W
zKezp>Sbpj&%Fhtj{9~~nH~aWYu)YHR-0_RH=>Yw}{uTI3xWBt!^#lBH2bKTodU-zx
z{@oSI?*si96Ndi*{$1?vQa}2IwtN0L`AdL5$Np{;@ju#n?+3ZQGW*f_$YyW?dYqS)Wv++bbhO}c*-QTy?&zW>M*e$gWye@R`B
zpW66+xW7w&IOxY)%3nhL06*OEC_e-FsRwHQ^JL*K`5?4V)>o?(f4)TXpC1(b`7H6z
zE6e+jC&mBxhw$$%7Ji=;FaLQz$$#EX@aLuB>$3~-o+e_;chu=X-s;+qeIL0>?Xk7Z*@k%G~IPJYWm~FzNh5%ogGc
zh$d%L10xhzZZQa6bCrN|v@9EMVQv1`k&z9twJzELGqVL}fM
z^KRMF+WXt`+&(R;0@r*#e1;o8_Q03|k8)|w>iV`Ff9e!4QW
zvbaGf2a^0PtuN+dqfiE0nmmr}Z)4~7t=MlH0Ky
z+03jRo>;6rw(x(VC)=AWyTT0I^Wn_UlkItiD_px#?2JcOW9?14lk93JjS@K<`*gnw
zYh%55ZC8+PBgfX5R4YYG*NgYWI*!R&yBn)!g^Dv!3PF+sUxmn-qR;b|2ObrLkkPoqbXYda(yb!zW7Yk7H0aKT%^N;~b-K
zB=$3T{x(+Tdb+k&W=HgcTwKS>r4;*BQNFdbEB5Ah#2LDF*|NOm824(tZ#Ct_Q*WR8#>zq`MYGXK=Y)7dq^|z#4j$nOxL=FCI
r4%U}P`xnPbU0;^iQ|HVn$F-qMwDkXvdV5Yzu1-Q)T3eG07B+Zi*36n&>-{!=z)b?~>b)1s>eanl0&I!_Lqd82zs@4X4lUA?!X
z-is~SmTlRV!NwTl0tta61ekrCceIf(ig7r<6JLG$
z|NQG;|N6iF^}qj1Jom4E{lESH8+`SD!#kJGkAC%k!0+cC|DXRFJO9=B5d4jS@7fKT
z9!;NSNIj^&tlnxbTu8r-9tWTL*1Tm;-jnfUeZ^oYT#V$Sg~VdAoLa~fQ{_knSq-g4
zx8hHuPoulhgXo{hpVD_?pGU5xCn~pJyuSHv@JH>TVnbGul_h2Anxdw8u03f#>HMg^
zBGwD~1)cm(UOP*}P_bn^kw738>I5VFoBVyjs;DB~kZx)#JUoSoGSRO82S~$*@6ZvQ{R74g+Yq2NEuOufiH%REp19{(}@W_f>q|K$1KPp{MrYx(@<{po(v_8o)f=0i
zZ(iLTI8t2^8Tfjhfn#9y)3q!GPueP#DLPdb)Hl@!+U4Gb(S>*Uo$PjQulQ``+1f$v
z*IUB&&NyA6=ca@
z_E-J8-skQk@1KF2!HdXf$PgZhozGm%59K>b9krorV_oMo!wQ4!hWwrUmHcnzm#PWv
z<@V9`QSAklUewR&qIXc*DedHTqM9V7ikWTvHie{Hrk8#v-&8N^O5Mx)r5{S~R>rqR
z4u}67{IU1Eu0yGosig{qtV3zgT%RpVA+b
zzowpKR#S_KV!BYs7P6UQW;weGwwN#Emvgo3R(_?ly0lxonH$OK^P>y;MML3I_G<1{
z`KQglo*eG(Kl|Q$|
zDjrK9sbC68BH7?VU^TcNT8*y8HljPBgV0IrBy*H~lOE5UTfO@J+w(VvNA*L7;Y(L<
zfB*H^rJftQyV_fti<(}wQYBP!N)=-B_ZQY}=naBi_oIEkc@h2VN{BTx;j
z1y+J9!9^qs|IAb@o6Z!{OSz>|aka2sTwPjTTdN!tZ{#m6j&F?B1}g0fngwN9wbH$+
zUmaVyQF*iT$HyPPe|Pum4~8#0$7G|TtKw1daND3{NM-09y4d-)r`(_JPWPln;)cXf
zd@!a@jHG*u?N#+-`D4k;w)3K1VGpl|Hzd3*ej$IZT2*Isk-_lg$dA#3_-1@LzL3o?
zrz@$I^m=MNv79WXvYB)tUCiXuh4^xKGrAsMOq9~=nYF}Htehz>=WE3$D|^*HtK)0^
zo4P0Mdwp*Pz8<JitiQFLr(!8sa<-Tw;)z?uvNo--uXRGa)wU^l
zrrK2>tG;jlICSUY)$yJoMY~+9(1=xh1y{~ia+Q3gpi5|IyP&+<_2<8~@+F_uhT~R&X=46wM`b*+Q|nlHbVGveo?3!pds3y0)~mSX|1l<~9qP
z#npvMu~vAV+sp5+?A5lmD?63rt#^mt{CM%AerTw(SKTRV7i&dou~H$|$p@v^#P3DF
z3U`Dn;zdPSwXS-qK2aZOk96PZhSfcae#xM?SJEx*Qub*-Z-3mmF|dAh;bn3^QbQ`i
z#b6$8JKXw6DiKdclkse-m@1~T#Y`o+5?hOHB(~zmv1?#Iq&^njSAN>O{p`bEe_VYr
z^rUM~cc^)#`crYB+|txE+q(6U)f;Qyu6j?=C&^z1=iKYX83AQvlTacoSxKhz8D>F(r((3`+s
zVBNp$Uk((5nP4Iqg-nVB5s3e2B;*f!W8OGC!*0YCaYx`4%pLMYf=Iyc^ZNtA0OCh{
zU`RZi38E6U-nP$Qs31Ia-Nrr2fub$X{3(S?Vng$iwe&o{kc`K}iEu0!^!UC0
zfZK2L*%5op7PTd;X=}m}cST)cSJ;Wz{8pdYZM4lvH~x`$?fsw&$VABo
zy}kroV$>7$Ant%O=nT4jZm$o{G3fL;{qBe->nzyvwt{`hvF=!PtT>h&c~{Dt@Fo4J
zKqjz=tcO=(rQ}+410u7S$fcqwf7Fe*gYJOCXY)8*PP@zMwfL<8d(e(p!?v&^?1(!P+iTJ*llb9OT?CPP*ZSq`~lH7@-6v}{8!zY
zAv2NsCU=yrL<_-uFc(Psm-(jg1Yc
zHPqFA*6?ZlrwwOt%@hKeNFWiYR32By>0#+u-E<8_Ocs%ZI39+D;oyY0HcV?vTZ;rM
z$E%1+f|w{E3mB~|NF9(o_$)q0%vJF^dELBj{srM{NIbVy8$*S=xvfkwk_yDZ68^A1
z5I~T0D1*d2zdN{UjSk~;VT5I$WGwUf73r2
z825kad+FQsF9iz0bU2ktr?aU{I+rWu*B75vf2iIqKP#-~7mN9PJQ;|15s%;Hu{&&b
zhr?xcn$Rz#e0rXZP4x|Rb!X3>{p{>#XFmPxle3@HeRAfL
z`Z_F@OeN7sOs0s}#U0{waa2qRRY(z1+6V#+2gAj-VO5xpW?i$kr3Y)kkKqULT7rtA
zqN~|jj*g{fskvHS2d{_U*E%G>t=;IZ>bE|Ww$tTU8lXrDiH1Vacrudk#@reIQg}7A
z7|e##(Rc`n_~2AsF$ZFc*>aAIGww{f6W)j??284XQ7C5la3#3nsd)ChZ+(w_%l?Hx
zA&>(Pjt7##Od#i93O)&+#9k#|WlqwyL^%QYA%=u~VSgwP@O!;3x69-8yCM9|9;?^p
zwRnwgqtob`cg;D#Lrv2r)JGrAfq%~aGX2ZUFS9?-JuuJ3E#sDP`)EY?nmSDBp=xLl
z^%Nq3KqQcH#1=vmYPbeWLknv4O?CBW&YVT3L#Mhb;*=7=gRwXfs8Niiz3ko67j}d8CTw$_9UEHXVH~&
zWjq;Q#-9nKg0V0XM~aby(BJ+8&olQ6z%grqd;rp}GM)#a+);aB*a!olW9gpk}toKd#
zjrZn%nY%ZC&v@VT(E7+W6LM*y>^LXS`Hrq6wBkhs4uJya3H1n%!D9$5gl0lBz8T+$
zX}~mM8(Qib>l(o7&(_t~H8wOgG&hr|P}2phR%RPZ4qn>Mk})N8A&Cn=h==E6xhcCL+@c;;@;wq^DnesQ(V{S`-b#GSNiVu{W^SLSiMo)E*A5d
z6htVJ3?(D!a5|8HNKOY+@le7ScV*pco-OBwZO3+Of9zOuY`8Z(3!Ypc8%{>ziAXk(
z_mzBA->(0KchkM>T6Hgbv;IUN;z#@eALNA~IDRx8DWukOo4IOsHB*E{kjy1BVf33K
z@I-U6*XMG9r@Cx5v&CdJ+929(vvxR9^gL~Fp4NNjUrfIkA>QZj+oz&4*_otq*U!&T
zQ?xw&3Q3CR}Jd0E;71`H($3
z*3A+yh?K(BK+Ut^ISO7u-UYS;HQ&0w7)%Gl!C)}pM}K5E
zmQ3Vhi_vnbl3UG`z&(>lIE*BacmV#N-hdaNlgs0B*sV5;)nqoAjOKaEtZmvhWt((8
z@;vlBaNT#@v){A)Z2a&1f9HOldt{$an^uiw+jmjnWBPOEZ)`1{M`2K@bP9tgf1~
z@y(D!;T&6!7H~ayU^D
zoT#Kl3?^^Uw&*Y#tOia~K~j-aR5h!e*T)~_e=RtXZYdsX4)u?(?CY;hjP6{oyjWZ=
zk!2*KTVMlaSqWqV@n9GUM0|j>TtPSDjRoSNP&gbI5g-)Y8ychlc&x`ZG=S
zcpQmLAdzS+DQAe@MbS_@sa<3>Q9=;lxi}V%jp4TNz_?&Mi~!e05R*hSF;t>Ko}Sm=
zdS3BVxuL3dtn^fe_wO9PxU)aLd7(U(JxN!xi>Z7p9ZSL0CLxsuV@N8VjpdMBFy}9N
z*Im!-x2<|xuYJgI&e`MZM6QIN#cP@MLcS0!BJ2Jq?hW@&;B((?*E8pH_j6CpQ+B0Y
zA(zkX@p}R;ufyj;d~x7iqVZTNk&K1nNG6gDLuLjaO$0(dXc2%RNG3-!_awn^U%G8>#joUc=YMfM`+h@m5j@nV9UBp`x&
zf{_V$JX+djwEo;P-?QGc-GeN8-*V6Nz&ahA
zPa9*FXz=$f!3*xLpocA>a;O|Sm(HY8z~@l^Y{4~Qz*?G{;a6jGBen_Gh^@z*ZLVvA
za^FSiANEwc&5X=DPk3!+`1Uw;M
z%pdbceJD~&0ai+*2q6#+L?AH$VTI%(nRF(TNhb^OYIGx5_7t2sXWE%`C7g)eYjfFL
zcBkD2=yTpNYX>ZEo3uW%f^RzR+kY|tZ2B3kMzcT9{xWypIO8|vO(}aOa_LZTm3vpv
z!x4~q1U``mp~}Y5vD6kyGYL{Cbeqj+%%e345GiC-INFv5ILgLmcn|PY6AsTHatI6p
zlgy*GQ3PZz6;Kq3167`ngDQ{V!AZ(+3cQlgP8y&LGOzQ06~2)^Rj;%cdlm*NSC_W3
z<=j$r@kM4owi(+>oJ0?ht=QA_lgwJKR@g6WluMiW_xYQJ{me%EFmeeo_&<8KA#=V&
zeu!L)oR1IW2J(h^{sgp0TQIWNkB}HKq0$Eg5gjs
z5|1RpDfl`N3PgY@i1?$PB%rR8FANpQ>+!l>PUw?tMic6xv&QLpFw>NAat@H^JoHCK
zz)Qya=KCh}^?`NLXWDaixH|kgM7_uzAa)Wv$TETuU=9x}z;ba6EFDJ!J4H}L90^Cn
z5&%U(4rsx)fWtOJ7uwPSH6GWD!w?B$S+k-=
z)1qjRVwJddLMK^A*RV7kHBTq$S9Hk~3VDZC-}mLn(~&j9!tK;rG#}3=p=pVRBEfhl
z8H+`t;9M)feioq#&q5zxhE}|kE-vMm$Yq=f6Hb+JF3V?LG8YxAU*EhnWxg4~1v>
zl`Igb(QGUYU=|65L&;Dk3dm?7vz6G1KZ)-qevN+@Its2LMWh%mhBHvhfL#grJszji
zX0^ak&d<-zPtQ$(O`o8Z7`;uX5qKmXnMV=O+L&nfuH`EDDp{XGFBy`I$ggPc
zoPYdc>3Qk(!sApaQcNu7i;LN%?0R9ZaFp54z9<|Qw-?s)OHMz9iIj4uMd
zO2=X`a9coVfm8rcy)WvHxx;S1-3u+e-C{PItWc9q@#m~##yM@Dv^_MV9sIr7pJ%`z
z;vbl1JafU>fHCg7nNcVEGd;hx!rX%0#gLH&0LEE38kUMB0)v*xt`lw*ef39C-TFK151PXo`fc@jx$dQ*<%#v}
z&BbcDR;)&HUX*o+wPonD*U
z>a;-ATkK}L(T;K=Xr-SrJ_I%du@3nRsSIClWDacKDwZ@}qu1mH~L&V(&%U2*Ps4&6J>
zHCM&E>@9e*o|Gr$&48u6DNoWJbp&i4i_>VGH>1^k);M#TKWE@1AI(3Qy^o&c^v_fO
zo&N94f1!WBH~$cj)FY>|%I31b@h$r|{M)`=&!Oip
zFZ4{_C0_;NKkPg0b=)40-EH;Q0>Ed+94X*OH(WLEs<+}^^kjj1g1##hiiF}3$hR>B
z`ci02T|W3LR+GhO1A579GMeU0fJ3b_mMIg;*P;FUFVGvI_KOkf5p?#`9!nw8o9jvs
z6jj&xP$HP^ObtyzmJra(=99QY2wx(FL;}JSdU~il0GQxJ>%lkAHh8VGX79Ymna^t0#6{UAuY)YXqt=FN#qn`~ng}c+lSn54Af*wg
zXobgTB
zXyD?YBH?%hAz4mUQ4~}eQ^nS@Pe){2Wox^lOReo{zc}>UNUdj0yR0n^7AA^!3a_%8
zx#dk5d=C`PrEkX1Cwfx4Ohr3=
z!syNK4|dl#me)&br9wUu4FvrGI4iFMywvKm`pv+_nSG{!IcP;3=-?#cior=o-C=LY
z75ImtJI$34=Tl(Q#+iAj@w1O+9?rmX`oYwL>HE|7XCBNxfOCb{xkn~rz*X>91DpP>
zf=fH+GD1b3{FLi*VBlZ$65-#8eah>>fLN`fAQP8Daxe$iSJidsp5XwbT
zu|%p=cXW4k4h?>Id9w58(avFM3s~P=Aq~TyrWF{UBL963&dL4dS08Y;a&@!Dqn*qzCy%TixP@C#-_4qn`69q3IC;+vqC_Suk;6-|9U64WB0X+>c
zF4Bi-o%C*c7gfjT-~dt*cgX-Dsc&@O82j<+ANr&78+TTotXFCaTZPraO1_%fjI1GL
zq!7->3h9;Q{e!fZ|~=W+XJgz#qQidb|5(vx*j<8Z$Wx3c^2G@-j%>IQi?1^m*eH!
z!cwjReMO;=F9UF0POKtZkdBW$JMIMvKDQ57!G7iDO1{%G(}8dV{pzp=bE$6
zS?6s=m&t90JLiu@O3^3Lz3gFa;){VlJGXRCRaa#O#i&d#FmNw(NBG@>zE*?ebLE|`
z@$&=Mdv6Zj?*Ci+qvC`7N9nlibLrc*W9gQ1L-s;Z(-qq@+MIG#z9ZXc-Q@1EkC_wn
zQQB+TCS`~89qBUVDrKBeuc2`h)Kej;pnW_2OpnadCV3cy)B8d#Pik
zv(|pBJ<#lGp6h{GdKoY$#WhWm!pF5XWVRI?(OE;{V_~c5gXXT??*^GvQ3z^VYN_
zVhx&nDE9;>>YQ`VyCHkTY)N+}PzWu@YN=YGx?Q`o_s8+`TYp|SH>e-@s{dpAcj^<}
zQUCXbZ?7HSsqNO*KCBp)2iN`B@A&`k=
zQjwf5=PCIbAXmC%gQ{~KhT$s{zrWf)-21TeSFHw>>{;!gT3sz|EN+yS%K2*Uc44I0
zThdizYr<8*rs!Rpp>0Syrn=ld*xl99qZ`y+)PAG+Q*+Q+8(OkCu-rFE(m#mWPVkqB^UMt776fKgN%XQf-CS
zB|(M%n16?VoBu+v&;N~gB&fDl1l#;0-b>ys{;;5@wHGul1B#K3kNT}|D}R)ZiW`Nc
zVyReKSSS|q*=#xuH9nd^V&Ql^lPczF<@ejy-}R0w4U%EekYJcM!s%manJSiwE9Zz{
zKEUU2xoj?nE8vR2qym*pr-XbW8CQ(yhC2+pYwb6*6Pg>H-x}^-_@aNbXK1MVisq(b
zLV8i6ml&j1)i--ahPpZH&
z#5rM!zs_Iht?-t(W%e?AowLO~;M`{2U>I0E+-}|=&%hrSd=MSV4?1=SHhQXkkM;Xk
z_CG#9+C6--zq7r)wX=Eh`1Xq{?}x^^dvt28R4agfpQU5=(e%{Iw97ODZIIs0>}2aW
z3SJvuz=y*WawS|9zeCV2>~6cM*w$_i)Glp*zVXBQ(b~r9Qf=wS^38?6i?2$rDsML5
z9lslU-}|oP2hDluAT+yr)u5(NJD|JL{kH$4@1$q9r_!BoPj|(~BELrV!drogcL91;
z7*n}(FwM%i5~#`nx~(8;PQ(>*$K7dkh!x0%7vh!ldVX`cw*BN_|Jip>hfliy?0Vj@
zrLM}>r5mzMMMas@q`EVMxuL|x&>zSP5`H@lfx
z&s5VJ@#RP^nvSKD(4s?^v|T#f{_U@eSG)UlO07sGP;fy+$W$@qOc~7nMJyhR%jWa=
zaGD$;7qlz_g}6gGq&~0uO0&~b8cV;AJ&kU}S5u{Q4hF>_+*wYqC9CnZ#9C&nc)av}
zs2%P;e|>!Aw*J<+_cu>oUpr_&R2(aI
zl~vht+d^AGl9j|2!4BWBXV`6U{$yJ>mrM)hydwkh!iYZ*^5>y9dEx)YHxkf=wi=&i-<3VI#X5T?&)}
zi|AYz2&6Ou5}0@_lgMX^Af7r|I=9(JaHT&w@$}4ic
zd`L6UuGL87VueDh?pAfmJET40LD4zMP5H5MOTE^6en1!l(RA!K%2Z
zNU5W`ur8?ecDROI`&wvMFs0n}T*!_T%w^<7XUC>{o4iTaQ&`lh_4Lo{Qt+
zdbtQE%Pz9Z+ztLazMkK~SMsH;GKpL!lSrjqZvyKk!NmHb-japG0<
zIJ^@(%8V6z7TZ@e`?AZTVW>eGrh+b~N&wlOw!;KEjAAK7Dv?T}lBqO0lgZ)m`K_%o
zQG2Vt?UwSmb9;F0;^LQ?y=W@R`oCX#@f$!Uh3-Y
zP-xpUAjj(A_X~zams-CRycX|itHVpz7w;CHCDwzhfUy?c1xF6L|CBXq3qh>=?LHWs
zKz{{>9xBYYqw!3#m|o147T33qzxmPdq5ludj|H7SVk
zW5TE`)Q*fG*8)c%+)4*vT9%LPhpz?)5LKuZ;USz53!x+QFeAap(F)Wub({8{c8xMb
z?xuFqyBOV!E@mfpKzLF7w+v=S9V_RSUal;blOTi%6#`jb5@mg0N}NLSk(Eq!<@w{A
zug{(D>(_OvWHO$VEoHZ{1Pm^XMPZUyBzUEuHn~nVB)uTMEIUDo
z|Gt7gbu+pjt%OmAGY97xUrbgKweYLZccCu>Klu**`=O)wN$Od?R@r_2_WIr74?TC<
z?`q$wj-*e-RmqBcK~>P?HECU}J<<^#2v3Aw1$Tp$KrR?Z`P39xF|v_(mU@%gD#dA@VMG;0JNA=fqjHEn2hY
zxG94AC-fU`i^t^+dXv6V@I}m!>`ZIZ%Cs~kO+z=m&{`H$1uytt@Gd}{USJKe^qiZV
zKe+pXC*sG-b=?B+=?h;kAFM7dWfp-9DkO5TTok0q=`8R|AnaXQSY6rL_^WED^saS1
z={(Wg7GLL$!eqLetz?KOeBe?!G!~P=f;kP3DxgTIT6zzopEg3f!up)|mEfdpL$%hk
zb!GR-Uin$^_mW{nx1d1(T>z4V8-fkq6aMqoL*Y&SAir1CD{Ggk#BzupC3I`;!~J7p
zZ%)>hAx$QtFlh#v14x`4KC2h{ERPWk?Y2w-Q^=Zh7Tn98ZO`BSTcK-FeY7*7EJ!yc
z$D-SU>%2?c3!GsX<_-%#Z+$9(PP%)cBhwfE8rkvfc#hmh&K*b9Ub5yaV78>&x|FLJlt#&J15{JOfxA7f(H0pgUgq2_wST)vb))&kR?0(>p)dIChE7xh;yL3a^
zE85$-!#==ygR6t<7dGzH_MX@N-286y>eIpBwI38WK&}Z|M~;*sgaH?WLL*S{z$5_K
z4U#nAy9sy-iB4w%SZbBY)M{O~VdCIPwYIpKUCIE{98Cmc-iR-RY8m{&U?h}E6!R-9
z)u%gmj>f*~HRwj#M|y|*`ZYSGM$^&W-O=9LG15IcGV$@%?nZ5Cy||D9jZZiN|>uBamhm_7>ny8v3*ogtW;!U)0ck+um-^&Bb+8i|4qgu&B9(Y92ST-4_-aTK5ym-bMv9i8
zB#2o;iLgf4!T(4YB@7eWiE^@pDrcxz8mR4h(ckLFJ!=C+L-Mcilki5g1WuU^gE%Q1
z3rE7yP!tJABI#&0p3kl>{kAb$>p$qas_l@g+BC2wAm#|Td>)SnHJvYPYn6+Xa!q@G
z&q&vRe(*2D!RU+gNBWbI6K(Dlh374x~dX+9QhFKPpY!gd>hCM
zxm)btSl_b8I0I}Q$iW3HE{DTq@#q428v|q)Q1nEUR&pD;mE1}alN8i$ww^b_*NZ09
z$D=O}@9e(b+^XzVzF)q%G_f|i*K=Lnr|!}AXq4bG92Hx^R6@h8r+vxzgZ+YATb)
z>Avmx6`XpdArF93JjCQjLs2Hf11f=v{;>?
z7n-IdorD=j+inb$ntWW0)2;kg?x!}j@nICQKfWH3NZvsKFI3Dtunc$dthwr
z#;wDh(n2Pe&L?xBBuFQd0Avboko4KZj)X022|&bqjHe8XDPRd(l2H4z=A32Ow&%EO
zJuy{HYqlNxfo0W{IXyG~jBC>N$nwB+ADum+%98(O|C#xp)Bl^_W~!Rniuv1BHLN8>R00A&-LT9a*Mwknn
za#}ErA<(ESCYL7?Yt=*D`mu@4)m#c7Y%&Zy9gv%DuiFFDN_1T5w0InT4-AxGq8SS(
zk}%^3T@xrlKl<-(o%Bg|@9k`=XB~)Ysd#UwFZ$vY=~rm6JiZbqv9Mc=Zo1VY%fH|xuLGw!$}Y(wDYM*x8ZoG`KVfdn}W
zy-3knb?mxcfveZtRZ!8af#wi)fI#Sw4J3Ubx8L#qPkQV|bixDt8rVGgoPl$hnVy}R
zo3sh}RY^CK!W5W0P1g>)?@u
zWHCuY8DYNS7v+&||ETAgqhLwQBeVV)FN7(m%%&Zapemg-P8(;>OO=+|2CMEINLD1h3QcGccT)HO`|yz-FD@92M@Ij`MLOJQ0s;fxtzT
zI}Mm-co&tC(>Y?HhOdUs`~v4|dJkCvvH$^=4f1I!$N}gW3I>z_SR$5!qu~M1Qy@!l
zg=nac4{n|mmS8_<1?Hn+1g3EQ03dBwzy;cPtKS;2=4^Ru*0SiRI%|#-*RHGLSaDWd
z6>$HUEo_fC{HVa&j_Mddp=g;0RulMRRL6kw^Trv|3~20T?6b}}H)usH@H=py^Y(d%
zJMwpzj4$O0SxgcEBnqfh3EUhc3g`*~s;@y)6c)8cd?TTe+(d1nH8U`jCQ<{fiPA)G
zQBW>%zT&@@TvI$7%jOo6>yfR%d89Mkg=m9PgqPw$?c_XXeaSiDekZsp9hd4==h`m}
z8lJ;mMgH&9E>dzuEk2mjz}^I8b+65D4_bnzpgCyrqf?l9xAC88MA)7HEp65R#Qzku
za{Hh?$fLVnAWKL=n-5zxpixXkVsLsPkQgIwKXfX74@lu1a4$$
zrnv!B?;weT|HL4Ic%7-__A4%poHq=0_i43it*S?*70Y;HXglOwG0M>J+xQ}ZRHBe8
z#ahXAUFCe?TJC!MnZMwOqgM(Q%{S`=w%_h_XyQa%uLP9%+5^Dps_m(V*wbj
zn&!-NW*D}b=ix@f1wq_fVDbw095zm1S^&5JumO6%Q7#s=zn(eYJj@|x-LuYF`>fUI
z@+P9I!G*}yU73guA_yWAOKQSHM#n*Bhha4u_Gl>sDdj)%eso;|wX^k*1M1H(W?0lS7>$5t_$nCF-qxN+PVZWw=_c!hS2{ekn5
z^QGVq*%MvKka`14TT4jJpK_nB&Ug{P+Tm~{=8yOi-lPlACm_*~Eo6;ZQkI-KYs#4l
z^BK^F<>nHz$Q%k|JTu-|uo?HXbH;sYo+-zqebNq-5-Zeu^Fwr+Kl^a@(cHu7M^lrN
z)05`egsbXbb>H#{OZ0wFiAX^4&B8ERs4b)x5{7~%aV#Kk^a&CP94I6p)uZYYxa**T
z1R+#2t_fr)P52fz0dO0v)X4Y)vI(_b-YXgsjsWR-kw40X-Bjin>jG<#J;3V|^a}b!
zUE*%}h4vf$6T=_IpS&+_CKrLBTJ;w_dG~_5?8-Y6?zk6pOCZYi0|+fp>Uf(#$Yj{o&Zz$IaFz9nl;ba
z0OHv|(**uuG+8X+@cVCv2l_fyVji7_Cu7OzaIzTy3=DnIy8aK4K}Fu^hzR@}6@r0K
z8DvWUQn1a077~_DWYal}R-VDIzc^kTC`^PmJj>3S>u=vX7|+yv@^RkQ#
zXjDZ(lk3dr^19qe0(RS?e}<02B_tgNk|G>M;-G5H6m#2|x7jaJA7by5{fUn7g~<2e
zm&nt=6HskeofX@HZQ1eIQL`)=i>4LJx;bx588gQ8e0(lC8<`2sAYlKz2B-bgK6v`4
zyp!l|kaY&s#YVtEcC!Q0$O}Y#D0sua%j|-|xDYSIaWHfYt(n?DY9NA<8|YB=Y4wzP
zawDygR!2IEN9_#mQ_LqVpTLy79@j)@CN>ir@fZ@L72Rj!t6H^+ZvD`~K(%{U^M&j$
z=@Z$G{JHYIa$I$(