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

2022-10-08 15:20:07 +08:00
parent 5e4a7de2ac
commit ccb0a6152b
13 changed files with 1389 additions and 81 deletions
@@ -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";