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

提交代码

Browse Source
This commit is contained in:
高飞
2023-12-01 12:11:50 +08:00
parent 66a8cb638a
commit 23c2b9fedd
8 changed files with 75 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/HJGL/WeldingManage/WeldTaskService.cs
+14 -4
View File
@@ -21,7 +21,8 @@ namespace BLL
/// <returns></returns>
public static Model.HJGL_WeldTask GetWeldTaskByWeldJointId(string weldJointId)
{
return Funs.DB.HJGL_WeldTask.FirstOrDefault(e => e.WeldJointId == weldJointId);
Model.SGGLDB db = Funs.DB;
return db.HJGL_WeldTask.FirstOrDefault(e => e.WeldJointId == weldJointId);
}
/// <summary>
@@ -64,12 +65,21 @@ namespace BLL
return code;
}
public static List<Model.View_HJGL_WeldingTask> GetWeldingTaskList(string ProjectId, string UnitWorkId, DateTime taskDate)
public static List<Model.View_HJGL_WeldingTask> GetWeldingTaskList(string ProjectId, string UnitWorkId, DateTime taskDate,string canWelder)
{
return (from x in Funs.DB.View_HJGL_WeldingTask
var q = from x in Funs.DB.View_HJGL_WeldingTask
where x.ProjectId == ProjectId && x.UnitWorkId == UnitWorkId
&& x.TaskDate.Value.Date == taskDate.Date
select x).ToList();
select x;
if (canWelder == "0")
{
q = q.Where(x => x.CanWelderId == null);
}
else if(canWelder == "1")
{
q=q.Where(x => x.CanWelderId != null);
}
return q.ToList();
}
/// <summary>
SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineListPDMSIn.aspx.cs
+8 -8
View File
@@ -1111,20 +1111,20 @@ namespace FineUIPro.Web.HJGL.WeldingManage
}
if (delJoints.Count() > 0)
{
//try
//{
// db2.HJGL_WeldJoint.DeleteAllOnSubmit(delJoints);
// db2.SubmitChanges();
//}
//catch (Exception)
//{
try
{
db2.HJGL_WeldJoint.DeleteAllOnSubmit(delJoints);
db2.SubmitChanges();
}
catch (Exception)
{
string weldJointCodes = string.Empty;
foreach (var item in delJoints)
{
weldJointCodes += item.WeldJointCode + ",";
}
Alert.ShowInParent(weldJointCodes, MessageBoxIcon.Warning);
//}
}
}
}
SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.cs
+6
View File
@@ -505,6 +505,12 @@ namespace FineUIPro.Web.HJGL.WeldingManage
NewTask.TaskCode = this.txtTaskCode.Text.Trim();
NewTask.WeldTaskId = SQLHelper.GetNewID();
NewTask.WeldJointId = selectRowId[i];
var oldWeldTask = BLL.WeldTaskService.GetWeldTaskByWeldJointId(NewTask.WeldJointId);
if (oldWeldTask != null)
{
ShowNotify("所选焊口已存在任务单，无法保存！", MessageBoxIcon.Success);
return;
}
Model.HJGL_WeldJoint weldJoint = BLL.WeldJointService.GetWeldJointByWeldJointId(NewTask.WeldJointId);
if (weldJoint != null)
{
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs
+5
View File
@@ -466,6 +466,11 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
ShowNotify("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning);
return;
}
if (this.drpUnit.SelectedValue==BLL.Const._Null)
{
ShowNotify("请选择单位名称！", MessageBoxIcon.Warning);
return;
}
if (BLL.WeldingDailyService.IsExistWeldingDailyCode(this.txtWeldingDailyCode.Text,
!string.IsNullOrEmpty(this.WeldingDailyId) ? this.WeldingDailyId : "", CurrUser.LoginProjectId))
{
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx
+5
View File
@@ -70,6 +70,11 @@
<f:HiddenField runat="server" ID="hdItemsString"></f:HiddenField>
<f:HiddenField runat="server" ID="hdTaskWeldJoint"></f:HiddenField>
<f:Button runat="server" ID="CreatWeldableWeldJoint" Icon="ChartPie" Text="生成可焊焊工" OnClick="CreatWeldableWeldJoint_Click"></f:Button>
<f:RadioButtonList runat="server" ID="rbIsAudit" LabelAlign="Right" AutoColumnWidth="true" Label="状态" LabelWidth="80px" Width="420px" AutoPostBack="true" OnSelectedIndexChanged="rbIsAudit_SelectedIndexChanged">
<f:RadioItem Selected="true" Text="全部" Value="2" />
<f:RadioItem Text="未生成可焊焊工" Value="0" />
<f:RadioItem Text="已生成可焊焊工" Value="1" />
</f:RadioButtonList>
<f:Button ID="btnSelectWelder" runat="server" Text="选择焊工批量填充" OnClick="btnSelectWelder_Click" Hidden="True">
</f:Button>
<f:DropDownList ID="drpCanWelder" EnableEdit="true" runat="server" LabelWidth="140px" Hidden="True">
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs
+22 -11
View File
@@ -234,7 +234,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
where x.UnitWorkId == node.NodeID
&& x.TaskDate < Convert.ToDateTime(this.txtTaskDateMonth.Text.Trim() + "-01").AddMonths(1)
&& x.TaskDate >= Convert.ToDateTime(this.txtTaskDateMonth.Text.Trim() + "-01")
select new { x.TaskDate.Value.Date, x.UnitId }).Distinct();
select new { x.TaskDate.Value.Date, x.UnitId }).Distinct().ToList().OrderByDescending(x => x.Date);
if (p.Count() > 0)
{
foreach (var item in p)
@@ -253,7 +253,8 @@ namespace FineUIPro.Web.HJGL.WeldingManage
var p = (from x in Funs.DB.HJGL_WeldTask
join y in Funs.DB.HJGL_WeldJoint on x.WeldJointId equals y.WeldJointId
where x.UnitWorkId == node.NodeID && y.WeldJointCode.Contains(this.txtWeldJointCode.Text.Trim())
select new { x.TaskDate.Value.Date, x.UnitId }).Distinct();
orderby x.TaskDate descending
select new { x.TaskDate.Value.Date, x.UnitId }).Distinct().ToList().OrderByDescending(x => x.Date);
if (p.Count() > 0)
{
foreach (var item in p)
@@ -624,11 +625,11 @@ namespace FineUIPro.Web.HJGL.WeldingManage
List<Model.View_HJGL_WeldingTask> GetWeldingTaskList = null;
if (taskTime != null)
{
GetWeldingTaskList = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, tvControlItem.SelectedNode.ParentNode.NodeID, Convert.ToDateTime(tvControlItem.SelectedNodeID.Split('|')[1]));
GetWeldingTaskList = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, tvControlItem.SelectedNode.ParentNode.NodeID, Convert.ToDateTime(tvControlItem.SelectedNodeID.Split('|')[1]), this.rbIsAudit.SelectedValue);
}
else
{
GetWeldingTaskList = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, tvControlItem.SelectedNodeID, Convert.ToDateTime(hdTaskWeldJoint.Text));
GetWeldingTaskList = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, tvControlItem.SelectedNodeID, Convert.ToDateTime(hdTaskWeldJoint.Text), this.rbIsAudit.SelectedValue);
}
this.BindGrid(GetWeldingTaskList);
//GetCanWelderDropDownList(GetWeldingTaskList);
@@ -991,11 +992,11 @@ namespace FineUIPro.Web.HJGL.WeldingManage
List<Model.View_HJGL_WeldingTask> GetWeldingTaskList = null;
if (unit == null)
{
GetWeldingTaskList = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, tvControlItem.SelectedNodeID.Split('|')[0], Convert.ToDateTime(hdTaskWeldJoint.Text.Trim()));
GetWeldingTaskList = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, tvControlItem.SelectedNodeID.Split('|')[0], Convert.ToDateTime(hdTaskWeldJoint.Text.Trim()), this.rbIsAudit.SelectedValue);
}
else
{
GetWeldingTaskList = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, tvControlItem.SelectedNodeID, Convert.ToDateTime(hdTaskWeldJoint.Text.Trim()));
GetWeldingTaskList = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, tvControlItem.SelectedNodeID, Convert.ToDateTime(hdTaskWeldJoint.Text.Trim()), this.rbIsAudit.SelectedValue);
}
this.BindGrid(GetWeldingTaskList);
@@ -1083,7 +1084,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
DateTime? taskTime = Funs.GetNewDateTime(tvControlItem.SelectedNodeID.Split('|')[1]);
if (taskTime != null)
{
List<Model.View_HJGL_WeldingTask> GetWeldingTaskList = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, tvControlItem.SelectedNode.ParentNode.NodeID, Convert.ToDateTime(taskTime));
List<Model.View_HJGL_WeldingTask> GetWeldingTaskList = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, tvControlItem.SelectedNode.ParentNode.NodeID, Convert.ToDateTime(taskTime), this.rbIsAudit.SelectedValue);
this.BindGrid(GetWeldingTaskList);
}
@@ -1134,11 +1135,11 @@ namespace FineUIPro.Web.HJGL.WeldingManage
List<Model.View_HJGL_WeldingTask> GetWeldingTaskList = null;
if (taskTime != null)
{
GetWeldingTaskList = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, tvControlItem.SelectedNode.ParentNode.NodeID, Convert.ToDateTime(taskTime));
GetWeldingTaskList = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, tvControlItem.SelectedNode.ParentNode.NodeID, Convert.ToDateTime(taskTime), this.rbIsAudit.SelectedValue);
}
else
{
GetWeldingTaskList = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, tvControlItem.SelectedNodeID, Convert.ToDateTime(txtTaskDate.Text));
GetWeldingTaskList = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, tvControlItem.SelectedNodeID, Convert.ToDateTime(txtTaskDate.Text), this.rbIsAudit.SelectedValue);
}
this.BindGrid(GetWeldingTaskList);
@@ -1203,7 +1204,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
DateTime? taskTime = Funs.GetNewDateTime(tvControlItem.SelectedNodeID.Split('|')[1]);
if (taskTime != null)
{
List<Model.View_HJGL_WeldingTask> GetWeldingTaskList = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, tvControlItem.SelectedNode.ParentNode.NodeID, Convert.ToDateTime(taskTime));
List<Model.View_HJGL_WeldingTask> GetWeldingTaskList = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, tvControlItem.SelectedNode.ParentNode.NodeID, Convert.ToDateTime(taskTime), this.rbIsAudit.SelectedValue);
this.BindGrid(GetWeldingTaskList);
}
}
@@ -1213,7 +1214,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
DateTime? taskTime = Funs.GetNewDateTime(tvControlItem.SelectedNodeID.Split('|')[1]);
if (taskTime != null)
{
var pipelines = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, tvControlItem.SelectedNode.ParentNode.NodeID, Convert.ToDateTime(taskTime)).Select(x => x.PipelineId).Distinct().ToList();
var pipelines = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, tvControlItem.SelectedNode.ParentNode.NodeID, Convert.ToDateTime(taskTime), this.rbIsAudit.SelectedValue).Select(x => x.PipelineId).Distinct().ToList();
if (pipelines.Any())
{
@@ -1257,5 +1258,15 @@ namespace FineUIPro.Web.HJGL.WeldingManage
ShowNotify("请选择任务单", MessageBoxIcon.Question);
}
}
protected void rbIsAudit_SelectedIndexChanged(object sender, EventArgs e)
{
DateTime? taskTime = Funs.GetNewDateTime(tvControlItem.SelectedNodeID.Split('|')[1]);
if (taskTime != null)
{
List<Model.View_HJGL_WeldingTask> GetWeldingTaskList = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, tvControlItem.SelectedNode.ParentNode.NodeID, Convert.ToDateTime(taskTime), this.rbIsAudit.SelectedValue);
this.BindGrid(GetWeldingTaskList);
}
}
}
}
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.designer.cs
Generated
+9
View File
@@ -156,6 +156,15 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// </remarks>
protected global::FineUIPro.Button CreatWeldableWeldJoint;
/// <summary>
/// rbIsAudit 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.RadioButtonList rbIsAudit;
/// <summary>
/// btnSelectWelder 控件。
/// </summary>
SGGL/FineUIPro.Web/common/mainMenu_HJGL3.aspx.cs
+6 -6
View File
@@ -149,7 +149,7 @@ CAST((SELECT ISNULL(SUM(ISNULL(jot.Size,0)),0) FROM dbo.HJGL_WeldJoint jot left
Grid1.DataSource = table;
Grid1.DataBind();
decimal totalDin = Funs.GetNewDecimalOrZero(this.Grid1.Rows[0].Values[0].ToString());
decimal finishSize = Funs.GetNewDecimalOrZero(this.Grid1.Rows[0].Values[1].ToString());
decimal finishSize = Funs.GetNewDecimalOrZero(this.Grid1.Rows[0].Values[2].ToString());
decimal notCompleteDin = totalDin - finishSize;
this.lbNotCompleteDinTotal.Text = notCompleteDin.ToString();
}
@@ -188,11 +188,11 @@ select '现场安装' as PipeArea,UnitWorkId,TotalDin,TodayFinishSize,FinishSize
if (Grid2.RecordCount > 0)
{
decimal totalDin1 = Funs.GetNewDecimalOrZero(this.Grid2.Rows[0].Values[1].ToString());
decimal finishSize1 = Funs.GetNewDecimalOrZero(this.Grid2.Rows[0].Values[2].ToString());
decimal finishSize1 = Funs.GetNewDecimalOrZero(this.Grid2.Rows[0].Values[3].ToString());
decimal notCompleteDin1 = totalDin1 - finishSize1;
this.lbNotCompleteDin1.Text = notCompleteDin1.ToString();
decimal totalDin2 = Funs.GetNewDecimalOrZero(this.Grid2.Rows[1].Values[1].ToString());
decimal finishSize2 = Funs.GetNewDecimalOrZero(this.Grid2.Rows[1].Values[2].ToString());
decimal finishSize2 = Funs.GetNewDecimalOrZero(this.Grid2.Rows[1].Values[3].ToString());
decimal notCompleteDin2 = totalDin2 - finishSize2;
this.lbNotCompleteDin2.Text = notCompleteDin2.ToString();
}
@@ -219,7 +219,7 @@ select '现场安装' as PipeArea,UnitWorkId,TotalDin,TodayFinishSize,FinishSize
return;
}
decimal totalDin = Funs.GetNewDecimalOrZero(this.Grid2.Rows[0].Values[1].ToString());
decimal finishSize = Funs.GetNewDecimalOrZero(this.Grid2.Rows[0].Values[2].ToString());
decimal finishSize = Funs.GetNewDecimalOrZero(this.Grid2.Rows[0].Values[3].ToString());
decimal notCompleteDin = totalDin - finishSize;
this.lbNotCompleteDin1.Text = notCompleteDin.ToString();
TimeSpan ts = (TimeSpan)(Funs.GetNewDateTime(this.txtPlanEndDate1.Text.Trim()) - Funs.GetNewDateTime(this.txtWeldingDate.Text.Trim()));
@@ -273,7 +273,7 @@ select '现场安装' as PipeArea,UnitWorkId,TotalDin,TodayFinishSize,FinishSize
return;
}
decimal totalDin = Funs.GetNewDecimalOrZero(this.Grid2.Rows[1].Values[1].ToString());
decimal finishSize = Funs.GetNewDecimalOrZero(this.Grid2.Rows[1].Values[2].ToString());
decimal finishSize = Funs.GetNewDecimalOrZero(this.Grid2.Rows[1].Values[3].ToString());
decimal notCompleteDin = totalDin - finishSize;
this.lbNotCompleteDin2.Text = notCompleteDin.ToString();
TimeSpan ts = (TimeSpan)(Funs.GetNewDateTime(this.txtPlanEndDate2.Text.Trim()) - Funs.GetNewDateTime(this.txtWeldingDate.Text.Trim()));
@@ -325,7 +325,7 @@ select '现场安装' as PipeArea,UnitWorkId,TotalDin,TodayFinishSize,FinishSize
return;
}
decimal totalDin = Funs.GetNewDecimalOrZero(this.Grid1.Rows[0].Values[0].ToString());
decimal finishSize = Funs.GetNewDecimalOrZero(this.Grid1.Rows[0].Values[1].ToString());
decimal finishSize = Funs.GetNewDecimalOrZero(this.Grid1.Rows[0].Values[2].ToString());
decimal notCompleteDin = totalDin - finishSize;
TimeSpan ts= (TimeSpan)(Funs.GetNewDateTime(this.txtPlanEndDate.Text.Trim()) - Funs.GetNewDateTime(this.txtWeldingDate.Text.Trim()));
decimal leaveDay = Convert.ToDecimal(ts.Days);