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

2022-11-01 焊接包装管理绑值修改，三维传参修改

This commit is contained in:
李鹏飞 2022-11-01 17:11:30 +08:00
parent 00dcb84b0a
commit eeddc36939
5 changed files with 125 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
SGGL/BLL/HJGL/PreDesign/PackagingManageService .cs
View File

@ -12,8 +12,28 @@ using System.Text;
namespace BLL namespace BLL
{ {
public static class HJGL_PackagingmanageService public static class HJGL_PackagingmanageService
{ {
public class PackagingManageItem
{
public string PackagingManageId { get; set; }
public string PackagingCode { get; set; }
public string ProjectId { get; set; }
public string ProjectName { get; set; }
public string ContactName { get; set; }
public string ContactPhone { get; set; }
public string StackingPosition { get; set; }
public int? State { get; set; }
public string ReceiveMan { get; set; }
public string ReceiveDate { get; set; }
public string PlanStartDate { get; set; }
}
public static Model.SGGLDB db = Funs.DB; public static Model.SGGLDB db = Funs.DB;
/// <summary> /// <summary>
/// 未到场 /// 未到场
@ -87,6 +107,46 @@ namespace BLL
{ {
return db.HJGL_PackagingManage.FirstOrDefault(x => x.PackagingManageId == PackagingManageId); return db.HJGL_PackagingManage.FirstOrDefault(x => x.PackagingManageId == PackagingManageId);
} }
public static string GetMinPlanStartDate(string PackagingManageId)
{
string PlanStartDate = "";
DataTable tb = BLL.HJGL_PackagingmanageService.GetPackagingDetailById(PackagingManageId);
var dtTable = tb.AsEnumerable().OrderBy(o => o["PlanStartDate"]).CopyToDataTable();
if (dtTable.Rows != null && dtTable.Rows.Count > 0)
{
PlanStartDate = dtTable.Rows[0]["PlanStartDate"].ToString();
}
return PlanStartDate;
}
public static List<PackagingManageItem> GetPackagingManageList(string projectId,string PackagingCode)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
var q = (from x in db.HJGL_PackagingManage
join n in db.Base_Project on x.ProjectId equals n.ProjectId
join m in db.Person_Persons on x.ReceiveMan equals m.PersonId into tt
from t in tt.DefaultIfEmpty()
where x.ProjectId == projectId
&&(string.IsNullOrEmpty(PackagingCode)|| x.PackagingCode.Contains(PackagingCode) )
select new PackagingManageItem
{
PackagingManageId = x.PackagingManageId,
PackagingCode = x.PackagingCode,
ProjectName = n.ProjectName,
ContactName = x.ContactName,
ContactPhone = x.ContactPhone,
StackingPosition = x.StackingPosition,
State = x.State,
ReceiveMan = t.PersonName,
ReceiveDate = string.Format("{0:g}", x.ReceiveDate),
PlanStartDate = GetMinPlanStartDate(x.PackagingManageId),
}).Distinct();
return q.ToList();
}
}
/// <summary> /// <summary>
/// 形成出库单 /// 形成出库单
/// </summary> /// </summary>
@ -113,7 +173,7 @@ namespace BLL
if (!string .IsNullOrEmpty(model.PipelineComponentId)) if (!string .IsNullOrEmpty(model.PipelineComponentId))
{ {
var PipelineComponentIds = model.PipelineComponentId.Split(','); var PipelineComponentIds = model.PipelineComponentId.Split(',');
string strSql = @"select com.PipelineComponentId, com.PipelineComponentCode,com.PlanStartDate,unitwork.UnitWorkName,'1' as num ,'个' as CU string strSql = @"select com.PipelineComponentId, com.PipelineComponentCode,pipe.PlanStartDate,unitwork.UnitWorkName,'1' as num ,'个' as CU
from HJGL_Pipeline_Component com from HJGL_Pipeline_Component com
left join HJGL_Pipeline pipe on com.PipelineId=pipe.PipelineId left join HJGL_Pipeline pipe on com.PipelineId=pipe.PipelineId
left join WBS_UnitWork unitwork on pipe.UnitWorkId=unitwork.UnitWorkId left join WBS_UnitWork unitwork on pipe.UnitWorkId=unitwork.UnitWorkId

4
SGGL/FineUIPro.Web/File/Fastreport/装箱单.frx
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Report ScriptLanguage="CSharp" ReportInfo.Created="03/13/2022 11:00:20" ReportInfo.Modified="10/19/2022 15:06:36" ReportInfo.CreatorVersion="2017.1.16.0"> <Report ScriptLanguage="CSharp" ReportInfo.Created="03/13/2022 11:00:20" ReportInfo.Modified="11/01/2022 16:58:33" ReportInfo.CreatorVersion="2017.1.16.0">
<ScriptText>using System; <ScriptText>using System;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
@ -42,7 +42,7 @@ namespace FastReport
} }
</ScriptText> </ScriptText>
<Dictionary> <Dictionary>
<MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWRFKS+l7F0yFlJpjVuf6Gu5i"/> <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWRFfNnlsPZ6nuhwpLtU3gTu4"/>
<TableDataSource Name="Data" ReferenceName="Data" DataType="System.Int32" Enabled="true"> <TableDataSource Name="Data" ReferenceName="Data" DataType="System.Int32" Enabled="true">
<Column Name="PipelineComponentId" DataType="System.String"/> <Column Name="PipelineComponentId" DataType="System.String"/>
<Column Name="PipelineComponentCode" DataType="System.String"/> <Column Name="PipelineComponentCode" DataType="System.String"/>

4
SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs
View File

@ -242,7 +242,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
colorModel = BLL.Project_SysSetService.GetColorModel(this.CurrUser.LoginProjectId); colorModel = BLL.Project_SysSetService.GetColorModel(this.CurrUser.LoginProjectId);
parameter3D.ColorModel = colorModel; parameter3D.ColorModel = colorModel;
parameter3D.TagNum = ""; parameter3D.TagNum = "";
parameter3D.ButtonType = "0,2"; parameter3D.ButtonType = "0,2.1";
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID); parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
parameter3D.Completed_weldedjunction = Completed_weldedjunction; parameter3D.Completed_weldedjunction = Completed_weldedjunction;
parameter3D.Incomplete_weldjunction = Incomplete_weldjunction; parameter3D.Incomplete_weldjunction = Incomplete_weldjunction;
@ -525,7 +525,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
colorModel = BLL.Project_SysSetService.GetColorModel(this.CurrUser.LoginProjectId); colorModel = BLL.Project_SysSetService.GetColorModel(this.CurrUser.LoginProjectId);
parameter3D.ColorModel = colorModel; parameter3D.ColorModel = colorModel;
parameter3D.TagNum = pipecode; parameter3D.TagNum = pipecode;
parameter3D.ButtonType = "0,2"; parameter3D.ButtonType = "0,2.1";
parameter3D.Completed_weldedjunction = Completed_weldedjunction; parameter3D.Completed_weldedjunction = Completed_weldedjunction;
parameter3D.Incomplete_weldjunction=Incomplete_weldjunction; parameter3D.Incomplete_weldjunction=Incomplete_weldjunction;
if (this.tvControlItem.SelectedNode.CommandName == "单位工程") if (this.tvControlItem.SelectedNode.CommandName == "单位工程")

52
SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx.cs
View File

@ -10,7 +10,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
{ {
public partial class PipelineQuery : PageBase public partial class PipelineQuery : PageBase
{ {
public string Completed_pipeline public string Line_No
{ {
get get
{ {
@ -21,17 +21,17 @@ namespace FineUIPro.Web.HJGL.InfoQuery
ViewState["Completed_pipeline"] = value; ViewState["Completed_pipeline"] = value;
} }
} }
public string Incomplete_pipeline //public string Incomplete_pipeline
{ //{
get // get
{ // {
return (string)ViewState["Incomplete_pipeline"]; // return (string)ViewState["Incomplete_pipeline"];
} // }
set // set
{ // {
ViewState["Incomplete_pipeline"] = value; // ViewState["Incomplete_pipeline"] = value;
} // }
} //}
protected void Page_Load(object sender, EventArgs e) protected void Page_Load(object sender, EventArgs e)
{ {
ctlAuditFlow.Url = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId); ctlAuditFlow.Url = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId);
@ -141,8 +141,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
parameter3D.TagNum = ""; parameter3D.TagNum = "";
parameter3D.ButtonType = "0,2"; parameter3D.ButtonType = "0,2";
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID); parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
parameter3D.Completed_pipeline = Completed_pipeline; parameter3D.Line_No = Line_No;
parameter3D.Incomplete_pipeline = Incomplete_pipeline;
parameter3D.Transparency = colorModel.PipelineComplete; parameter3D.Transparency = colorModel.PipelineComplete;
parameter3D.Finished_color = colorModel.JointCompleteColor; parameter3D.Finished_color = colorModel.JointCompleteColor;
parameter3D.Incomplete_color = colorModel.JointNOCompleteColor; parameter3D.Incomplete_color = colorModel.JointNOCompleteColor;
@ -226,19 +225,19 @@ namespace FineUIPro.Web.HJGL.InfoQuery
{ {
Completed_pipelineList.Add("/" + item.PipelineCode); Completed_pipelineList.Add("/" + item.PipelineCode);
} }
Completed_pipeline = string.Join(",", Completed_pipelineList); Line_No = string.Join(",", Completed_pipelineList);
} }
var q1 = view_HJGL_Pipelines.Where(x => x.IsFinished != true);//获取未完成管线 //var q1 = view_HJGL_Pipelines.Where(x => x.IsFinished != true);//获取未完成管线
if (q1.Any()) //if (q1.Any())
{ //{
List<string> Incomplete_pipelineList = new List<string>(); // List<string> Incomplete_pipelineList = new List<string>();
foreach (var item in q1) // foreach (var item in q1)
{ // {
Incomplete_pipelineList.Add("/" + item.PipelineCode); // Incomplete_pipelineList.Add("/" + item.PipelineCode);
} // }
Incomplete_pipeline = string.Join(",", Incomplete_pipelineList); // Incomplete_pipeline = string.Join(",", Incomplete_pipelineList);
} //}
} }
@ -455,8 +454,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
parameter3D.TagNum = pipecode; parameter3D.TagNum = pipecode;
parameter3D.ButtonType = "0,2"; parameter3D.ButtonType = "0,2";
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID); parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
parameter3D.Completed_pipeline = Completed_pipeline; parameter3D.Line_No = Line_No;
parameter3D.Incomplete_pipeline = Incomplete_pipeline;
parameter3D.Transparency = colorModel.PipelineComplete; parameter3D.Transparency = colorModel.PipelineComplete;
parameter3D.Finished_color = colorModel.JointCompleteColor; parameter3D.Finished_color = colorModel.JointCompleteColor;
parameter3D.Incomplete_color = colorModel.JointNOCompleteColor; parameter3D.Incomplete_color = colorModel.JointNOCompleteColor;

