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

11

Browse Source
This commit is contained in:
李超
2026-05-30 12:34:20 +08:00
parent 47a22572b1
commit 029988ec28
19 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
DataBase/版本日志/SGGLDB_V2026-05-30-lc.sql
BIN
View File
Binary file not shown.
SGGL/FineUIPro.Web/File/PDF/Pipe/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-32033/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-320332026053012031.pdf
BIN
View File
Binary file not shown.
SGGL/FineUIPro.Web/File/PDF/Pipe/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-32033/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-320332026053012032.pdf
BIN
View File
Binary file not shown.
SGGL/FineUIPro.Web/File/PDF/Pipe/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-32033/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-320332026053012033.pdf
BIN
View File
Binary file not shown.
SGGL/FineUIPro.Web/File/PDF/Pipe/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-32033/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-320332026053012034.pdf
BIN
View File
Binary file not shown.
SGGL/FineUIPro.Web/File/PDF/Pipe/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-32033/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-320332026053012035.pdf
BIN
View File
Binary file not shown.
SGGL/FineUIPro.Web/File/PDF/Pipe/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-32033/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-320332026053012041.pdf
BIN
View File
Binary file not shown.
SGGL/FineUIPro.Web/File/PDF/Pipe/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-32033/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-320332026053012052.pdf
BIN
View File
Binary file not shown.
SGGL/FineUIPro.Web/File/PDF/Pipe/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-32033/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-320332026053012053.pdf
BIN
View File
Binary file not shown.
SGGL/FineUIPro.Web/File/PDF/Pipe/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-32033/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-320332026053012054.pdf
BIN
View File
Binary file not shown.
SGGL/FineUIPro.Web/File/PDF/Pipe/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-32033/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-320332026053012055.pdf
BIN
View File
Binary file not shown.
SGGL/FineUIPro.Web/File/PDF/Pipe/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-32033/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-320332026053012271.pdf
BIN
View File
Binary file not shown.
SGGL/FineUIPro.Web/File/PDF/Pipe/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-32033/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-320332026053012272.pdf
BIN
View File
Binary file not shown.
SGGL/FineUIPro.Web/File/PDF/Pipe/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-32033/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-320332026053012273.pdf
BIN
View File
Binary file not shown.
SGGL/FineUIPro.Web/File/PDF/Pipe/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-32033/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-320332026053012274.pdf
BIN
View File
Binary file not shown.
SGGL/FineUIPro.Web/File/PDF/Pipe/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-32033/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-320332026053012275.pdf
BIN
View File
Binary file not shown.
SGGL/FineUIPro.Web/HJGL/JoinMarking/PDFShow.aspx
+8 -3
View File
@@ -7,13 +7,18 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title></title>
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<script type="module" crossorigin="" src="./assets/viewer-Dla4Cfl-.js"></script>
<%-- <script type="module" crossorigin="" src="./assets/viewer-Dla4Cfl-.js"></script>
<link rel="modulepreload" crossorigin="" href="./assets/pdf-lib-D5zKcp81.js">
<link rel="modulepreload" crossorigin="" href="./assets/pdfjs-HfNT2Y4W.js">
<link rel="modulepreload" crossorigin="" href="./assets/styles-Bno-H3Kc.js">
<link rel="stylesheet" crossorigin="" href="./assets/styles-CDHjsf7D.css">
<link rel="stylesheet" crossorigin="" href="./assets/viewer-BilNgxa5.css">
<link rel="stylesheet" crossorigin="" href="./assets/viewer-BilNgxa5.css">--%>
<script type="module" crossorigin src="./assets/viewer-XNlksu4U.js"></script>
<link rel="modulepreload" crossorigin href="./assets/pdf-lib-AfLQbX6n.js">
<link rel="modulepreload" crossorigin href="./assets/pdfjs-DXqArq6h.js">
<link rel="modulepreload" crossorigin href="./assets/styles-BZJ2tAi6.js">
<link rel="stylesheet" crossorigin href="./assets/styles-DNToM_5G.css">
<link rel="stylesheet" crossorigin href="./assets/viewer-BilNgxa5.css">
</head>
<body>
SGGL/FineUIPro.Web/HJGL/JoinMarking/PDFShow.aspx.cs
+4 -4
View File
@@ -101,10 +101,10 @@ namespace FineUIPro.Web.HJGL.JoinMarking
SqlParameter[] parameter1 = new SqlParameter[] { new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId) };
DataTable tb1 = SQLHelper.GetDataTableRunText(sqlData, parameter1);
string sqlTrust = @"select a.JOT_ID, c.DetectionTypeCode,b.CH_TrustType from CH_TrustItem AS a
LEFT JOIN CH_Trust AS b ON a.CH_TrustID = b.CH_TrustID
left join Base_DetectionType c on b.CH_NDTMethod = c.DetectionTypeId
where a.JOT_ID in ('" + string.Join("','", jotids) + "') ";
string sqlTrust = @"select a.WeldJointId, c.DetectionTypeCode,b.TrustType from HJGL_Batch_BatchTrustItem AS a
LEFT JOIN HJGL_Batch_BatchTrust AS b ON a.TrustBatchId = b.TrustBatchId
left join Base_DetectionType c on b.DetectionTypeId = c.DetectionTypeId
where a.WeldJointId in ('" + string.Join("','", jotids) + "') ";
DataTable tbTrust = SQLHelper.GetDataTableRunText(sqlTrust, null);
Dictionary<string, string> DetectionTypeDic = new Dictionary<string, string>();
Dictionary<string, string> TrustTypeDic = new Dictionary<string, string>();
SGGL/FineUIPro.Web/common/Menu_HJGL.xml
+9 -4
View File
@@ -7,19 +7,22 @@
<TreeNode id="2F027233-22EC-4063-A04F-FB9FE6A91588" Text="材料仓库" NavigateUrl="HJGL/BaseInfo/Warehouse.aspx"></TreeNode>
<TreeNode id="F6194C00-D256-485D-9056-171FAB75928A" Text="管道颜色标识库" NavigateUrl="HJGL/BaseInfo/MaterialColor.aspx"></TreeNode>
</TreeNode>
<TreeNode id="8IDKGJE2-09B1-4607-DCS2-DCC3O48F080F" Text="数据导入" NavigateUrl=""><TreeNode id="32F5CC8C-E0F4-456C-AB88-77E36269FA50" Text="焊接设计基础数据导入" NavigateUrl="HJGL/WeldingManage/WeldJointList.aspx"></TreeNode>
<TreeNode id="8IDKGJE2-09B1-4607-DCS2-DCC3O48F080F" Text="数据导入" NavigateUrl=""><TreeNode id="B13BFFA5-3112-4209-8562-5329B78B405C" Text="三维模型导入" NavigateUrl="HJGL/DataImport/TDMImport.aspx"></TreeNode>
<TreeNode id="5CBE9258-6FE9-47A8-BFDD-3BDD90F7DECC" Text="图纸导入" NavigateUrl="HJGL/DataImport/DrawingImport.aspx"></TreeNode>
<TreeNode id="32F5CC8C-E0F4-456C-AB88-77E36269FA50" Text="焊接设计基础数据导入" NavigateUrl="HJGL/WeldingManage/WeldJointList.aspx"></TreeNode>
<TreeNode id="EFD1E914-E79C-4F5E-A2F7-CFF4F7821284" Text="管线导入" NavigateUrl="HJGL/DataImport/PipeLineInAuto.aspx"></TreeNode>
<TreeNode id="34BAD63E-EF7C-4D7E-8641-C706BBFCD85F" Text="轴测图识别" NavigateUrl="HJGL/DataImport/DrawingRecognition.aspx"></TreeNode>
</TreeNode>
<TreeNode id="1EE36752-6077-47C9-AFF0-5372B862FF61" Text="管线划分" NavigateUrl="HJGL/PreDesign/PipelingDivide.aspx"></TreeNode>
<TreeNode id="1C6F9CA9-FDAC-4CE5-A19C-5536538851E1" Text="试压包划分" NavigateUrl="HJGL/TestPackage/TestPackageEdit.aspx"></TreeNode>
<TreeNode id="EF6B01AF-D038-4A38-BFAF-D89130D60DE6" Text="材料信息导入" NavigateUrl="HJGL/DataImport/MaterialInformation.aspx"></TreeNode>
<TreeNode id="1E36EA73-D536-4215-BFB9-A8771937BD89" Text="工厂预制管理" NavigateUrl=""><TreeNode id="53948077-B51D-4FF3-BFB0-AB4E27C42875" Text="排产计划" NavigateUrl="HJGL/PreDesign/ProductionSchedulingPlan.aspx"></TreeNode>
<TreeNode id="1E36EA73-D536-4215-BFB9-A8771937BD89" Text="工厂预制管理" NavigateUrl=""><TreeNode id="0A3F6AB0-535E-489C-9F64-4FFE61C17085" Text="材料管理" NavigateUrl="HJGL/PreDesign/MaterialManage.aspx"></TreeNode>
<TreeNode id="8255554C-0A92-4C7B-BF19-779AF0220A8C" Text="预制组件管理" NavigateUrl="HJGL/PreDesign/PrePipeline.aspx"></TreeNode>
<TreeNode id="F18CFC0E-47E0-477A-9AB3-72B88D438299" Text="堆场规划" NavigateUrl="HJGL/PreDesign/YardPlanning.aspx"></TreeNode>
<TreeNode id="EEC0D060-C15E-4D25-B015-C2B91F735DAC" Text="车次管理" NavigateUrl="HJGL/PreDesign/TrainNumberManager.aspx"></TreeNode>
<TreeNode id="25DED954-10C9-47CC-99F2-C44FDE9E0A81" Text="发货管理" NavigateUrl="HJGL/PreDesign/PackagingManage.aspx"></TreeNode>
<TreeNode id="BD9C587E-17C2-49F1-82AE-A05117E41D89" Text="安装清单" NavigateUrl="HJGL/PreDesign/InstallList.aspx"></TreeNode>
<TreeNode id="25DED954-10C9-47CC-99F2-C44FDE9E0A81" Text="包装管理" NavigateUrl="HJGL/PreDesign/PackagingManage.aspx"></TreeNode>
<TreeNode id="EEC0D060-C15E-4D25-B015-C2B91F735DAC" Text="发货管理" NavigateUrl="HJGL/PreDesign/TrainNumberManager.aspx"></TreeNode>
<TreeNode id="53948077-B51D-4FF3-BFB0-AB4E27C42875" Text="排产计划" NavigateUrl="HJGL/PreDesign/ProductionSchedulingPlan.aspx"></TreeNode>
</TreeNode>
<TreeNode id="9B828E92-733B-4AF9-9DD0-55ECD8B64AB8" Text="材料管理" NavigateUrl=""><TreeNode id="E29C1839-3530-45EC-A752-B26A0027E2CD" Text="入库管理" NavigateUrl=""><TreeNode id="324C72AF-447A-4308-AFB7-ABF788C58240" Text="入库申请" NavigateUrl="CLGL/InPlanMaster.aspx"></TreeNode>
<TreeNode id="4A55351A-2440-4A2D-8509-3FFEE5FC8861" Text="入库单管理" NavigateUrl="CLGL/InputMaster.aspx"></TreeNode>
@@ -39,7 +42,9 @@
<TreeNode id="66290870-2B12-46CA-8E5D-8CB7233ACB8C" Text="焊接施工基础数据录入" NavigateUrl="HJGL/WeldingManage/WeldingConDate.aspx"></TreeNode>
</TreeNode>
<TreeNode id="43F92EA7-462F-41E6-8D8A-243C03A5317E" Text="信息查询" NavigateUrl=""><TreeNode id="A98C7295-5735-4C8A-9565-7635A9C5D258" Text="管线信息总览" NavigateUrl="HJGL/InfoQuery/PipelineQuery.aspx"></TreeNode>
<TreeNode id="6B16D1D4-FBDA-4B2B-AE0A-B465C686C27D" Text="轴测图" NavigateUrl="HJGL/JoinMarking/JointShow.aspx"></TreeNode>
<TreeNode id="F4275A19-A72E-448E-B0C1-07DB2FCEE224" Text="焊口台账总览" NavigateUrl="HJGL/InfoQuery/JointQuery.aspx"></TreeNode>
<TreeNode id="DB50A5AA-08DB-4915-9173-6DB133CA76F0" Text="库存信息总览" NavigateUrl="HJGL/DataImport/MaterialStock.aspx"></TreeNode>
</TreeNode>
<TreeNode id="4D36E99E-B3D8-4C61-826A-CBD98EC51515" Text="焊接过程管理" NavigateUrl=""><TreeNode id="E6F6982A-48C7-455C-8EBB-CC7088EBF15A" Text="焊接施工计划" NavigateUrl="HJGL/WeldingManage/WeldingPlan.aspx"></TreeNode>
<TreeNode id="ADC7EA61-6313-4DF9-913F-E9207F6525CA" Text="材料匹配(工厂预制)" NavigateUrl="HJGL/WeldingManage/WeldMatMatch.aspx?PipeArea=1"></TreeNode>