Merge branch 'main' of https://gitee.com/doan-tech/shanghaigangxiangtuzhuangMES

ZR.Service/mes/qc/CommonFQCService.cs

@@ -3,6 +3,7 @@ using SqlSugar;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
+using System.Linq;
 using System.Reflection;
 using ZR.Model;
 using ZR.Model.MES.pro;
@@ -222,8 +223,10 @@ namespace ZR.Service.mes.qc
         {
             try
             {
+                string[] Machines = new string[] {"0","1","2","3" };
                 return Context.Queryable<WmPackingrecord>()
                         .Where(it => it.WorkOrderNum == workOrderId)
+                        .Where(it => Machines.Contains(it.Machine))
                         .OrderBy(it => it.Id)
                         .Count();
             }