gaofei
/
HJGL_DS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

This commit is contained in:
高飞 2025-08-07 15:06:59 +08:00
parent bdae153c1e
commit 1a6cb3c63e
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlan.aspx
View File

@ -104,6 +104,9 @@
<f:RenderField Width="80px" ColumnID="WeldSpec" DataField="WeldSpec" FieldType="String"
HeaderText="规格" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="UnitStoreName" DataField="UnitStoreName" FieldType="String"
HeaderText="焊材库" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="UsingUnit" DataField="UsingUnit" FieldType="String"
HeaderText="使用单位" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>

3
HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlan.aspx.cs
View File

@ -54,7 +54,7 @@ namespace FineUIPro.Web.WeldMat.UsingPlan
private void BindGrid()
{
string projectIds = BLL.Project_UserService.GetStrProjectIds(this.CurrUser.UserId);
string strSql = @"SELECT UsingPlan.UsingPlanId, UsingPlan.WeldId, UsingPlan.ProjectId, UsingPlan.UsePosition,TeamGroupId,UsingPlan.STE_Name,
string strSql = @"SELECT UsingPlan.UsingPlanId, UsingPlan.WeldId, UsingPlan.ProjectId, UsingPlan.UsePosition,TeamGroupId,UsingPlan.STE_Name,UnitStore.UnitStoreName,
unit.UnitName AS UsingUnit,UsingPlan.Amount, UsingPlan.UsingManOne, UsingPlan.InPutDate,
CONVERT(varchar(100), UsingPlan.OrderDate, 23)+' '+UsingPlan.OrderTime as OrderTime, UsingPlan.CancelDate,UsingPlan.IsNeedConfirm,
(CASE UsingPlan.IsSteelStru WHEN 1 THEN '是' WHEN 0 THEN '否' ELSE '' END) AS IsSteelStru,
@ -75,6 +75,7 @@ namespace FineUIPro.Web.WeldMat.UsingPlan
LEFT JOIN dbo.HJGL_BS_Welder AS Welder ON Welder.WED_ID = UsingPlan.UsingManOne
LEFT JOIN dbo.Base_Unit unit ON unit.UnitId=UsingPlan.UsingUnit
LEFT JOIN dbo.Sys_User AS userInput ON userInput.UserId=UsingPlan.InPutMan
LEFT JOIN dbo.Weld_UnitStore AS UnitStore ON UnitStore.UnitStoreId=UsingPlan.UnitStoreId
LEFT JOIN dbo.HJGL_BS_Welder AS welderInput ON welderInput.WED_ID=UsingPlan.InPutMan
WHERE Project.IsClosed=0 ";
List<SqlParameter> listStr = new List<SqlParameter>();

7
HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingtMatSelect.aspx
View File

@ -91,6 +91,9 @@
<f:RenderField Width="80px" ColumnID="WeldSpec" DataField="WeldSpec" FieldType="String"
HeaderText="规格" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="UnitStoreName" DataField="UnitStoreName" FieldType="String"
HeaderText="焊材库" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="STE_Name" DataField="STE_Name" FieldType="String"
HeaderText="焊件材质" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
@ -122,9 +125,9 @@
<f:RenderField Width="100px" ColumnID="UsingUnit" DataField="UsingUnit" FieldType="String"
HeaderText="使用单位" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="UnitStoreName" DataField="UnitStoreName" FieldType="String"
<%--<f:RenderField Width="100px" ColumnID="UnitStoreName" DataField="UnitStoreName" FieldType="String"
HeaderText="领用仓库" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
</f:RenderField> --%>
<f:LinkButtonField ID="lbtnUrl" HeaderText="签名" Icon="ApplicationEdit" Width="80px" CommandName="url" ColumnID="Url"
HeaderTextAlign="Center" TextAlign="Center" ToolTip="显示签名" />
<f:LinkButtonField ID="lbtnPrint" HeaderText="打印" Icon="Printer" Width="80px" CommandName="print"