diff --git a/ZR.Admin.WebApi/Controllers/mes/wms/WmBlankInventoryController.cs b/ZR.Admin.WebApi/Controllers/mes/wms/WmBlankInventoryController.cs
index b0e426f4..764390ea 100644
--- a/ZR.Admin.WebApi/Controllers/mes/wms/WmBlankInventoryController.cs
+++ b/ZR.Admin.WebApi/Controllers/mes/wms/WmBlankInventoryController.cs
@@ -136,6 +136,17 @@ namespace ZR.Admin.WebApi.Controllers
 
         }
 
+        /// <summary>
+        /// 查询毛坯库存零件数
+        /// </summary>
+        /// <param name="parm"></param>
+        /// <returns></returns>
+        [HttpGet("getPartNumber")]
+        public IActionResult GetPartNumber()
+        {
+            var response = _WmBlankInventoryService.GetPartNumber();
+            return SUCCESS(response);
+        }
 
 
     }
diff --git a/ZR.Admin.WebApi/Controllers/mes/wms/WmOneTimeInventoryController.cs b/ZR.Admin.WebApi/Controllers/mes/wms/WmOneTimeInventoryController.cs
index 00802339..5f91866f 100644
--- a/ZR.Admin.WebApi/Controllers/mes/wms/WmOneTimeInventoryController.cs
+++ b/ZR.Admin.WebApi/Controllers/mes/wms/WmOneTimeInventoryController.cs
@@ -163,5 +163,17 @@ namespace ZR.Admin.WebApi.Controllers
                 return ToResponse(new ApiResult(500, "盘点异常:" + e.Message, e.Message));
             }
         }
+
+        /// <summary>
+        /// 查询毛坯库存零件数
+        /// </summary>
+        /// <param name="parm"></param>
+        /// <returns></returns>
+        [HttpGet("getPartNumber")]
+        public IActionResult GetPartNumber()
+        {
+            var response = _WmOneTimeInventoryService.GetPartNumber();
+            return SUCCESS(response);
+        }
     }
 }
diff --git a/ZR.Admin.WebApi/Controllers/mes/wms/WmPolishInventoryController.cs b/ZR.Admin.WebApi/Controllers/mes/wms/WmPolishInventoryController.cs
index b6492818..7e2358fe 100644
--- a/ZR.Admin.WebApi/Controllers/mes/wms/WmPolishInventoryController.cs
+++ b/ZR.Admin.WebApi/Controllers/mes/wms/WmPolishInventoryController.cs
@@ -3,6 +3,7 @@ using ZR.Admin.WebApi.Extensions;
 using ZR.Admin.WebApi.Filters;
 using ZR.Model.MES.wms;
 using ZR.Model.MES.wms.Dto;
+using ZR.Service.mes.wms;
 using ZR.Service.mes.wms.IService;
 
 //创建时间：2024-07-25
@@ -184,5 +185,17 @@ namespace ZR.Admin.WebApi.Controllers
                 return ToResponse(new ApiResult(500, "盘点异常:" + e.Message, e.Message));
             }
         }
+
+        /// <summary>
+        /// 查询毛坯库存零件数
+        /// </summary>
+        /// <param name="parm"></param>
+        /// <returns></returns>
+        [HttpGet("getPartNumber")]
+        public IActionResult GetPartNumber()
+        {
+            var response = _WmPolishInventoryService.GetPartNumber();
+            return SUCCESS(response);
+        }
     }
 }
diff --git a/ZR.Model/MES/pro/DTO/ProWorkOrder.cs b/ZR.Model/MES/pro/DTO/ProWorkOrder.cs
index 39a5ffa8..ef52d67c 100644
--- a/ZR.Model/MES/pro/DTO/ProWorkOrder.cs
+++ b/ZR.Model/MES/pro/DTO/ProWorkOrder.cs
@@ -35,7 +35,7 @@
         /// <summary>
         /// 编码号
         /// </summary>
-        public int CodeNumber { get; set; }
+        public string CodeNumber { get; set; }
 
         /// <summary>
         /// 车数
diff --git a/ZR.Model/MES/pro/ProWorkorder_v2.cs b/ZR.Model/MES/pro/ProWorkorder_v2.cs
index bf157005..2e87e74b 100644
--- a/ZR.Model/MES/pro/ProWorkorder_v2.cs
+++ b/ZR.Model/MES/pro/ProWorkorder_v2.cs
@@ -55,7 +55,7 @@ namespace ZR.Model.MES.pro
         /// </summary>
         [SugarColumn(ColumnName = "code_number")]
         [ExcelColumn(Name = "编码号", IndexName = "F")]
-        public int CodeNumber { get; set; }
+        public string CodeNumber { get; set; }
 
         /// <summary>
         /// 车数
diff --git a/ZR.Service/mes/qc/CommonFQCService.cs b/ZR.Service/mes/qc/CommonFQCService.cs
index e0ca00db..203155c2 100644
--- a/ZR.Service/mes/qc/CommonFQCService.cs
+++ b/ZR.Service/mes/qc/CommonFQCService.cs
@@ -614,6 +614,14 @@ namespace ZR.Service.mes.qc
                     .Queryable<QcQualityStatisticsTotal>()
                     .Where(predicate1)
                     .Sum(it => it.BaofeiTotal) ?? 0;
