feat(clgl): 完善材料匹配与入库条码查询

通过按材料编码优化库存匹配并增加条码查询入口，减少材料主编码选择歧义，便于按项目追溯入库条码。
2026-09-16 15:47:51 +08:00
parent ffb9c2a95c
commit 9810280e42
14 changed files with 450 additions and 12 deletions
@@ -39,13 +39,16 @@ namespace BLL
                        (string.IsNullOrEmpty(table.Id) || x.Id.Contains(table.Id)) &&
                        (string.IsNullOrEmpty(table.InputDetailId) || x.InputDetailId.Contains(table.InputDetailId)) &&
                        (string.IsNullOrEmpty(table.InputMasterId) || x.InputMasterId.Contains(table.InputMasterId)) &&
-                        (string.IsNullOrEmpty(table.MaterialCode) || x.MaterialCode.Contains(table.MaterialCode))
+                        (string.IsNullOrEmpty(table.ProjectId) || master.ProjectId == table.ProjectId) &&
+                        (string.IsNullOrEmpty(table.MaterialCode) || x.MaterialCode.Contains(table.MaterialCode)) &&
+                        (string.IsNullOrEmpty(table.BarCode) || x.BarCode.Contains(table.BarCode))
                    orderby master.CusBillCode, x.MaterialCode, x.Id
                    select new Tw_InputDetailBarCodeOutput
                    {
                        Id = x.Id,
                        InputDetailId = x.InputDetailId,
                        InputMasterId = x.InputMasterId,
+                        ProjectId = master.ProjectId,
                        CusBillCode = master.CusBillCode,
                        MaterialCode = x.MaterialCode,
                        Code = mat.Code,