feat(clgl): 增加入库申请编辑与明细导入
支持入库申请信息维护、入库明细批量导入及模板下载, 完善材料入库业务流程,减少人工录入和明细维护成本。 增加焊口流转区段信息,并统一相关单位工程列表排序
This commit is contained in:
@@ -60,6 +60,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
|
||||
where x.ProjectId == this.CurrUser.LoginProjectId
|
||||
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
|
||||
orderby x.UnitWorkCode
|
||||
select x).ToList();
|
||||
|
||||
List<Model.WBS_UnitWork> unitWork1 = null;
|
||||
@@ -265,7 +266,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
IsWelding,IsHotProessStr,Material1Code,Material2Code,WeldTypeCode,
|
||||
Specification,HeartNo1,HeartNo2,Size,Dia,DNDia,Thickness,GrooveTypeCode,
|
||||
WeldingMethodCode,WeldingWireCode,WeldingRodCode,WeldingDate,WeldingDailyCode,
|
||||
BackingWelderCode,CoverWelderCode,MediumCode ,PreTemperature,JointArea,WPQCode,Remark
|
||||
BackingWelderCode,CoverWelderCode,MediumCode ,PreTemperature,JointArea,WPQCode,Remark,CAST(WeldJointCode as int) as WeldJointCodeInt
|
||||
FROM View_HJGL_WeldJoint WHERE IsTwoJoint IS NULL ";
|
||||
List<SqlParameter> listStr = new List<SqlParameter> { };
|
||||
|
||||
@@ -305,7 +306,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
strSql += " AND JointAttribute =@JointAttribute";
|
||||
|
||||
listStr.Add(new SqlParameter("@JointAttribute", drpJointAttribute.SelectedValue));
|
||||
}
|
||||
}
|
||||
SqlParameter[] parameter = listStr.ToArray();
|
||||
System.Data.DataTable dt = SQLHelper.GetDataTableRunText(strSql, parameter);
|
||||
|
||||
@@ -602,4 +603,4 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user