2022-10-15 材料匹配数据绑定修改

This commit is contained in:
李鹏飞 2022-10-15 17:58:32 +08:00
parent 0ec0031e20
commit baebd011ae
4 changed files with 51 additions and 34 deletions

View File

@ -227,50 +227,63 @@ namespace BLL
public static bool isInStockByPipeline(string pipelineid,string projectid)
{
bool state = true ;
var q = from x in Funs.DB.HJGL_PipeLineMat where x.PipelineId==pipelineid
group x by x.MaterialCode into s
select new
{
MaterialCode = s.Key,
Number = s.Sum(p => p.Number)
};//获取管线所用材料
if (q!=null&&q.Count() >0) //判断管线是否有关联材料
try
{
var pipemodel = BLL.PipelineService.GetPipelineByPipelineId(pipelineid);
List<Model.MaterialStockItem> list = GetMaterialStockItems(projectid, pipemodel.PipeArea);
if (list!=null &&list.Count > 0) //判断是否有库存信息
{
foreach (var item in q)
{
var StockMater = list.Where(x => x.MaterialCode == item.MaterialCode).FirstOrDefault();
if (StockMater!=null) //判断该材料是否存在库存
var q = from x in Funs.DB.HJGL_PipeLineMat
where x.PipelineId == pipelineid
group x by x.MaterialCode into s
select new
{
var StockNum = StockMater.MaterialNum;
if ((decimal)item.Number > StockNum) //实际大于库存
MaterialCode = s.Key,
Number = s.Sum(p => p.Number)
};//获取管线所用材料
if (q != null && q.Count() > 0) //判断管线是否有关联材料
{
var pipemodel = BLL.PipelineService.GetPipelineByPipelineId(pipelineid);
List<Model.MaterialStockItem> list = GetMaterialStockItems(projectid, pipemodel.PipeArea);
if (list != null && list.Count > 0) //判断是否有库存信息
{
foreach (var item in q)
{
var StockMater = list.Where(x => x.MaterialCode == item.MaterialCode).FirstOrDefault();
if (StockMater != null) //判断该材料是否存在库存
{
var StockNum = StockMater.MaterialNum;
if ((decimal)item.Number > StockNum) //实际大于库存
{
state = false; //库存不足
}
}
else
{
state = false; //库存不足
}
}
else
{
state = false; //库存不足
}
}
else
{
state = false; //库存不足
}
}
else
{
state = false; //库存不足
state = false; //库存不足
}
}
else
{
state = false; //库存不足
}
catch (System.Exception ex)
{
state = false;
ErrLogInfo.WriteLog(ex.ToString ());
}
return state;
}

View File

@ -78,7 +78,7 @@
</Toolbars>
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="材料匹配明细" OnRowClick="Grid1_RowClick" EnableRowClickEvent="true"
EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="MaterialCode,Number"
EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="MaterialCode,Number" ForceFit="true"
EnableColumnLines="true" DataIDField="MaterialCode" AllowSorting="true" OnRowDataBound="Grid1_RowDataBound"
SortField="MaterialCode" SortDirection="ASC" OnSort="Grid1_Sort">
<Columns>

View File

@ -139,11 +139,15 @@ namespace FineUIPro.Web.HJGL.WeldingManage
e.Node.Nodes.Clear();
if (e.Node.CommandName == "单位工程")
{
var pipeline = (from x in Funs.DB.HJGL_Pipeline
where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == e.Node.NodeID && x.PipeArea == PipeArea
&& x.PipelineCode.Contains(txtPipelineCode.Text.Trim())
orderby x.PipelineCode
select x).ToList();
if (!string .IsNullOrEmpty (txtPipelineCode.Text.Trim()))
{
pipeline= pipeline.Where(x => x.PipelineCode.Contains(txtPipelineCode.Text.Trim())).ToList();
}
foreach (var item in pipeline)
{
//var jotCount = (from x in Funs.DB.HJGL_WeldJoint where x.PipelineId == item.PipelineId && x.IsTwoJoint == null select x).Count();

View File

@ -20,10 +20,10 @@ namespace Model
/// 规格
/// </summary>
public string MaterialSpec { get; set; }
/// <summary>
/// 材质
/// </summary>
public string MaterialMade { get; set; }
///// <summary>
///// 材质
///// </summary>
//public string MaterialMade { get; set; }
/// <summary>
/// 单位
/// </summary>