feat(clgl): 增加入库申请编辑与明细导入

支持入库申请信息维护、入库明细批量导入及模板下载，完善材料入库业务流程，减少人工录入和明细维护成本。增加焊口流转区段信息，并统一相关单位工程列表排序
2026-07-13 09:17:00 +08:00
parent 1da7910305
commit 3185461755
73 changed files with 1774 additions and 145 deletions
@@ -58,6 +58,7 @@ namespace FineUIPro.Web.HJGL.DataImport
            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;
@@ -407,4 +408,4 @@ namespace FineUIPro.Web.HJGL.DataImport


    }
-}
+}
@@ -64,6 +64,7 @@ namespace FineUIPro.Web.HJGL.DataImport
            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;
@@ -57,6 +57,7 @@ namespace FineUIPro.Web.HJGL.DataImport
            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;
@@ -408,4 +409,4 @@ namespace FineUIPro.Web.HJGL.DataImport


    }
-}
+}
@@ -72,6 +72,7 @@ namespace FineUIPro.Web.HJGL.HotProcessHard
            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;
@@ -394,4 +395,4 @@ namespace FineUIPro.Web.HJGL.HotProcessHard
        }
        #endregion
    }
-}
+}
@@ -73,6 +73,7 @@ namespace FineUIPro.Web.HJGL.HotProcessHard
            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;
@@ -106,6 +106,7 @@ namespace FineUIPro.Web.HJGL.HotProcessHard
            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;
@@ -552,4 +553,4 @@ namespace FineUIPro.Web.HJGL.HotProcessHard
        }
        #endregion
    }
-}
+}
@@ -73,6 +73,7 @@ namespace FineUIPro.Web.HJGL.HotProcessHard
            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;
@@ -374,4 +375,4 @@ namespace FineUIPro.Web.HJGL.HotProcessHard
        }
        #endregion           
    }
-}
+}
@@ -75,6 +75,7 @@ namespace FineUIPro.Web.HJGL.HotProcessHard
            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;
@@ -108,6 +108,7 @@ namespace FineUIPro.Web.HJGL.HotProcessHard
            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;
@@ -690,4 +691,4 @@ namespace FineUIPro.Web.HJGL.HotProcessHard
            }
        }
    }
-}
+}
@@ -101,6 +101,10 @@
                                                <asp:Label ID="labNumber" runat="server" Text=' <%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1%>'></asp:Label>
                                            </ItemTemplate>
                                        </f:TemplateField>
+                                        <f:RenderField HeaderText="管线号" ColumnID="PipelineCode"
+                                            DataField="PipelineCode" SortField="PipelineCode" FieldType="String" HeaderTextAlign="Center"
+                                            Width="100px">
+                                        </f:RenderField>
                                        <f:RenderField HeaderText="焊口号" ColumnID="WeldJointCode"
                                            DataField="WeldJointCode" SortField="WeldJointCode" FieldType="String" HeaderTextAlign="Center"
                                            Width="100px">
@@ -258,6 +258,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
                                      && x.SuperUnitWork == null
                                      && x.UnitId != null
                                      && x.ProjectType != null
+                                orderby x.UnitWorkCode
                                select x).ToList();

            // 优化2: 批量获取所有相关管线数据，避免N+1查询问题
@@ -913,8 +914,12 @@ namespace FineUIPro.Web.HJGL.InfoQuery
            var jointIds = weldJointList.Select(x => x.WeldJointId).Where(x => !string.IsNullOrEmpty(x)).Distinct().ToList();
            var pipelineIds = weldJointList.Select(x => x.PipelineId).Where(x => !string.IsNullOrEmpty(x)).Distinct().ToList();
            var materialRows = (from x in Funs.DB.HJGL_PipeLineMat
+                                join y in Funs.DB.HJGL_MaterialCodeLib on x.MaterialCode equals y.MaterialCode
                                where jointIds.Contains(x.WeldJointId) && pipelineIds.Contains(x.PipelineId)
-                                orderby x.WeldJointId, x.Number, x.PipeLineMatId
+                                orderby
+                                    y.MaterialUnit == "米" ? 1 :
+                                    y.MaterialUnit == "个" ? 2 :
+                                    y.MaterialUnit == "片" ? 3 : 4
                                select x).ToList();

            var materialCodes = materialRows.Where(x => !string.IsNullOrEmpty(x.MaterialCode)).Select(x => x.MaterialCode).Distinct().ToList();
