仓库模块_出库货物记录:init

ZR.Service/mes/qc/FirstFQCService.cs

@@ -1398,12 +1398,12 @@ namespace ZR.Service.mes.qc
                 QcQualityStatisticsFirst first = new QcQualityStatisticsFirst();
                 first.Id = SnowFlakeSingle.Instance.NextId().ToString();
                 first.WorkorderId = workorderID;
-                ProWorkorder_v2 workorder= Context.Queryable<ProWorkorder_v2>().Where(it => it.Id == first.WorkorderId).First();
-                first.Color = workorder?.Colour;
+               
 
                 ProWorkorder_v2 workorder_item = Context.Queryable<ProWorkorder_v2>().Where(it => it.ClientWorkorder == workorderID).First();
                 if (workorder_item != null)
                 {
+                    first.Color = workorder_item?.Colour;
                     first.FinishedPartNumber = workorder_item.FinishedPartNumber;
                     first.ProductDescription = workorder_item.ProductDescription;
                     first.RequireNumber = workorder_item.PreviousNumber;
@@ -1615,13 +1615,12 @@ namespace ZR.Service.mes.qc
                 QcQualityStatisticsFirst first2 = new QcQualityStatisticsFirst();
                 first2.Id = SnowFlakeSingle.Instance.NextId().ToString();
                 first2.WorkorderId = workorderID;
-                ProWorkorder_v2 workorder2 = Context.Queryable<ProWorkorder_v2>().Where(it => it.Id == first.WorkorderId).First();
-                first2.Color = workorder2?.Colour;
+              
 
                 ProWorkorder_v2 workorder_item2 = Context.Queryable<ProWorkorder_v2>().Where(it => it.ClientWorkorder == workorderID).First();
                 if (workorder_item2 != null)
                 {
-
+                    first2.Color = workorder_item2?.Colour;
                     first2.FinishedPartNumber = workorder_item2.FinishedPartNumber;
                     first2.ProductDescription = workorder_item2.ProductDescription;
                     first2.RequireNumber = workorder_item2.PreviousNumber;
@@ -1839,12 +1838,13 @@ namespace ZR.Service.mes.qc
                 first3.WorkorderId = workorderID;
 
                 ProWorkorder_v2 workorder3 = Context.Queryable<ProWorkorder_v2>().Where(it => it.Id == first.WorkorderId).First();
-                first3.Color = workorder3?.Colour;
+       
 
 
                 ProWorkorder_v2 workorder_item3 = Context.Queryable<ProWorkorder_v2>().Where(it => it.ClientWorkorder == workorderID).First();
                 if (workorder_item3 != null)
                 {
+                    first3.Color = workorder_item3?.Colour;
                     first3.FinishedPartNumber = workorder_item3.FinishedPartNumber;
                     first3.ProductDescription = workorder_item3.ProductDescription;
                     first3.RequireNumber = workorder_item3.PreviousNumber;

ZR.Service/mes/qc/IService/IQCStatisticsService.cs

@@ -22,5 +22,7 @@ namespace ZR.Service.mes.qc.IService
         //获取 总检
         (List<QcQualityStatisticsTotal>,int) GetQualityStatisticsTable_total(DateTime starttime, DateTime endTime, string workorderid, string partnumber, string product_description, string team, int pageNum, int pageSize);
         #endregion
+
+        public int DeleteStatisticsTable(string workorderid);
     }
 }

ZR.Service/mes/qc/QCStatisticsService.cs

@@ -13,9 +13,19 @@ using ZR.Service.mes.qc.IService;
 
 namespace ZR.Service.mes.qc
 {
+    /// <summary>
+    /// 查询报表
+    /// </summary>
     [AppService(ServiceType = typeof(IQCStatisticsService), ServiceLifetime = LifeTime.Transient)]
     public class QCStatisticsService : BaseService<QcQualityStatisticsFirst>, IQCStatisticsService
     {
+
+
+
+
+
+
+
         /// <summary>
         /// 获取质量统计表 首检
         /// </summary>
@@ -153,5 +163,30 @@ namespace ZR.Service.mes.qc
 
             return (data, totalNum);
         }
+
+        /// <summary>
+        /// 删除首检，二检，三检报表
+        /// </summary>
+        /// <param name="workorderid"></param>
+        /// <returns></returns>
+        public int DeleteStatisticsTable(string workorderid)
+        {
+            int num = 0;
+            num = num + Context.Deleteable<QcQualityStatisticsFirst>()
+                .Where(it => it.WorkorderId == workorderid).ExecuteCommand();
+
+
+            num = num + Context.Deleteable<QcQualityStatisticsAgain>().Where(it => it.WorkorderId == workorderid).ExecuteCommand();
+
+
+            num = num + Context.Deleteable<QcQualityStatisticsFinal>().Where(it => it.WorkorderId == workorderid).ExecuteCommand();
+
+
+            num = num + Context.Deleteable<QcQualityStatisticsTotal>().Where(it => it.WorkorderId == workorderid).ExecuteCommand();
+
+
+            return num;
+
+        }
     }
 }

ZR.Service/mes/qc/QcinspectionItemService.cs

@@ -32,8 +32,6 @@ namespace ZR.Service.mes.qc
                               .AndIF(!string.IsNullOrEmpty(inspectionType), it => it.InspectionType == inspectionType)
                               .ToExpression();
 
-
-
             return Queryable().Where(predicate).OrderBy(x => x.Order).ToList();
         }
     }