66
SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManage.aspx.cs
View File

@ -33,38 +33,42 @@ namespace FineUIPro.Web.HJGL.PreDesign
/// </summary> /// </summary>
private void BindGrid() private void BindGrid()
{ {
string strSql = @"select pack.PackagingManageId, // string strSql = @"select pack.PackagingManageId,
pack.PackagingCode, // pack.PackagingCode,
com.PipelineComponentCode, // com.PipelineComponentCode,
unit.UnitWorkName, // unit.UnitWorkName,
pipe.PlanStartDate, // pipe.PlanStartDate,
pack.ProjectId, // pack.ProjectId,
pack.StackingPosition, // pack.StackingPosition,
pack.State, // pack.State,
pack.ContactName, // pack.ContactName,
pack.ContactPhone, // pack.ContactPhone,
pack.ReceiveDate, //pack.ReceiveDate,
person.PersonName //person.PersonName
from HJGL_PackagingManage as pack // from HJGL_PackagingManage as pack
left join HJGL_Pipeline_Component com on com.PipelineComponentId=pack.PipelineComponentId // left join HJGL_Pipeline_Component com on com.PipelineComponentId=pack.PipelineComponentId
left join HJGL_Pipeline pipe on pipe.PipelineId =com.PipelineId // left join HJGL_Pipeline pipe on pipe.PipelineId =com.PipelineId
left join WBS_UnitWork unit on pipe.UnitWorkId=unit.UnitWorkId // left join WBS_UnitWork unit on pipe.UnitWorkId=unit.UnitWorkId
left join Person_Persons person on pack.ReceiveMan=person.PersonId // left join Person_Persons person on pack.ReceiveMan=person.PersonId
WHERE pack.ProjectId = @ProjectId "; // WHERE pack.ProjectId = @ProjectId ";
List<SqlParameter> listStr = new List<SqlParameter>(); // List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId)); // listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
if (!string.IsNullOrEmpty(this.txtPackagingCode.Text.Trim())) // if (!string.IsNullOrEmpty(this.txtPackagingCode.Text.Trim()))
{ // {
strSql += " AND pack.PackagingCode LIKE @PackagingCode"; // strSql += " AND pack.PackagingCode LIKE @PackagingCode";
listStr.Add(new SqlParameter("@PackagingCode", "%" + this.txtPackagingCode.Text.Trim() + "%")); // listStr.Add(new SqlParameter("@PackagingCode", "%" + this.txtPackagingCode.Text.Trim() + "%"));
} // }
SqlParameter[] parameter = listStr.ToArray(); // SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); // DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
Grid1.RecordCount = tb.Rows.Count; //Grid1.RecordCount = tb.Rows.Count;
tb = GetFilteredTable(Grid1.FilteredData, tb); //tb = GetFilteredTable(Grid1.FilteredData, tb);
var table = this.GetPagedDataTable(Grid1, tb); //var table = this.GetPagedDataTable(Grid1, tb);
Grid1.DataSource = table; //Grid1.DataSource = table;
//Grid1.DataBind();
var list= BLL.HJGL_PackagingmanageService.GetPackagingManageList(this.CurrUser.LoginProjectId, this.txtPackagingCode.Text.Trim());
Grid1.RecordCount = list.Count;
Grid1.DataSource = list;
Grid1.DataBind(); Grid1.DataBind();
} }
#endregion #endregion