2011-10-19 焊接修改

2022-10-19 15:49:56 +08:00
parent 6e363ef6ae
commit b7a43a4130
26 changed files with 444 additions and 265 deletions
@@ -136,7 +136,7 @@ namespace BLL
                                                                  FROM dbo.HJGL_PipeLineMat pipe
                                                                  LEFT JOIN dbo.HJGL_MaterialCodeLib lib ON lib.MaterialCode = pipe.MaterialCode
 								                                  LEFT JOIN HJGL_Pipeline line ON pipe.PipelineId=line.PipelineId
-                                                                  WHERE   line.PipeArea=@PipeArea  and line.State=1
+                                                                  WHERE   line.PipeArea=@PipeArea  
 								                                  group by  lib.MaterialCode,lib.MaterialName,lib.MaterialUnit, lib.MaterialSpec,lib.MaterialMade) as aa on mat.MaterialCode=aa.MaterialCode
                                where mat.projectid=@Projectid and Ins.State=@State
                                group by mat.MaterialCode,lib.MaterialName,lib.MaterialSpec,lib.MaterialMade,lib.MaterialUnit,aa.num