From 4c6d88d779d73458ee4aac39e3cd34e3c173e8c0 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, 24 Mar 2025 14:51:46 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90=E4=B8=80?=
 =?UTF-8?q?=E6=AC=A1=E5=90=88=E6=A0=BC=E8=AE=B0=E5=BD=95TODO=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ZR.Model/MES/wms/Dto/WmOneTimeRecordDto.cs    | 14 +++++++++++
 .../wms/IService/IWmOneTimeRecordService.cs   |  1 +
 ZR.Service/mes/wms/WmOneTimeRecordService.cs  | 23 +++++++++++++++++++
 ZR.Service/mes/wms/WmPolishRecordService.cs   |  2 ++
 4 files changed, 40 insertions(+)

diff --git a/ZR.Model/MES/wms/Dto/WmOneTimeRecordDto.cs b/ZR.Model/MES/wms/Dto/WmOneTimeRecordDto.cs
index 852ffdac..0016e20d 100644
--- a/ZR.Model/MES/wms/Dto/WmOneTimeRecordDto.cs
+++ b/ZR.Model/MES/wms/Dto/WmOneTimeRecordDto.cs
@@ -48,4 +48,18 @@ namespace ZR.Model.MES.wms.Dto
 
         public DateTime? UpdatedTime { get; set; }
     }
+    /// <summary>
+    /// 工艺路线-一次合格 库存变动表输入输出对象
+    /// </summary>
+    public class WmOneTimeRecordGenerateDto
+    {
+        // 指令参数 0- 全部生成 1-部分生成 2...
+        public int? ActionType { get; set; }
+
+        public string Partnumber { get; set; }
+
+        public DateTime? StartTime { get; set; }
+
+        public DateTime? EndTime { get; set; }
+    }
 }
diff --git a/ZR.Service/mes/wms/IService/IWmOneTimeRecordService.cs b/ZR.Service/mes/wms/IService/IWmOneTimeRecordService.cs
index 0ed9a8d8..2f5cf8af 100644
--- a/ZR.Service/mes/wms/IService/IWmOneTimeRecordService.cs
+++ b/ZR.Service/mes/wms/IService/IWmOneTimeRecordService.cs
@@ -17,5 +17,6 @@ namespace ZR.Service.mes.wms.IService
 
         int UpdateWmOneTimeRecord(WmOneTimeRecord parm);
 
+        int GenerateWmOneTimeRecord(WmOneTimeRecordGenerateDto parm);
     }
 }
diff --git a/ZR.Service/mes/wms/WmOneTimeRecordService.cs b/ZR.Service/mes/wms/WmOneTimeRecordService.cs
index 6ee9566d..ef2e9282 100644
--- a/ZR.Service/mes/wms/WmOneTimeRecordService.cs
+++ b/ZR.Service/mes/wms/WmOneTimeRecordService.cs
@@ -105,5 +105,28 @@ namespace ZR.Service.mes.wms
             //return response;
             return Update(model, true);
         }
+
+
+        /// <summary>
+        /// 自动生成一次合格仓库记录日志
+        /// </summary>
+        /// <param name="parm"></param>
+        /// <returns></returns>
+        /// <exception cref="global::System.NotImplementedException"></exception>
+        public int GenerateWmOneTimeRecord(WmOneTimeRecordGenerateDto parm)
+        {
+            //TODO 入库条件1 产线合格品qc_quality_statistics_first，合格数，其中去除（倒车雷达）
+
+            //TODO 入库条件2 抛光合格品 wm_polish_work_quality_statistics 合格数
+
+            //TODO 出库条件1 GP12 （新） 触摸屏  qc_gp12_service_statistics 投入数
+
+            //TODO 出库条件2 后道 wm_polish_quality_statistics 投入数
+
+            // wm_one_time_record
+
+
+            throw new global::System.NotImplementedException();
+        }
     }
 }
diff --git a/ZR.Service/mes/wms/WmPolishRecordService.cs b/ZR.Service/mes/wms/WmPolishRecordService.cs
index 672102bc..f9ada6ec 100644
--- a/ZR.Service/mes/wms/WmPolishRecordService.cs
+++ b/ZR.Service/mes/wms/WmPolishRecordService.cs
@@ -121,12 +121,14 @@ namespace ZR.Service.mes.wms
                 #region 查询需要的数据
                 //三入
                 // 产线报表 根据日期范围 去取产线抛光的数据  qc_quality_statistics_first
+                // 去除倒车雷达
                 List<QcQualityStatisticsFirst> qcQualityStatisticsFirsts = Context
                     .Queryable<QcQualityStatisticsFirst>()
                     .WhereIF(
                         !string.IsNullOrEmpty(parm.Partnumber),
                         it => it.FinishedPartNumber == parm.Partnumber
                     )
+                    .Where(it => !it.ProductDescription.Contains("倒车雷达"))
                     .Where(it => it.StartTime >= parm.StartTime)
                     .Where(it => it.PaoguangTotal > 0)
                     .ToList();