+
+            // 除三优化
+            boardData.ProductRequireTotal = boardData.ProductRequireTotal / 3;
+            boardData.ProductQualifiedTotal = boardData.ProductQualifiedTotal / 3;
+            boardData.ProductQualifiedNotDoorknobTotal = boardData.ProductQualifiedNotDoorknobTotal / 3;
+            boardData.ProductPolishTotal = boardData.ProductPolishTotal / 3;
+            boardData.ProductSandingTotal = boardData.ProductSandingTotal / 3;
+            boardData.ProductDiscardTotal = boardData.ProductDiscardTotal / 3;
             return boardData;
         }
 
diff --git a/ZR.Service/mes/wms/IService/IWmBlankInventoryService.cs b/ZR.Service/mes/wms/IService/IWmBlankInventoryService.cs
index 233c3918..305f01e3 100644
--- a/ZR.Service/mes/wms/IService/IWmBlankInventoryService.cs
+++ b/ZR.Service/mes/wms/IService/IWmBlankInventoryService.cs
@@ -23,5 +23,11 @@ namespace ZR.Service.mes.wms.IService
         /// <param name="parm"></param>
         /// <returns></returns>
         int SynchronousMaterial(WmBlankInventory parm);
+
+        /// <summary>
+        /// 获取仓库零件数
+        /// </summary>
+        /// <returns></returns>
+        public int GetPartNumber();
     }
 }
diff --git a/ZR.Service/mes/wms/IService/IWmOneTimeInventoryService.cs b/ZR.Service/mes/wms/IService/IWmOneTimeInventoryService.cs
index a68096d7..ccb95e4a 100644
--- a/ZR.Service/mes/wms/IService/IWmOneTimeInventoryService.cs
+++ b/ZR.Service/mes/wms/IService/IWmOneTimeInventoryService.cs
@@ -38,5 +38,11 @@ namespace ZR.Service.mes.wms.IService
         /// <returns></returns>
         int DoWmOneTimeStocktaking(WmOneTimeInventory parm);
 
+        /// <summary>
+        /// 获取仓库零件数
+        /// </summary>
+        /// <returns></returns>
+        public int GetPartNumber();
+
     }
 }
diff --git a/ZR.Service/mes/wms/IService/IWmPolishInventoryService.cs b/ZR.Service/mes/wms/IService/IWmPolishInventoryService.cs
index b1372864..30fc0caf 100644
--- a/ZR.Service/mes/wms/IService/IWmPolishInventoryService.cs
+++ b/ZR.Service/mes/wms/IService/IWmPolishInventoryService.cs
@@ -43,5 +43,11 @@ namespace ZR.Service.mes.wms.IService
         /// <param name="parm"></param>
         /// <returns></returns>
         int DoWmPolishStocktaking(WmPolishInventory parm);
+
+        /// <summary>
+        /// 获取仓库零件数
+        /// </summary>
+        /// <returns></returns>
+        public int GetPartNumber();
     }
 }
diff --git a/ZR.Service/mes/wms/WmBlankInventoryService.cs b/ZR.Service/mes/wms/WmBlankInventoryService.cs
index e535f1a9..141811e5 100644
--- a/ZR.Service/mes/wms/WmBlankInventoryService.cs
+++ b/ZR.Service/mes/wms/WmBlankInventoryService.cs
@@ -242,5 +242,14 @@ namespace ZR.Service.mes.wms
 
             return Context.Insertable(wmBlank).ExecuteCommand();
         }
+
+        // 获取毛坯仓库零件数量
+        public int GetPartNumber()
+        {
+            return Context
+                    .Queryable<WmBlankInventory>()
+                    .Where(it => it.Status == 1)
+                    .Sum(it => it.Quantity) ?? 0;
+        }
     }
 }
diff --git a/ZR.Service/mes/wms/WmOneTimeInventoryService.cs b/ZR.Service/mes/wms/WmOneTimeInventoryService.cs
index aa31d7cd..9d83961b 100644
--- a/ZR.Service/mes/wms/WmOneTimeInventoryService.cs
+++ b/ZR.Service/mes/wms/WmOneTimeInventoryService.cs
@@ -397,5 +397,14 @@ namespace ZR.Service.mes.wms
                 throw new Exception(e.Message);
             }
         }
+
+        // 获取仓库零件数量
+        public int GetPartNumber()
+        {
+            return Context
+                    .Queryable<WmOneTimeInventory>()
+                    .Where(it => it.Status == 1)
+                    .Sum(it => it.Quantity) ?? 0;
+        }
     }
 }
diff --git a/ZR.Service/mes/wms/WmPolishInventoryService.cs b/ZR.Service/mes/wms/WmPolishInventoryService.cs
index 911feae4..06b50d58 100644
--- a/ZR.Service/mes/wms/WmPolishInventoryService.cs
+++ b/ZR.Service/mes/wms/WmPolishInventoryService.cs
@@ -463,5 +463,14 @@ namespace ZR.Service.mes.wms
                 throw new Exception(e.Message);
             }
         }
+
+        // 获取仓库零件数量
+        public int GetPartNumber()
+        {
+            return Context
+                    .Queryable<WmPolishInventory>()
+                    .Where(it => it.Status == 1)
+                    .Sum(it => it.Quantity) ?? 0;
+        }
     }
 }