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

11

Browse Source
This commit is contained in:
李超
2026-08-18 16:46:22 +08:00
parent 508c0e8ffd 759ea24211
commit 8917ce73af
7 changed files with 39 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+1
View File
@@ -42,3 +42,4 @@ bin-release/
/HJGL_DS/FineUIPro.Web/File/PDF/Pipe /HJGL_DS/FineUIPro.Web/File/PDF/Pipe
/HJGL_DS/FineUIPro.Web/File/Fastreport/Temp /HJGL_DS/FineUIPro.Web/File/Fastreport/Temp
/HJGL_DS/FineUIPro.Web/ReportPrint /HJGL_DS/FineUIPro.Web/ReportPrint
/HJGL_DS/FineUIPro.Web/FileUpload/QRCodeFile
HJGL_DS/FineUIPro.Web/Global.asax.cs
+10 -3
View File
@@ -538,8 +538,8 @@
} }
else if (queProject[1].Trim() == ("FeIII") || queProject[1].Trim() == ("FeⅢ")) else if (queProject[1].Trim() == ("FeIII") || queProject[1].Trim() == ("FeⅢ"))
{ {
materialType = "FeⅢ"; materialType = "FeⅢ,FeⅡ,FeⅠ";
materialTypeName = "合金钢"; materialTypeName = "合金钢,不锈钢,碳钢";
} }
else if (queProject[1].Trim() == ("FeIV") || queProject[1].Trim() == ("FeⅣ")) else if (queProject[1].Trim() == ("FeIV") || queProject[1].Trim() == ("FeⅣ"))
{ {
@@ -743,7 +743,14 @@
} }
else else
{ {
weldType = "1,2"; if (queProject[2].Contains("6G"))
{
weldType = "1,2,3";
}
else
{
weldType = "1,2";
}
} }
} }
HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/PipelineManage.aspx
+2 -2
View File
@@ -170,8 +170,8 @@
Target="Top" EnableResize="true" runat="server" IsModal="true" Target="Top" EnableResize="true" runat="server" IsModal="true"
Width="1024px" Height="600px"> Width="1024px" Height="600px">
</f:Window> </f:Window>
<f:Window ID="Window4" Title="打印" Hidden="true" EnableIFrame="true" EnableMaximize="true" <f:Window ID="Window4" Title="焊口标注" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Self" EnableResize="true" runat="server" IsModal="true" Width="1024px" Target="Parent" EnableResize="false" runat="server" IsModal="true" Maximized="true" Width="1024px"
Height="600px"> Height="600px">
</f:Window> </f:Window>
<f:Window ID="Window5" Title="文档名" Hidden="true" EnableIFrame="true" EnableMaximize="true" <f:Window ID="Window5" Title="文档名" Hidden="true" EnableIFrame="true" EnableMaximize="true"
HJGL_DS/FineUIPro.Web/Web.config
+1 -1
View File
@@ -11,7 +11,7 @@
<FineUIPro DebugMode="false" Theme="Cupertino"/> <FineUIPro DebugMode="false" Theme="Cupertino"/>
<appSettings> <appSettings>
<!--连接字符串--> <!--连接字符串-->
<add key="ConnectionString" value="Server=.\MSSQLSERVER2022;Database=HJGLDB_DS;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Max Pool Size = 1000;Connect Timeout=1200"/> <add key="ConnectionString" value="Server=.\SQL2022;Database=HJGLDB_DS;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Max Pool Size = 1000;Connect Timeout=1200"/>
<!--系统名称--> <!--系统名称-->
<add key="SystemName" value="诺必达焊接管理系统"/> <add key="SystemName" value="诺必达焊接管理系统"/>
<add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/> <add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/>
HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlan.aspx.cs
+2 -2
View File
@@ -109,8 +109,8 @@ namespace FineUIPro.Web.WeldMat.UsingPlan
if (b) if (b)
{ {
string lastPlan = @"SELECT p.UsingPlanId FROM dbo.Weld_UsingPlan p string lastPlan = @"SELECT p.UsingPlanId FROM dbo.Weld_UsingPlan p
WHERE p.OrderDate<CONVERT(char(10),GetDate(),120) WHERE ((p.OrderDate<CONVERT(char(10),GetDate(),120) AND OrderTime=@OrderTime) or p.OrderDate<CONVERT(char(10),DATEADD(day, -1, GETDATE()),120))
AND p.IsCancel=0 AND OrderTime=@OrderTime AND p.IsCancel=0
AND (SELECT COUNT(*) FROM dbo.Weld_UsingMat u WHERE u.UsingPlanId=p.UsingPlanId)=0"; AND (SELECT COUNT(*) FROM dbo.Weld_UsingMat u WHERE u.UsingPlanId=p.UsingPlanId)=0";
List<SqlParameter> listStr = new List<SqlParameter>(); List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@OrderTime", orderTime)); listStr.Add(new SqlParameter("@OrderTime", orderTime));
HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlanEdit.aspx.cs
+2 -8
View File
@@ -285,14 +285,8 @@ namespace FineUIPro.Web.WeldMat.UsingPlan
{ {
this.txtAmount.Text = temp.Amount.ToString(); this.txtAmount.Text = temp.Amount.ToString();
} }
if (temp.InPutDate.HasValue) this.txtInPutDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
{ this.txtOrderDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
this.txtInPutDate.Text = string.Format("{0:yyyy-MM-dd}", temp.InPutDate);
}
if (temp.OrderDate.HasValue)
{
this.txtOrderDate.Text = string.Format("{0:yyyy-MM-dd}", temp.OrderDate);
}
if (!string.IsNullOrEmpty(temp.OrderTime)) if (!string.IsNullOrEmpty(temp.OrderTime))
{ {
HJGL_DS/FineUIPro.Web/Welder/QualifiedProject.aspx.cs
+21 -7
View File
@@ -436,8 +436,8 @@ namespace FineUIPro.Web.Welder
} }
else if (queProject[1].Trim() == ("FeIII") || queProject[1].Trim() == ("FeⅢ")) else if (queProject[1].Trim() == ("FeIII") || queProject[1].Trim() == ("FeⅢ"))
{ {
materialType = "FeⅢ"; materialType = "FeⅢ,FeⅡ,FeⅠ";
materialTypeName = "合金钢"; materialTypeName = "合金钢,不锈钢,碳钢";
} }
else if (queProject[1].Trim() == ("FeIV") || queProject[1].Trim() == ("FeⅣ")) else if (queProject[1].Trim() == ("FeIV") || queProject[1].Trim() == ("FeⅣ"))
{ {
@@ -625,13 +625,20 @@ namespace FineUIPro.Web.Welder
} }
// 1-对接，2-角焊缝，3-支管连接焊缝 // 1-对接，2-角焊缝，3-支管连接焊缝
if (queProject[2].Contains("FG")) if (queProject[2].Contains("FG") )
{ {
weldType = "2,3"; weldType = "2,3";
} }
else else
{ {
weldType = "1,2"; if (queProject[2].Contains("6G"))
{
weldType = "1,2,3";
}
else
{
weldType = "1,2";
}
} }
} }
@@ -789,8 +796,8 @@ namespace FineUIPro.Web.Welder
} }
else if (queProject[1].Trim() == ("FeIII") || queProject[1].Trim() == ("FeⅢ")) else if (queProject[1].Trim() == ("FeIII") || queProject[1].Trim() == ("FeⅢ"))
{ {
materialType = "FeⅢ"; materialType = "FeⅢ,FeⅡ,FeⅠ";
materialTypeName = "合金钢"; materialTypeName = "合金钢,不锈钢,碳钢";
} }
else if (queProject[1].Trim() == ("FeIV") || queProject[1].Trim() == ("FeⅣ")) else if (queProject[1].Trim() == ("FeIV") || queProject[1].Trim() == ("FeⅣ"))
{ {
@@ -964,7 +971,14 @@ namespace FineUIPro.Web.Welder
} }
else else
{ {
weldType = "1,2"; if (queProject[2].Contains("6G"))
{
weldType = "1,2,3";
}
else
{
weldType = "1,2";
}
} }
} }