From 79504bf4c31206581498ac8721c792645298c071 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E6=AD=A3=E6=98=93?= <zhaozhengyi1b@126.com>
Date: Mon, 12 Aug 2024 11:24:24 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=A8=E6=8A=8A=E6=89=8B=E6=A3=80=E6=B5=8B?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/WmPolishQualityStatisticsService.cs   | 48 +++++++++----------
 1 file changed, 22 insertions(+), 26 deletions(-)

diff --git a/ZR.Service/mes/wms/WmPolishQualityStatisticsService.cs b/ZR.Service/mes/wms/WmPolishQualityStatisticsService.cs
index b6a79396..01587dfe 100644
--- a/ZR.Service/mes/wms/WmPolishQualityStatisticsService.cs
+++ b/ZR.Service/mes/wms/WmPolishQualityStatisticsService.cs
@@ -136,32 +136,7 @@ namespace ZR.Service.mes.wms
                 WmPolishInventoryService inventoryService = new();
                 WmOneTimeInventoryService oneTimeService = new();
                 // 合格品检查是否是门把手，是进入成品库(仅出库)，不是进入一次合格品库
-                string[] checkStrArray =
-                {
-                    "T22",
-                    "T26",
-                    "A58",
-                    "A60",
-                    "C01",
-                    "B02",
-                    "V71",
-                    "T1EJ "
-                };
-                var isDoorknobCheck = Expressionable
-                    .Create<WmMaterial>();
-                foreach (string checkStr in checkStrArray)
-                {
-                    isDoorknobCheck.Or(it => it.Description.Contains(checkStr));
-                }
-                ;
-                isDoorknobCheck.And(it => it.Partnumber == res0.Partnumber)
-                    .And(it => it.Type == 1)
-                    .And(it => it.Status == 1)
-                    .And(it => it.Description.Contains("门把手"));
-                bool isDoorknob = Context
-                    .Queryable<WmMaterial>()
-                    .Where(isDoorknobCheck.ToExpression())
-                    .Any();
+                bool isDoorknob = CheckIsDoorknob(model.Partnumber);
                 if (!isDoorknob && model.QualifiedNumber > 0)
                 {
                     WmOneTimeInventory wmOneTimeInventoryWarehousing =
@@ -294,5 +269,26 @@ namespace ZR.Service.mes.wms
                 throw new Exception(e.Message);
             }
         }
+
+        /// <summary>
+        /// 检查零件号是否是门把手
+        /// </summary>
+        /// <returns></returns>
+        public bool CheckIsDoorknob(string partnumber)
+        {
+            string[] checkStrArray = { "T22", "T26", "A58", "A60", "C01", "B02", "V71", "T1EJ" };
+            var isDoorknobCheck = Expressionable.Create<WmMaterial>();
+            foreach (string checkStr in checkStrArray)
+            {
+                isDoorknobCheck.Or(it => it.Description.Contains(checkStr));
+            }
+            ;
+            isDoorknobCheck
+                .And(it => it.Partnumber == partnumber)
+                .And(it => it.Type == 1)
+                .And(it => it.Status == 1)
+                .And(it => it.Description.Contains("门把手"));
+            return Context.Queryable<WmMaterial>().Where(isDoorknobCheck.ToExpression()).Any();
+        }
     }
 }