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

通过按材料编码优化库存匹配并增加条码查询入口，减少材料主编码选择歧义，便于按项目追溯入库条码。
2026-09-16 15:47:51 +08:00
parent ffb9c2a95c
commit 9810280e42
14 changed files with 450 additions and 12 deletions
@@ -20,7 +20,7 @@
        /// </summary>
        public static Model.MaterialCodeLibBarCodeOutput GetBarCodeMaterialInfo(string barCode)
        {
-            return (from detailBarCode in Funs.DB.Tw_InputDetailBarCode
+            var result= (from detailBarCode in Funs.DB.Tw_InputDetailBarCode
                    join x in Funs.DB.HJGL_MaterialCodeLib on detailBarCode.MaterialCode equals x.MaterialCode
                    where detailBarCode.BarCode == barCode
                    select new Model.MaterialCodeLibBarCodeOutput
@@ -36,6 +36,24 @@
                        BarCode = detailBarCode.BarCode,
                        Quantity = detailBarCode.Quantity
                    }).FirstOrDefault();
+
+            if (result==null)
+            {
+                result = (from   x in Funs.DB.HJGL_MaterialCodeLib  
+                          where x.MaterialCode == barCode
+                          select new Model.MaterialCodeLibBarCodeOutput
+                          {
+                              MaterialCode = x.MaterialCode,
+                              Code = x.Code,
+                              HeatNo = x.HeatNo,
+                              BatchNo = x.BatchNo,
+                              MaterialName = x.MaterialName,
+                              MaterialDef = x.MaterialDef,
+                              MaterialSpec = x.MaterialSpec,
+                              MaterialUnit = x.MaterialUnit 
+                          }).FirstOrDefault();
+            }
+            return result;
        }

        /// <summary>