@@ -952,7 +957,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
                dr["WeldJointNo"] = weldJointNo;
                dr["MaterialText"] = string.IsNullOrEmpty(joint.Material1Code) ? joint.Material2Code : joint.Material1Code;
                dr["Spec"] = joint.Specification;
-                dr["DesignTemperature"] = joint.PreTemperature;
+                dr["DesignTemperature"] = joint.DesignTemperature;
                dr["MaterialCode1"] = GetMaterialDisplayCode(row1, lib1);
                dr["HeatNo1"] = lib1 == null ? string.Empty : lib1.HeatNo;
                dr["BatchNo1"] = lib1 == null ? string.Empty : lib1.BatchNo;
@@ -75,6 +75,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
            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;
@@ -92,6 +92,7 @@ namespace FineUIPro.Web.HJGL.LeakVacuum
            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.HJGL_LV_LeakVacuum> LeakVacuumLists = (from x in Funs.DB.HJGL_LV_LeakVacuum where x.ProjectId == this.CurrUser.LoginProjectId && x.TableDate >= startTime && x.TableDate < endTime select x).ToList();
            List<Model.WBS_UnitWork> unitWork1 = null;
@@ -399,4 +400,4 @@ namespace FineUIPro.Web.HJGL.LeakVacuum
            }
        }
    }
-}
+}
@@ -90,6 +90,7 @@ namespace FineUIPro.Web.HJGL.LeakVacuum
            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.HJGL_LV_LeakVacuum> LeakVacuumLists = (from x in Funs.DB.HJGL_LV_LeakVacuum where x.ProjectId == this.CurrUser.LoginProjectId && x.TableDate >= startTime && x.TableDate < endTime select x).ToList();
            List<Model.WBS_UnitWork> unitWork1 = null;
@@ -532,4 +533,4 @@ namespace FineUIPro.Web.HJGL.LeakVacuum
        }
        #endregion
    }
-}
+}
@@ -90,6 +90,7 @@ namespace FineUIPro.Web.HJGL.LeakVacuum
            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.HJGL_LV_LeakVacuum> LeakVacuumLists = (from x in Funs.DB.HJGL_LV_LeakVacuum where x.ProjectId == this.CurrUser.LoginProjectId && x.TableDate >= startTime && x.TableDate < endTime select x).ToList();
            List<Model.WBS_UnitWork> unitWork1 = null;
@@ -509,4 +510,4 @@ namespace FineUIPro.Web.HJGL.LeakVacuum
        }
        #endregion
    }
-}
+}
@@ -74,6 +74,7 @@ namespace FineUIPro.Web.HJGL.LeakVacuum
            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.HJGL_LV_LeakVacuum> LeakVacuumLists = (from x in Funs.DB.HJGL_LV_LeakVacuum where x.ProjectId == this.CurrUser.LoginProjectId select x).ToList();
            List<Model.WBS_UnitWork> unitWork1 = null;
@@ -501,4 +502,4 @@ namespace FineUIPro.Web.HJGL.LeakVacuum
            }
        }
    }
-}
+}
@@ -131,6 +131,7 @@ namespace FineUIPro.Web.HJGL.NDT
            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;
@@ -75,6 +75,7 @@ namespace FineUIPro.Web.HJGL.PointTrust
            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;
@@ -1195,4 +1196,4 @@ namespace FineUIPro.Web.HJGL.PointTrust
            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("PointWeldJointView.aspx?unitWorkId={0}&rateId={1}&detectionType={2}", unitWorkId, rateId, detectionType, "新增 - ")));
        }
    }
-}
+}
@@ -52,6 +52,7 @@ namespace FineUIPro.Web.HJGL.PointTrust
            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;
@@ -1088,4 +1089,4 @@ namespace FineUIPro.Web.HJGL.PointTrust
            }
        }
    }
-}
+}
@@ -52,6 +52,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
            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;
