一次合格品仓库，抛光仓库，GP12质检报告，抛光操作，后道检验相关功能完善

ZR.Service/mes/wms/WmPolishWorkQualityStatisticsService.cs

@@ -50,7 +50,7 @@ namespace ZR.Service.mes.wms
                 )
                 .AndIF(
                     parm.EndTime != null,
-                    it => it.StartTime <= parm.StartTime.Value.ToLocalTime()
+                    it => it.StartTime <= parm.EndTime.Value.ToLocalTime()
                 );
 
             var response = Queryable()
@@ -122,6 +122,14 @@ namespace ZR.Service.mes.wms
                         (decimal)model.QualifiedNumber / model.RequireNumber * 100 ?? 0.0m;
                 }
                 model.QualifiedRate = qualifiedRate;
+                WmPolishWorkQualityStatistics res0 = Context
+                    .Insertable(model)
+                    .ExecuteReturnEntity();
+                if (res0 == null)
+                {
+                    Context.Ado.RollbackTran();
+                    throw new Exception("插入抛光操作记录失败");
+                }
                 WmPolishInventoryService inventoryService = new();
                 //合格品重新进入抛光仓库
                 if (model.QualifiedNumber > 0)
@@ -133,12 +141,15 @@ namespace ZR.Service.mes.wms
                             Type = model.IsReturnWorkpiece ? 2 : 1,
                             Quantity = model.QualifiedNumber,
                             CreatedBy = model.CreatedBy,
-                            ActionTime = DateTime.Now,
+                            ActionTime = DateTime.Now.ToLocalTime(),
                             Remark =
-                                "抛光操作记录入库:合格数"
+                                "抛光操作记录入库,合格数:"
                                 + model.QualifiedNumber
-                                + "。记录时间"
+                                + "。记录时间:"
                                 + model.CreatedTime.Value.ToLocalTime().ToString()
+                                + "[来源记录识别编号:"
+                                + res0.Id
+                                + "]"
                         };
                     int res1 = inventoryService.DoWmPolishWarehousing(wmPolishInventory);
                     if (res1 == 0)
@@ -157,7 +168,7 @@ namespace ZR.Service.mes.wms
                             Type = model.IsReturnWorkpiece ? 2 : 1,
                             Quantity = (model.BaofeiTotal + model.DamoTotal),
                             CreatedBy = model.CreatedBy,
-                            ActionTime = DateTime.Now,
+                            ActionTime = DateTime.Now.ToLocalTime(),
                             Remark =
                                 "抛光操作记录出库:打磨数"
                                 + model.DamoTotal
@@ -165,25 +176,19 @@ namespace ZR.Service.mes.wms
                                 + model.BaofeiTotal
                                 + "。记录时间"
                                 + model.CreatedTime.Value.ToLocalTime().ToString()
+                                + "[来源记录识别编号:"
+                                + res0.Id
+                                + "]"
                         };
-                    int res1 = inventoryService.DoWmPolishRetrieval(wmPolishInventory);
-                    if (res1 == 0)
+                    int res2 = inventoryService.DoWmPolishRetrieval(wmPolishInventory);
+                    if (res2 == 0)
                     {
                         Context.Ado.RollbackTran();
                         throw new Exception("抛光操作记录出库失败");
                     }
                 }
-
-                WmPolishWorkQualityStatistics res3 = Context
-                    .Insertable(model)
-                    .ExecuteReturnEntity();
-                if (res3 == null)
-                {
-                    Context.Ado.RollbackTran();
-                    throw new Exception("插入抛光操作记录失败");
-                }
                 Context.Ado.CommitTran();
-                return res3;
+                return res0;
             }
             catch (Exception e)
             {