From ba37c43d06dd3ece2b419b79eba3ce9916071d0a Mon Sep 17 00:00:00 2001
From: fei550 <1420031550@qq.com>
Date: Wed, 27 Nov 2024 17:05:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=B0=E8=B4=A7=E5=88=86=E6=9E=90=E6=80=BB?=
 =?UTF-8?q?=E4=BD=93=E5=8C=B9=E9=85=8D=E7=8E=87=E7=AE=97=E6=B3=95=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .vs/SGGL_SeDin_New/v17/.wsuo                  | Bin 64512 -> 66048 bytes
 SGGL/BLL/CLGL/TwArrivalStatisticsService.cs   |  18 ++++++++++++------
 .../CLGL/ArrivalStatistics.aspx.cs            |   8 ++++++--
 .../BiddingManagement/SetSubReviewDetail.aspx |   4 ++--
 4 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/.vs/SGGL_SeDin_New/v17/.wsuo b/.vs/SGGL_SeDin_New/v17/.wsuo
index 51d45a06837fd1ee6b2a50390053588c6da1f246..c2e634a60230d7f9cdf46998fe2ca9ea3fa622fc 100644
GIT binary patch
delta 2569
zcmc(gUrbw79LIZZFIy>>mO?uiFet1*<<HjAf_34~h4P<5+f;B9CVy5iIu}i(lRw#d
zH+V8Lardha8WSg)__9ReebWca*qcOo(uetAd@}0v1rjjX=I`KeSGFv3Mmgyx=lp*6
zoZtQZzW1C{Wz(oEh)W@Xi6{|@Eo<+mx~|AKSdoER4rYZ}){6}x$*Pes#!Lcv?@+^K
zt1GjXjD7ulqQQ^}CKkh!VXCo_RX~^t2a!Qk5w~esF7*<@Ls+P{BP!<NB~eN*Cd)~b
zVOh*cE2mKfKA=%Gjk3s>YxmK}Pt+0h#FGTRGw1a+(V&@-i58-j2oh~XJJCUO5?w?$
z(L?kSA)=4q6@-Zhah6^+e|gki_8J+}#0)V@%n|1Zp80v|lf-S@V&S{GEkz$$w>rIU
zJRWc96z>-GTqWLi6x>ICuA+?+E3k3>_7hxB6Jf`pjECrF`cuCH|G$2&N6}9;J4Idv
zoaRE27Y^Ahhf2u94US7U-tj%L%U5&PK1#iJ*E6h|8%#TUK{eZ14+(Zdl?wOfy_R)$
z7#o%(D@DSZRGUR@)4Iweeqyo+DtP-~rSa`8Vaq$m+(^`hB`!mbZUU>oMo|*$MTL0N
z=a=|8yY6vX85wqL*?KY=-!T=sXRHf}?671c*I~W86C2qvQ<~0&shl;m<$G8+685jK
zB6#5uL`*wE5<j|p3+^P0bw@<v3F<>)%A)Kl7n`}E`>NHZ@-8toJNVFCow~QN2j+T7
zEt=BFrPo6*SFs;$#Ab2Vb~V?d)ucXS6rP%MS~eIgbkw3p=`#4c_cyxwcu-e-Z2Xj`
zHXg63_XQ?u{B?nNO<=-1Rx?)X_11af6Y<IVNm{&ny;_oj;*_C`xFMX$LuyD?OWp1x
zhEs-DDeNfm9$i<*48wGJ^&8%Zp7AYxt2sU!t=?>yc;}+F7WXjK6~sz@qo%lmLMG$t
z^NVulD`@NGA+|SFsri(c;7vP1>0HE2eh-3{K4ca65H!|dx}Z1H;HF21blFOkWbpq8
z-qcF^{8kzqAa?3u9Y|E(VLl|PlIi@;^biJ|8>xD10T(?2{r-}%USVqa%7c{jOH2(+
zF)I>*c^1;P0(0!1aqLUs{$0G@xXM^7mYbXR^W8+?i{_^^Syq_j8;nJ`vppD#V70~n
zVX8&=v?=uu=68x(s#_M+{x&T1H*A08RKFef7{p+>5^~sqx5HIX!X}s^0Voj>*Tb#G
zlax(*qy?`>>KUW|dB^tbROB=+L>-W$3Q~Ow|3&11L3}gt;+||u1z$T4Y6p*3FeoQd
zu$^$hb#fTWvoGV5=WLLNWF!Ab^FxhLhTM6<k=Q_Mv@6y=^2|WjKuiB{tg|yT-0=du
z$9a^Gjr`<lKaS*y|LO=Y#+y)j)s2S9Y!v>KuRZ<I)$YYb0i(~CLq4CUHT`-meerhz
zi%OAJwD|)=WL(7f&xN>_l<~^Detdt^$@XFS^9$-}6NYbQ!9OEo^p~@E%UX>qR_9~k
H5wiXOfO`!}

delta 2356
zcmdUwUu;uV9LIZZZ)dsQc3s=89YeO&GP-q@ZY^$-bzIVc!!^CFV`Kk>Il74g^2go;
z5wnXJo-l#?izYt!vXE#ZiOBWA7$2%6#vl>jeDKXjAC!mHFr&=xDZ5x5MvY61C;RlA
z^E<!u=YD^`bEdy4>bLDzG6LI7twOW=*on!=d)vQZtu~uY_tGih6x&T@VV*@vvkyDN
zFfXG}J`i?oL8m5*9~37su{r5Siw`%Ub^$l20}_aVI~Z#~{UG3eGHUXOK{_nT^sy+X
zLNGiG_&yQ9ovhN1e(fJ@kD%`Xage7Sj<fSmqBRWmfDteX_JT1m4ko}Pm;z6MePBPB
z22X<-Z~zp*ESLk&fP>&!@EkY<4ud1$d2kdQ1IKMPuk8dHFMuM@z-b(-$&f_~in1YO
zR&<^o`rA6Es&%%+aAM_O(BX>m!WCZ!cm%lOcdg6IK{_M)+PUTr03HLbIiF?CtU=%M
z_R{-e;4g#VtD3=Q@*vcM|4R_$4djuW6qbS_&mB@EC1WYVlh0~fHBUsV&FjvUKL74&
zdpG(CKsTg5L-IQY`8d^yfs50h8~@3s?nM@&vU{Gjl2$v<YRz)(O(ygB@ek**;}@A0
zn^c!A0E@fI%65_FS7l+vWI3||D*K0>_9{;*)_)~CVBq52^Lw1MhA&-=-&mfk75l};
z2%QXMWD$m_WvrYakdwJb^$JvU>%Tufl^fMnr#Fl1&oiSVP3eX%2T$-(da>gPN{3TM
zv|?l(q(!qX#>4nf)us;qph&b-KU6t<OVtqjM~5%Ekx&~8xY?RF%a1`tA1uBC+eBKk
zD)akjy^LIM7N&CZkn#hh<>qi<Ccd@jK%qO9+?tq+C41wuv6;D^-dNXcSD~lSJ=6VI
z53Ux&AK<0sq=HycX|Haymgx9cBaM%3COs6Ph!FI=mOqlX^0it2(RAnSzS%clAx|hs
zZTA~ElStErMDjkg8%b#APMLZ*EzmWg%Uo>Bu(dw2(V2Et5`(`__Yx;fTIVwBA}uyA
z^QVtLE4-}n2X+rS+pwy&tyzqpw;SGKC5kEy_%c=meXAqr;Qycew6y8^U2PtfnGs$Q
zEU7c2x5%8N^`2#-xzzg-`>nI>3t@EvFQ#rVwv#^DzFkg?4(E7~cczDPrmTFxt_~`~
z)&A0-jxP*~6i+Lrk{J+aAbZ+SN9j(s!BG9AtMxRZMyaGakrys{U5y&KUG$l{jr5#E
z*HNESYl(6(BY%kAg}0v9Nok4Gtq~6?*@1t*-pDAuk?&x2w4-GUR?V$-0`c588>im3
zlM;dkQwk$}LLq&;M5PJc4khW@zLb6JrbPDrFB`ZZ?@R`{@4~dWFxOAnw<J^g{zpck
u%Mt23=%o$ctvB~vy1bi&OKqg+L9_qXr|am#hc#3>8Z<Zl{4HDfN%$2eXa*Vp

diff --git a/SGGL/BLL/CLGL/TwArrivalStatisticsService.cs b/SGGL/BLL/CLGL/TwArrivalStatisticsService.cs
index 4f3e753f..aa357836 100644
--- a/SGGL/BLL/CLGL/TwArrivalStatisticsService.cs
+++ b/SGGL/BLL/CLGL/TwArrivalStatisticsService.cs
@@ -17,12 +17,13 @@ namespace BLL
         {
             using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
             {
+                string PipeArea= WarehouseCode == "工厂预制"?"1":"2";
                 ///所需材料数量列表
                 var NeedOutMateriaList = from x in db.HJGL_PipeLineMat
                                      join y in db.HJGL_MaterialCodeLib on x.MaterialCode equals y.MaterialCode
                                      join z in db.HJGL_Pipeline on x.PipelineId equals z.PipelineId
-                                     where  z.ProjectId == projectid  && (string.IsNullOrEmpty(materialCode) || x.MaterialCode .Contains( materialCode))
-                                     group x by x.MaterialCode
+                                     where  z.ProjectId == projectid  && (string.IsNullOrEmpty(materialCode) || x.MaterialCode .Contains( materialCode))   && z.PipeArea== PipeArea
+                                         group x by x.MaterialCode
                  into g
                                      select new
                                      {
@@ -31,18 +32,23 @@ namespace BLL
                                      };
                 ///实际材料入库数量列表
                 var RealInMateriaList = from x in db.Tw_InputDetail
-                                        join y in db.HJGL_MaterialCodeLib on x.MaterialCode equals y.MaterialCode
+                                        join master in db.Tw_InputMaster on x.InputMasterId equals master.Id
+                                        join y in db.HJGL_MaterialCodeLib on x.MaterialCode equals y.MaterialCode 
+                                        where master.ProjectId== projectid && master.WarehouseCode== WarehouseCode
                                         group x by x.MaterialCode
                  into g
-                                        where   (string.IsNullOrEmpty(materialCode) || g.Key.Contains( materialCode))
+                                        where   (string.IsNullOrEmpty(materialCode) || g.Key.Contains( materialCode)) 
                                         select new
                                         {
                                             g.Key,
                                             RealNum = g.Sum(x => x.ActNum) ?? 0,
                                         };
+                //库存数量
                 var tw_MaterialStock=from x in db.Tw_MaterialStock
-                                      where x.WarehouseCode==WarehouseCode
-                                      select x;
+                                      where x.WarehouseCode==WarehouseCode && x.ProjectId== projectid
+                                     select x;
+
+
                 var StatisticsList =(from x in NeedOutMateriaList
                                     join y in RealInMateriaList on x.Key equals y.Key into gg
                                     from y in gg.DefaultIfEmpty()
diff --git a/SGGL/FineUIPro.Web/CLGL/ArrivalStatistics.aspx.cs b/SGGL/FineUIPro.Web/CLGL/ArrivalStatistics.aspx.cs
index f88c0779..4507a6b8 100644
--- a/SGGL/FineUIPro.Web/CLGL/ArrivalStatistics.aspx.cs
+++ b/SGGL/FineUIPro.Web/CLGL/ArrivalStatistics.aspx.cs
@@ -22,7 +22,7 @@ namespace FineUIPro.Web.CLGL
                 drpWarehouse.DataBind(); 
                 this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString();
                 // 绑定表格
-                this.BindGrid();
+               // this.BindGrid();
             }
         }
 
@@ -36,7 +36,11 @@ namespace FineUIPro.Web.CLGL
 
             if (tb.Count() > 0)
             {
-                lbRate.Text = "总体匹配率：" + Math.Round(tb.Sum(x => x.MatchRate) * 100 / tb.Count(), 4) + "%";
+                decimal needNum = 0;
+                decimal realNum = 0;
+                needNum = tb.Sum(x => x.NeedNum);
+                realNum = tb.Sum(x => x.RealNum > x.NeedNum ? x.NeedNum : x.RealNum);
+                lbRate.Text = "总体匹配率：" + Math.Round(realNum * 100 / needNum, 4) + "%";
             }
             else
             {
diff --git a/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReviewDetail.aspx b/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReviewDetail.aspx
index a759843e..7ddbd463 100644
--- a/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReviewDetail.aspx
+++ b/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReviewDetail.aspx
@@ -63,7 +63,7 @@
                             <Items>
                                 <f:Grid ID="Grid_MinPrice" CssClass="blockpanel" ShowBorder="true" ShowHeader="false" Title="" EnableCollapse="false"
                                     runat="server" DataKeyNames="ID" AllowCellEditing="true" ForceFit="true" SortField="SortIndex" AllowPaging="true"  PageSize="300" EnableBigDataRowTip="false"  EnableBigData="true" IsDatabasePaging="false"
-                                    EnableColumnLines="true" DataIDField="ID">
+                                    EnableColumnLines="true" DataIDField="ID" >
 
                                     <Columns>
                                         <f:RowNumberField />
@@ -85,7 +85,7 @@
                             <Items>
                                 <f:Grid ID="Grid_ConEvaluation" CssClass="blockpanel" ShowBorder="true" ShowHeader="false" Title="" EnableCollapse="false"
                                     runat="server" DataKeyNames="ID" AllowCellEditing="true" ForceFit="true" SortField="SortIndex" AllowPaging="true"  PageSize="300" EnableBigDataRowTip="false"  EnableBigData="true" IsDatabasePaging="false"
-                                    EnableColumnLines="true" DataIDField="ID">
+                                    EnableColumnLines="true" DataIDField="ID" Height="400">
 
                                     <Columns>
                                         <f:RowNumberField />