@@ -446,4 +447,4 @@ namespace FineUIPro.Web.HJGL.PreDesign

        }
    }
-}
+}
@@ -92,6 +92,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
            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();
            //获取当前项目出库单
            Model.Tw_InOutMasterOutput querytable = new Model.Tw_InOutMasterOutput();
@@ -278,4 +279,4 @@ namespace FineUIPro.Web.HJGL.PreDesign

        #endregion 提交按钮
    }
-}
+}
@@ -89,7 +89,7 @@
                                            Width="180px" LabelWidth="80px" LabelAlign="Right">
                                        </f:TextBox>

-                                        <f:DropDownList ID="ddlFlowingSection" runat="server" Label="流水段"
+                                        <f:DropDownList ID="ddlFlowingSection" runat="server" Label="流水段" Hidden="true"
                                            Width="180px" LabelWidth="80px" LabelAlign="Right" AutoSelectFirstItem="true">
                                        </f:DropDownList> 
                                        <f:DropDownList ID="ddlPipeArea" runat="server" Label="管线划分"
@@ -132,10 +132,10 @@
                                                <asp:Label ID="txt" runat="server" Text='<%# ConvertPipeArea(Eval("PipeArea")) %>'></asp:Label>
                                            </ItemTemplate>
                                        </f:TemplateField>
-                                        <f:RenderField Width="150px" ColumnID="FlowingSection" DataField="FlowingSection"
+                                        <%--<f:RenderField Width="150px" ColumnID="FlowingSection" DataField="FlowingSection"
                                            FieldType="String" HeaderText="流水段" HeaderTextAlign="Center"
                                            TextAlign="Center" SortField="FlowingSection">
-                                        </f:RenderField>
+                                        </f:RenderField>--%>
                                        <f:RenderField Width="150px" ColumnID="WarehouseName" DataField="WarehouseName"
                                            FieldType="String" HeaderText="仓库" HeaderTextAlign="Center"
                                            TextAlign="Center" SortField="WarehouseName">
@@ -99,6 +99,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
            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;
@@ -64,6 +64,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
            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;
@@ -62,6 +62,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
            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;
@@ -980,6 +981,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
                    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> unitWorks = null;
@@ -1291,4 +1293,4 @@ namespace FineUIPro.Web.HJGL.PreDesign
        }
        #endregion
    }
-}
+}
@@ -92,6 +92,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
            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;
@@ -364,4 +365,4 @@ namespace FineUIPro.Web.HJGL.PreDesign
        }
    }

-}
+}
@@ -92,6 +92,7 @@ namespace FineUIPro.Web.HJGL.PurgingCleaning
            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.HJGL_PC_PurgingCleaning> PurgingCleaningLists = (from x in Funs.DB.HJGL_PC_PurgingCleaning where x.ProjectId == this.CurrUser.LoginProjectId && x.TableDate >= startTime && x.TableDate < endTime select x).ToList();
            List<Model.WBS_UnitWork> unitWork1 = null;
@@ -400,4 +401,4 @@ namespace FineUIPro.Web.HJGL.PurgingCleaning
            }
        }
    }
-}
+}
@@ -90,6 +90,7 @@ namespace FineUIPro.Web.HJGL.PurgingCleaning
            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.HJGL_PC_PurgingCleaning> PurgingCleaning = (from x in Funs.DB.HJGL_PC_PurgingCleaning where x.ProjectId == this.CurrUser.LoginProjectId && x.TableDate >= startTime && x.TableDate < endTime select x).ToList();
            List<Model.WBS_UnitWork> unitWork1 = null;
@@ -536,4 +537,4 @@ namespace FineUIPro.Web.HJGL.PurgingCleaning
        }
        #endregion
    }
-}
+}
@@ -90,6 +90,7 @@ namespace FineUIPro.Web.HJGL.PurgingCleaning
            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.HJGL_PC_PurgingCleaning> PurgingCleaning = (from x in Funs.DB.HJGL_PC_PurgingCleaning where x.ProjectId == this.CurrUser.LoginProjectId && x.TableDate >= startTime && x.TableDate < endTime select x).ToList();
            List<Model.WBS_UnitWork> unitWork1 = null;
