20221008 001 焊接分析修改和焊接修复

SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs

@@ -258,15 +258,16 @@ namespace FineUIPro.Web.HJGL.PreDesign
         {
             BLL.FastReportService.ResetData();
 
-            string strSql = @"	SELECT com.PipelineComponentId,com.PipelineComponentCode,com.BoxNumber,
+            string strSql = @"			SELECT com.PipelineComponentId,com.PipelineComponentCode,com.BoxNumber,
                                      com.PipelineId, punit.UnitName AS PreUnit,aunit.UnitName AS AssembleUnit,mat.PrefabricatedComponents,
-									 com.QRCode,com.State,pipe.PlanStartDate,pipe.PipelineCode
+									 com.QRCode,com.State,CONVERT(varchar(100), pipe.PlanStartDate, 23) as PlanStartDate,pipe.PipelineCode,
+									 ('PrePipeline$'+com.PipelineComponentId )as QRCode2
                               FROM HJGL_Pipeline_Component com 
 							  LEFT JOIN HJGL_PipeLineMat mat ON mat.PipeLineMatId=com.PipeLineMatId
 							  LEFT JOIN HJGL_Pipeline pipe  ON pipe.PipelineId =com.PipelineId
 							  LEFT JOIN dbo.Base_Unit punit ON punit.UnitId=com.PreUnit
 							  LEFT JOIN dbo.Base_Unit aunit ON aunit.UnitId=com.AssembleUnit
-							  WHERE com.QRCode!='' ";
+							  WHERE com.QRCode!=''";
             List<SqlParameter> listStr = new List<SqlParameter> { };
 
             strSql += " AND com.PipelineId =@PipelineId";

SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineListPDMSIn.aspx

@@ -56,8 +56,8 @@
                 <f:FormRow>
                     <Items>
                         <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="管线信息" Height="350px"
-                            EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="PipelineId" AllowCellEditing="true"
-                            AllowColumnLocking="true" EnableColumnLines="true" ClicksToEdit="2" DataIDField="PipelineId"
+                            EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="PipelineCode" AllowCellEditing="true"
+                            AllowColumnLocking="true" EnableColumnLines="true" ClicksToEdit="2" DataIDField="PipelineCode"
                             AllowSorting="true" SortField="PipelineCode" SortDirection="ASC"
                             AllowPaging="true" IsDatabasePaging="true" PageSize="15" 
                             EnableTextSelection="True" >

SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineListPDMSIn.aspx.cs

@@ -727,7 +727,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         /// <param name="e"></param>
         protected void btnImport_Click(object sender, EventArgs e)
         {
-            if (State != (int)ButtonState.Check)
+            if (State != (int)ButtonState.Import)
             {
                 ShowNotify("请先审核");
                 return;