焊接修改

2025-09-24 17:31:28 +08:00
parent cb92dcb730
commit 0f70405339
64 changed files with 2492 additions and 2040 deletions
@@ -37,11 +37,14 @@ namespace BLL
                              (string.IsNullOrEmpty(table.Id) || x.Id.Contains(table.Id)) &&
                              (string.IsNullOrEmpty(table.OutputMasterId) || x.OutputMasterId.Contains(table.OutputMasterId)) &&
                              (string.IsNullOrEmpty(table.PipelineComponentId) || x.PipelineComponentId.Contains(table.PipelineComponentId)) &&
-                              (string.IsNullOrEmpty(table.MaterialCode) || x.MaterialCode.Contains(table.MaterialCode))
+                              (string.IsNullOrEmpty(table.MaterialCode) || x.MaterialCode.Contains(table.MaterialCode))&&
+                              (table.TypeInt ==null || master.TypeInt==table.TypeInt)
                    select new Model.Tw_InOutDetailOutput
                    {
                        Id = x.Id,
                        OutputMasterId = x.OutputMasterId,
+                        CusBillCode=master.CusBillCode,
+                        TypeInt=master.TypeInt,
                        PipelineComponentId = x.PipelineComponentId,
                        MaterialCode = x.MaterialCode,
                        PlanNum = x.PlanNum,