@@ -506,4 +507,4 @@ namespace FineUIPro.Web.HJGL.PurgingCleaning
        }
        #endregion
    }
-}
+}
@@ -75,6 +75,7 @@ namespace FineUIPro.Web.HJGL.PurgingCleaning
            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.HJGL_PC_PurgingCleaning> PurgingCleaning = (from x in Funs.DB.HJGL_PC_PurgingCleaning where x.ProjectId == this.CurrUser.LoginProjectId select x).ToList();
            List<Model.WBS_UnitWork> unitWork1 = null;
@@ -501,4 +502,4 @@ namespace FineUIPro.Web.HJGL.PurgingCleaning
            }
        }
    }
-}
+}
@@ -176,6 +176,7 @@ namespace FineUIPro.Web.HJGL.RepairAndExpand
            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;
@@ -1119,4 +1120,4 @@ namespace FineUIPro.Web.HJGL.RepairAndExpand
            }
        }
    }
-}
+}
@@ -51,6 +51,7 @@ namespace FineUIPro.Web.HJGL.RepairAndExpand
            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;
@@ -636,4 +637,4 @@ namespace FineUIPro.Web.HJGL.RepairAndExpand
        }
        #endregion
    }
-}
+}
@@ -91,6 +91,7 @@ namespace FineUIPro.Web.HJGL.TestPackage
            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.PTP_TestPackage> testPackageLists = (from x in Funs.DB.PTP_TestPackage
                                                            where x.ProjectId == this.CurrUser.LoginProjectId && x.TableDate >= startTime && x.TableDate < endTime
@@ -378,4 +379,4 @@ namespace FineUIPro.Web.HJGL.TestPackage
            }
        }
    }
-}
+}
@@ -92,6 +92,7 @@ namespace FineUIPro.Web.HJGL.TestPackage
            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.PTP_TestPackage> testPackageLists = new List<Model.PTP_TestPackage>();
            if (!string.IsNullOrEmpty(this.txtCode.Text.Trim()))
@@ -609,4 +610,4 @@ namespace FineUIPro.Web.HJGL.TestPackage
        }
        #endregion
    }
-}
+}
@@ -85,6 +85,7 @@ namespace FineUIPro.Web.HJGL.TestPackage
            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.PTP_TestPackage> testPackageLists = new List<Model.PTP_TestPackage>();
            if (!string.IsNullOrEmpty(this.txtCode.Text.Trim()))
@@ -673,4 +674,4 @@ namespace FineUIPro.Web.HJGL.TestPackage
        }
        #endregion
    }
-}
+}
@@ -88,6 +88,7 @@ namespace FineUIPro.Web.HJGL.TestPackage
            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.PTP_TestPackage> testPackageLists = new List<Model.PTP_TestPackage>();
            if (!string.IsNullOrEmpty(this.txtCode.Text.Trim()))
@@ -505,4 +506,4 @@ namespace FineUIPro.Web.HJGL.TestPackage
        #endregion 查询

    }
-}
+}
@@ -89,6 +89,7 @@ namespace FineUIPro.Web.HJGL.TestPackage
                                     && x.SuperUnitWork == null
                                     && x.UnitId != null
                                     && x.ProjectType != null
+                               orderby x.UnitWorkCode
                               select x).ToList();

            // 按项目类型分组，避免重复查询
@@ -535,4 +536,4 @@ namespace FineUIPro.Web.HJGL.TestPackage
        }
        #endregion
    }
-}
+}
@@ -93,6 +93,7 @@ namespace FineUIPro.Web.HJGL.TestPackage
            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.PTP_TestPackage> testPackageLists = new List<Model.PTP_TestPackage>();
            if (!string.IsNullOrEmpty(this.txtCode.Text.Trim()))
@@ -651,4 +652,4 @@ namespace FineUIPro.Web.HJGL.TestPackage
        }
        #endregion
    }
-}
+}
@@ -58,6 +58,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;
@@ -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;
@@ -627,4 +628,4 @@ namespace FineUIPro.Web.HJGL.WeldingManage
        }
        #endregion
    }
