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

2022-10-10 焊接材料编码库导入修改及其相关联界面修改。小程序包装信息接口添加。合同劳务人员下拉框

Browse Source
This commit is contained in:
李鹏飞
2022-10-10 09:56:40 +08:00
parent c1a7f0aa14
commit 00aeaac1e2
18 changed files with 260 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/File/Excel/DataIn/MaterialCodeLib.xlsx
BIN
View File
Binary file not shown.
SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialCodeLib.aspx
+3 -3
View File
@@ -49,16 +49,16 @@
TextAlign="Left" SortField="MaterialCode">
</f:RenderField>
<f:RenderField Width="200px" ColumnID="MaterialName" DataField="MaterialName"
FieldType="String" HeaderText="元件类型" HeaderTextAlign="Center"
FieldType="String" HeaderText="类型" HeaderTextAlign="Center"
TextAlign="Left" SortField="MaterialName">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="" DataField="MaterialSpec"
FieldType="String" HeaderText="规格" HeaderTextAlign="Center"
TextAlign="Left" SortField="MaterialSpec">
</f:RenderField>
<f:RenderField Width="180px" ColumnID="MaterialMade" DataField="MaterialMade" FieldType="String" HeaderText="材质"
<%--<f:RenderField Width="180px" ColumnID="MaterialMade" DataField="MaterialMade" FieldType="String" HeaderText="材质"
HeaderTextAlign="Center" TextAlign="Left" SortField="MaterialMade" >
</f:RenderField>
</f:RenderField>--%>
<f:RenderField Width="90px" ColumnID="MaterialUnit" DataField="MaterialUnit" FieldType="String" HeaderText="单位"
HeaderTextAlign="Center" TextAlign="Left" SortField="MaterialUnit" >
</f:RenderField>
SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialCodeLibIn.aspx.cs
+7 -7
View File
@@ -128,7 +128,7 @@ namespace FineUIPro.Web.HJGL.BaseInfo
return;
}
DataRow[] dv = ds.Tables[0].Select("采购码 <>'' and 元件类型 <>''");
DataRow[] dv = ds.Tables[0].Select("元件编码 <>'' and 类型 <>''");
//导入数据库
if (dv.Length > 0)
{
@@ -137,20 +137,20 @@ namespace FineUIPro.Web.HJGL.BaseInfo
HJGL_MaterialCodeLib item = new HJGL_MaterialCodeLib();
#region 数据验证和赋值
if (dv[i]["采购码"] != null && !string.IsNullOrEmpty(dv[i]["采购码"].ToString()))
if (dv[i]["元件编码"] != null && !string.IsNullOrEmpty(dv[i]["元件编码"].ToString()))
{
item.MaterialCode = dv[i]["采购码"].ToString();
item.MaterialCode = dv[i]["元件编码"].ToString();
}
else
{
errorInfos += (i + 2) + "Line, [采购码] 不能为空</br>";
errorInfos += (i + 2) + "Line, [元件编码] 不能为空</br>";
}
item.MaterialDef = dv[i]["材料描述"].ToString();
item.MaterialSpec = dv[i]["规格"].ToString();
item.MaterialMade = dv[i]["材质"].ToString();
// item.MaterialMade = dv[i]["材质"].ToString();
item.MaterialUnit = dv[i]["单位"].ToString();
item.MaterialName = dv[i]["元件类型"].ToString();
item.PipeGrade = dv[i]["管道等级"].ToString();
item.MaterialName = dv[i]["类型"].ToString();
//item.PipeGrade = dv[i]["管道等级"].ToString();
//item.ProjectId = CurrUser.LoginProjectId;
//= SQLHelper.GetNewID(typeof(Model.Editor_CostReport));
if (!codeLib.Select(x => x.MaterialCode).Contains(item.MaterialCode))
SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx
+6 -6
View File
@@ -116,12 +116,12 @@
FieldType="String" HeaderText="规格" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="MaterialMade" DataField="MaterialMade" SortField="MaterialMade"
<%--<f:RenderField Width="150px" ColumnID="MaterialMade" DataField="MaterialMade" SortField="MaterialMade"
FieldType="String" HeaderText="材质" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
</f:RenderField>--%>
<f:RenderField Width="150px" ColumnID="MaterialName" DataField="MaterialName" SortField="MaterialName"
FieldType="String" HeaderText="材料类型" HeaderTextAlign="Center"
FieldType="String" HeaderText="类型" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="Number" DataField="Number" SortField="Number"
@@ -162,12 +162,12 @@
FieldType="String" HeaderText="规格" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="MaterialMade" DataField="MaterialMade" SortField="MaterialMade"
<%-- <f:RenderField Width="150px" ColumnID="MaterialMade" DataField="MaterialMade" SortField="MaterialMade"
FieldType="String" HeaderText="材质" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
</f:RenderField>--%>
<f:RenderField Width="150px" ColumnID="MaterialName" DataField="MaterialName" SortField="MaterialName"
FieldType="String" HeaderText="材料类型" HeaderTextAlign="Center"
FieldType="String" HeaderText="类型" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="Number" DataField="Number" SortField="Number"
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx
+3 -3
View File
@@ -107,12 +107,12 @@
FieldType="String" HeaderText="单位" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="MaterialMade" DataField="MaterialMade" SortField="MaterialMade"
FieldType="String" HeaderText="材质" HeaderTextAlign="Center"
<f:RenderField Width="150px" ColumnID="MaterialDef" DataField="MaterialDef" SortField="MaterialDef"
FieldType="String" HeaderText="材料描述" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="MaterialName" DataField="MaterialName" SortField="MaterialName"
FieldType="String" HeaderText="材料类型" HeaderTextAlign="Center"
FieldType="String" HeaderText="类型" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReviewEdit2.aspx.cs
+1 -1
View File
@@ -46,7 +46,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
PHTGL_BidApproveUserReviewService.InitGetBidCompleteDropDownList(DropBidCode, true);
Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(this.DropConstructionManager, null, Const.UnitId_SEDIN, null, true);
Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(this.DropProjectManager, null, Const.UnitId_SEDIN, null, true);
BLL.Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(DropApproval_Construction, CurrUser.UnitId, Const.ConstructionMinister, Const.ConstructionViceMinister, false);
BLL.Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(DropApproval_Construction, null, CurrUser.UnitId, Const.ConstructionMinister + "," + Const.ConstructionViceMinister, false);
BLL.Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(DropDeputyGeneralManager, null, this.CurrUser.UnitId, Const.DeputyGeneralManager, false);
if (PHTGL_ActionPlanReviewService.IsSpecialProject(this.CurrUser.LoginProjectId))
{
SGGL/FineUIPro.Web/common/mainMenu_HJGL.aspx
+2 -2
View File
@@ -12,14 +12,14 @@
text-align: center;
min-width: 0.75rem;
margin-right: 0.02083rem;
font-size: revert;
font-size: smaller;
color: #6ceff1;
}
.real-time-echarts02 {
text-align: center;
min-width: 0.75rem;
margin-right: 0.02083rem;
font-size: revert;
font-size: smaller;
color: rgb(6 247 192 / 85%);
}
.real-time-echarts02-unit {