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-02 18:32:27 +08:00
parent 9b98f48748
commit ea22fad037
3 changed files with 236 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.cs
+17 -17
View File
@@ -318,25 +318,25 @@ namespace FineUIPro.Web.HJGL.WeldingManage
var toDoMatterList = (from x in Funs.DB.View_HJGL_NoWeldJointFind
where x.PipelineId == pipelineId && x.WeldingDailyId == null && x.JointAttribute == drpJointAttribute.SelectedValue
&& (string.IsNullOrEmpty(drpWeldTypeCode.SelectedValue) || x.WeldTypeCode.Contains(drpWeldTypeCode.SelectedValue))
&& (string.IsNullOrEmpty(drpWeldTypeCode.SelectedValue) || x.WeldTypeCode.Contains(drpWeldTypeCode.SelectedValue)) && x.WeldTaskId == null
select x).ToList();
//去除任务表已存在的焊口
if (!string.IsNullOrEmpty(TaskDate))
{
var task = from x in Funs.DB.HJGL_WeldTask where x.UnitWorkId == UnitWorkId && x.TaskDate.Value.Date.ToString() == Convert.ToDateTime(txtTaskDate.Text.Trim()).ToString("yyyy-MM-dd") select x;
if (task.Count() > 0)
{
foreach (var item in task)
{
Model.View_HJGL_NoWeldJointFind jot = toDoMatterList.FirstOrDefault(e => e.WeldJointId == item.WeldJointId);
if (jot != null)
{
toDoMatterList.Remove(jot);
}
}
}
}
//if (!string.IsNullOrEmpty(TaskDate))
//{
// var task = from x in Funs.DB.HJGL_WeldTask where x.UnitWorkId == UnitWorkId && x.TaskDate.Value.Date.ToString() == Convert.ToDateTime(txtTaskDate.Text.Trim()).ToString("yyyy-MM-dd") select x;
// if (task.Count() > 0)
// {
// foreach (var item in task)
// {
// Model.View_HJGL_NoWeldJointFind jot = toDoMatterList.FirstOrDefault(e => e.WeldJointId == item.WeldJointId);
// if (jot != null)
// {
// toDoMatterList.Remove(jot);
// }
// }
// }
//}
DataTable tb = this.LINQToDataTable(toDoMatterList);
// 2.获取当前分页数据
@@ -508,7 +508,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
var oldWeldTask = BLL.WeldTaskService.GetWeldTaskByWeldJointId(NewTask.WeldJointId);
if (oldWeldTask != null)
{
ShowNotify("所选焊口已存在任务单，无法保存！", MessageBoxIcon.Success);
ShowNotify("所选焊口已存在任务单，无法保存！", MessageBoxIcon.Warning);
return;
}
Model.HJGL_WeldJoint weldJoint = BLL.WeldJointService.GetWeldJointByWeldJointId(NewTask.WeldJointId);
SGGL/Model/Model.cs
+36
View File
@@ -271834,6 +271834,8 @@ namespace Model
private string _Material1Code;
private string _WeldTaskId;
private string _Material2Code;
public View_HJGL_NoWeldJointFind()
@@ -272112,6 +272114,22 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldTaskId", DbType="NVarChar(50)")]
public string WeldTaskId
{
get
{
return this._WeldTaskId;
}
set
{
if ((this._WeldTaskId != value))
{
this._WeldTaskId = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Material2Code", DbType="NVarChar(50)")]
public string Material2Code
{
@@ -273675,6 +273693,8 @@ namespace Model
private string _WPQCode;
private string _MatchableWPQ;
private string _GrooveTypeId;
private string _GrooveTypeCode;
@@ -274739,6 +274759,22 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MatchableWPQ", DbType="NVarChar(300)")]
public string MatchableWPQ
{
get
{
return this._MatchableWPQ;
}
set
{
if ((this._MatchableWPQ != value))
{
this._MatchableWPQ = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_GrooveTypeId", DbType="NVarChar(50)")]
public string GrooveTypeId
{