From 1df47b8004323bf1587197785db887a79d276b63 Mon Sep 17 00:00:00 2001
From: Leo <novelliou@hotmail.com>
Date: Wed, 2 Aug 2023 12:46:55 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E6=9F=A5=E8=AF=A2=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=EF=BC=88=E7=AC=AC=E4=B8=89=E6=96=B9=E8=B0=83=E7=94=A8?=
 =?UTF-8?q?=EF=BC=89=E5=A2=9E=E5=8A=A0=E4=B8=A4=E4=B8=AA=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=EF=BC=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 FactorySystemBll/MaterialBll.cs | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/FactorySystemBll/MaterialBll.cs b/FactorySystemBll/MaterialBll.cs
index 1dc4dae..471c075 100644
--- a/FactorySystemBll/MaterialBll.cs
+++ b/FactorySystemBll/MaterialBll.cs
@@ -333,6 +333,31 @@ namespace FactorySystemBll
                     result = db.Queryable<TFS_Material, TFS_ViewMaterial>((a, b) => new JoinQueryInfos(JoinType.Left, a.FID == b.FMaterialID))
                         .Where((a, b) => a.FPlmCode.Equals(code1) && a.FVersionCode.Equals(code2) && b.FFactoryCode.Equals(code3)).Select<dynamic>(selectVal).ToList();
                     break;
+                // 20230802 增加试验号 + 工厂查询
+                case "5":
+                    if (inParam.TryGetValue("SP_VALUE", out object objSpValue5)) code1 = objSpValue5.ToString();
+                    if (inParam.TryGetValue("FFactoryCode", out object objFactoryCode5)) code2 = objFactoryCode5.ToString();
+
+                    if (string.IsNullOrWhiteSpace(code1) || string.IsNullOrWhiteSpace(code2))
+                    {
+                        return result;
+                    }
+                    result = db.Queryable<TFS_Material, TFS_ViewMaterial>((a, b) => new JoinQueryInfos(JoinType.Left, a.FID == b.FMaterialID))
+                        .Where((a, b) => a.FTestCode.Equals(code1) && b.FFactoryCode.Equals(code2)).Select<dynamic>(selectVal).ToList();
+                    break;
+                // 20230802 增加试验号 + 版本号 + 工厂查询
+                case "6":
+                    if (inParam.TryGetValue("SP_VALUE", out object objSpValue6)) code1 = objSpValue6.ToString();
+                    if (inParam.TryGetValue("FFactoryCode", out object objFactoryCode6)) code2 = objFactoryCode6.ToString();
+                    if (inParam.TryGetValue("SP_VERSION", out object objVersion6)) code3 = objVersion6.ToString();
+
+                    if (string.IsNullOrWhiteSpace(code1) || string.IsNullOrWhiteSpace(code2) || string.IsNullOrWhiteSpace(code3))
+                    {
+                        return result;
+                    }
+                    result = db.Queryable<TFS_Material, TFS_ViewMaterial>((a, b) => new JoinQueryInfos(JoinType.Left, a.FID == b.FMaterialID))
+                        .Where((a, b) => a.FTestCode.Equals(code1) && b.FFactoryCode.Equals(code2) && a.FVersionCode.Equals(code3)).Select<dynamic>(selectVal).ToList();
+                    break;
             }
             return result;
         }