lpf
/
SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

到货分析总体匹配率算法修改

This commit is contained in:
李鹏飞 2024-11-27 17:05:01 +08:00
parent 73a869c851
commit ba37c43d06
4 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.vs/SGGL_SeDin_New/v17/.wsuo
View File

Binary file not shown.

18
SGGL/BLL/CLGL/TwArrivalStatisticsService.cs
View File

@ -17,12 +17,13 @@ namespace BLL
{ {
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{ {
string PipeArea= WarehouseCode == "工厂预制"?"1":"2";
///所需材料数量列表 ///所需材料数量列表
var NeedOutMateriaList = from x in db.HJGL_PipeLineMat var NeedOutMateriaList = from x in db.HJGL_PipeLineMat
join y in db.HJGL_MaterialCodeLib on x.MaterialCode equals y.MaterialCode join y in db.HJGL_MaterialCodeLib on x.MaterialCode equals y.MaterialCode
join z in db.HJGL_Pipeline on x.PipelineId equals z.PipelineId join z in db.HJGL_Pipeline on x.PipelineId equals z.PipelineId
where z.ProjectId == projectid && (string.IsNullOrEmpty(materialCode) || x.MaterialCode .Contains( materialCode)) where z.ProjectId == projectid && (string.IsNullOrEmpty(materialCode) || x.MaterialCode .Contains( materialCode)) && z.PipeArea== PipeArea
group x by x.MaterialCode group x by x.MaterialCode
into g into g
select new select new
{ {
@ -31,18 +32,23 @@ namespace BLL
}; };
///实际材料入库数量列表 ///实际材料入库数量列表
var RealInMateriaList = from x in db.Tw_InputDetail 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 group x by x.MaterialCode
into g into g
where (string.IsNullOrEmpty(materialCode) || g.Key.Contains( materialCode)) where (string.IsNullOrEmpty(materialCode) || g.Key.Contains( materialCode))
select new select new
{ {
g.Key, g.Key,
RealNum = g.Sum(x => x.ActNum) ?? 0, RealNum = g.Sum(x => x.ActNum) ?? 0,
}; };
//库存数量
var tw_MaterialStock=from x in db.Tw_MaterialStock var tw_MaterialStock=from x in db.Tw_MaterialStock
where x.WarehouseCode==WarehouseCode where x.WarehouseCode==WarehouseCode && x.ProjectId== projectid
select x; select x;
var StatisticsList =(from x in NeedOutMateriaList var StatisticsList =(from x in NeedOutMateriaList
join y in RealInMateriaList on x.Key equals y.Key into gg join y in RealInMateriaList on x.Key equals y.Key into gg
from y in gg.DefaultIfEmpty() from y in gg.DefaultIfEmpty()

8
SGGL/FineUIPro.Web/CLGL/ArrivalStatistics.aspx.cs
View File

@ -22,7 +22,7 @@ namespace FineUIPro.Web.CLGL
drpWarehouse.DataBind(); drpWarehouse.DataBind();
this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString(); this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString();
// 绑定表格 // 绑定表格
this.BindGrid(); // this.BindGrid();
} }
} }
@ -36,7 +36,11 @@ namespace FineUIPro.Web.CLGL
if (tb.Count() > 0) 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 else
{ {

4
SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReviewDetail.aspx
View File

@ -63,7 +63,7 @@
<Items> <Items>
<f:Grid ID="Grid_MinPrice" CssClass="blockpanel" ShowBorder="true" ShowHeader="false" Title="" EnableCollapse="false" <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" 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> <Columns>
<f:RowNumberField /> <f:RowNumberField />
@ -85,7 +85,7 @@
<Items> <Items>
<f:Grid ID="Grid_ConEvaluation" CssClass="blockpanel" ShowBorder="true" ShowHeader="false" Title="" EnableCollapse="false" <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" 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> <Columns>
<f:RowNumberField /> <f:RowNumberField />