20230221焊接修改

2023-02-21 16:36:13 +08:00
parent 8e8eecbcfc
commit c1960a5ff5
22 changed files with 575 additions and 805 deletions
@@ -132,11 +132,11 @@ namespace BLL
                                        lib.MaterialMade,
                                        -sum( pipe.Number) AS num
                                        FROM dbo.HJGL_PipeLineMat pipe
-                                        LEFT JOIN HJGL_Pipeline_ComponentJoint comjoint
-                                            ON comjoint.PipelineComponentCode =pipe.PrefabricatedComponents
+                                        LEFT JOIN HJGL_Pipeline_Component com
+                                            ON com.PipelineComponentCode =pipe.PrefabricatedComponents
                                        LEFT JOIN HJGL_MaterialCodeLib lib
                                            ON lib.MaterialCode = pipe.MaterialCode
-                                        WHERE comjoint.State=1
+                                        WHERE com.ProductionState=1
                                        GROUP BY  lib.MaterialCode,lib.MaterialName,lib.MaterialUnit, lib.MaterialSpec,lib.MaterialMade
                                        UNION
                                        SELECT lib.MaterialCode,