-}
+}
@@ -1025,8 +1025,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                                 PCMedium = x.PCMedium,
                                 MaterialId = x.MaterialId,
                                 PaintId = x.PaintId,
-                                 Remark = x.Remark,
-                                 FlowingSection = x.FlowingSection
+                                 Remark = x.Remark, 
                             }).DistinctBy(temp => new
                             {
                                 temp.PipelineId,
@@ -1052,8 +1051,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                                 temp.PCMedium,
                                 temp.MaterialId,
                                 temp.PaintId,
-                                 temp.Remark,
-                                 temp.FlowingSection
+                                 temp.Remark
                             }).ToList();
            for (int i = 0; i < pipelines.Count(); i++)
            {
@@ -1082,7 +1080,6 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                pipeline.MaterialId = pipelines[i].MaterialId;
                pipeline.PaintId = pipelines[i].PaintId;
                pipeline.Remark = pipelines[i].Remark;
-                pipeline.FlowingSection = pipelines[i].FlowingSection;

                var isExistPipelineCode = PipelineService.GetPipelineByCode(pipeline.PipelineCode, pipeline.UnitWorkId);
                if (isExistPipelineCode != null) // 更新管线
@@ -1127,6 +1124,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                                  ProjectId = this.CurrUser.LoginProjectId,
                                  IsHotProess = x.IsHotProess,
                                  WeldJointPoint = x.WeldJointPoint,
+                                  FlowingSection=x.FlowingSection
                              }).DistinctBy(temp => new
                              {
                                  temp.WeldJointCode,
@@ -1143,7 +1141,8 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                                  temp.JointAttribute,
                                  temp.ProjectId,
                                  temp.IsHotProess,
-                                  temp.WeldJointPoint
+                                  temp.WeldJointPoint,
+                                  temp.FlowingSection
                              }).ToList();

            var pipelineCodes = weldJoints.Select(x => x.PipelineCode).Distinct().ToList();
@@ -1166,12 +1165,29 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                weldJoint.ProjectId = weldJoints[i].ProjectId;
                weldJoint.IsHotProess = weldJoints[i].IsHotProess;
                weldJoint.WeldJointPoint = weldJoints[i].WeldJointPoint;
+                weldJoint.FlowingSection = weldJoints[i].FlowingSection;

                var isExistJot = allWeldJoints.FirstOrDefault(x => x.PipelineId == weldJoint.PipelineId && x.WeldJointCode == weldJoint.WeldJointCode);
                if (isExistJot != null) // 更新焊口
-                {
-                    weldJoint.WeldJointId = isExistJot.WeldJointId;
-                    BLL.WeldJointService.UpdateWeldJoint(weldJoint);
+                { 
+                    isExistJot.PipelineId = getpipelines.Where(x => x.PipelineCode == weldJoints[i].PipelineCode).FirstOrDefault().PipelineId;
+                    isExistJot.WeldJointCode = weldJoints[i].WeldJointCode;
+                    isExistJot.PipelineCode = weldJoints[i].PipelineCode;
+                    isExistJot.Material1Id = weldJoints[i].Material1Id;
+                    isExistJot.Material2Id = weldJoints[i].Material2Id;
+                    isExistJot.Dia = weldJoints[i].Dia;
+                    isExistJot.DNDia = weldJoints[i].DNDia;
+                    isExistJot.Size = weldJoints[i].Size;
+                    isExistJot.Thickness = weldJoints[i].Thickness;
+                    isExistJot.Specification = weldJoints[i].Specification;
+                    isExistJot.WeldTypeId = weldJoints[i].WeldTypeId;
+                    isExistJot.DetectionTypeId = weldJoints[i].DetectionTypeId;
+                    isExistJot.JointAttribute = weldJoints[i].JointAttribute;
+                    isExistJot.ProjectId = weldJoints[i].ProjectId;
+                    isExistJot.IsHotProess = weldJoints[i].IsHotProess;
+                    isExistJot.WeldJointPoint = weldJoints[i].WeldJointPoint;
+                    isExistJot.FlowingSection = weldJoints[i].FlowingSection;
+                    BLL.WeldJointService.UpdateWeldJoint(isExistJot);
                }
                else // 增加焊口
                {
@@ -53,6 +53,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;
@@ -766,4 +767,4 @@ namespace FineUIPro.Web.HJGL.WeldingManage
        }
        #endregion
    }
-}
+}
@@ -224,11 +224,7 @@
                                        <f:RenderField Width="100px" ColumnID="PaintCode" DataField="PaintCode" SortField="PaintCode"
                                            FieldType="String" HeaderText="防腐等级" HeaderTextAlign="Center"
                                            TextAlign="Left">
-                                        </f:RenderField>
-                                        <f:RenderField Width="100px" ColumnID="FlowingSection" DataField="FlowingSection" SortField="FlowingSection"
-                                            FieldType="String" HeaderText="流水段" HeaderTextAlign="Center"
-                                            TextAlign="Left">
-                                        </f:RenderField>
+                                        </f:RenderField> 
                                        <f:RenderField Width="100px" ColumnID="Remark" DataField="Remark" SortField="Remark"
                                            FieldType="String" HeaderText="备注" HeaderTextAlign="Center"
                                            TextAlign="Left">
@@ -263,6 +259,10 @@
                                                        <f:RenderField HeaderText="焊口属性" ColumnID="JointAttribute" DataField="JointAttribute" SortField="JointAttribute" FieldType="String" HeaderTextAlign="Center"
                                                            TextAlign="Left" Width="90px">
                                                        </f:RenderField>
+                                                        <f:RenderField Width="100px" ColumnID="FlowingSection" DataField="FlowingSection" SortField="FlowingSection"
+                                                            FieldType="String" HeaderText="流水段" HeaderTextAlign="Center"
+                                                            TextAlign="Left">
+                                                        </f:RenderField>
                                                        <f:RenderField HeaderText="材质1" ColumnID="Material1Code" DataField="Material1Code" SortField="Material1Code" FieldType="String" HeaderTextAlign="Center"
                                                            TextAlign="Left" Width="90px">
                                                        </f:RenderField>
@@ -72,6 +72,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;
@@ -329,7 +330,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,WeldJointPoint
+                                     BackingWelderCode,CoverWelderCode,MediumCode ,PreTemperature,JointArea,WPQCode,Remark,WeldJointPoint,FlowingSection
                              FROM View_HJGL_WeldJoint WHERE IsTwoJoint IS NULL ";
            List<SqlParameter> listStr = new List<SqlParameter> { };

@@ -140,6 +140,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;
@@ -59,6 +59,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;
@@ -108,6 +108,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;
@@ -99,7 +99,7 @@
                        <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="焊口信息"
                            EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="WeldJointId" AllowCellEditing="true"
                            AllowColumnLocking="true" EnableColumnLines="true" ClicksToEdit="2" DataIDField="WeldJointId"
-                            AllowSorting="true" SortField="WeldJointCode" SortDirection="ASC" OnSort="Grid1_Sort"
+                            AllowSorting="true" SortField="PipelineCode,WeldJointCodeInt" SortDirection="ASC" OnSort="Grid1_Sort"
                            AllowPaging="true" IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange"
                            EnableTextSelection="True" EnableRowDoubleClickEvent="true"
                            OnRowDoubleClick="Grid1_RowDoubleClick" OnRowDataBound="Grid1_RowDataBound">
@@ -108,6 +108,9 @@
                                    Width="60px" HeaderTextAlign="Center" TextAlign="Center" ColumnID="tfNumber" />
                                <f:GroupField HeaderText="设计基础数据" TextAlign="Center">
                                    <Columns>
+                                        <f:renderfield headertext="管线号" columnid="PipelineCode" datafield="PipelineCode" sortfield="PipelineCode" fieldtype="String" headertextalign="Center"
+                                            textalign="Left" width="160px">
+                                        </f:renderfield>
                                        <f:RenderField HeaderText="焊口号" ColumnID="WeldJointCode" DataField="WeldJointCode" SortField="WeldJointCode" FieldType="String" HeaderTextAlign="Center"
                                            TextAlign="Left" Width="160px">
                                        </f:RenderField>
@@ -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
        }

    }
-}
+}
@@ -58,6 +58,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;