From 196b9b48e5a0af98f20f8cb932015da865e23f27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E6=AD=A3=E6=98=93?= <zhaozhengyi1b@126.com>
Date: Fri, 14 Nov 2025 17:31:27 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B41?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../key-c75f1c71-3372-4542-8617-d458b0dfc5ad.xml | 16 ++++++++++++++++
 ZR.Model/MES/qc/DTO/gp12/QcGp12BaseSiteDto.cs    |  2 +-
 .../mes/wms/WmGoodsOutProductionService.cs       |  6 ++++++
 3 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 ZR.Admin.WebApi/DataProtection/key-c75f1c71-3372-4542-8617-d458b0dfc5ad.xml

diff --git a/ZR.Admin.WebApi/DataProtection/key-c75f1c71-3372-4542-8617-d458b0dfc5ad.xml b/ZR.Admin.WebApi/DataProtection/key-c75f1c71-3372-4542-8617-d458b0dfc5ad.xml
new file mode 100644
index 00000000..f94bb4dd
--- /dev/null
+++ b/ZR.Admin.WebApi/DataProtection/key-c75f1c71-3372-4542-8617-d458b0dfc5ad.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<key id="c75f1c71-3372-4542-8617-d458b0dfc5ad" version="1">
+  <creationDate>2025-11-13T08:43:58.8664356Z</creationDate>
+  <activationDate>2025-11-13T08:43:58.5846858Z</activationDate>
+  <expirationDate>2026-02-11T08:43:58.5846858Z</expirationDate>
+  <descriptor deserializerType="Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption.ConfigurationModel.AuthenticatedEncryptorDescriptorDeserializer, Microsoft.AspNetCore.DataProtection, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60">
+    <descriptor>
+      <encryption algorithm="AES_256_CBC" />
+      <validation algorithm="HMACSHA256" />
+      <masterKey p4:requiresEncryption="true" xmlns:p4="http://schemas.asp.net/2015/03/dataProtection">
+        <!-- Warning: the key below is in an unencrypted form. -->
+        <value>lc/uGj4VL3psLNDtLp3yu3M7TaB3C33sihHCQt2am7RBXVNp3VbRsJ2c6WVkPIRwpnXEHfrCTO5NaZbGcLOuqw==</value>
+      </masterKey>
+    </descriptor>
+  </descriptor>
+</key>
\ No newline at end of file
diff --git a/ZR.Model/MES/qc/DTO/gp12/QcGp12BaseSiteDto.cs b/ZR.Model/MES/qc/DTO/gp12/QcGp12BaseSiteDto.cs
index f29f88d7..779ceb44 100644
--- a/ZR.Model/MES/qc/DTO/gp12/QcGp12BaseSiteDto.cs
+++ b/ZR.Model/MES/qc/DTO/gp12/QcGp12BaseSiteDto.cs
@@ -14,7 +14,7 @@ namespace ZR.Model.Dto
     /// </summary>
     public class QcGp12BaseSiteDto
     {
-        [Required(ErrorMessage = "序号不能为空")]
+        //[Required(ErrorMessage = "序号不能为空")]
         public int Id { get; set; }
 
         public string Name { get; set; }
diff --git a/ZR.Service/mes/wms/WmGoodsOutProductionService.cs b/ZR.Service/mes/wms/WmGoodsOutProductionService.cs
index 9f4a2a26..981be714 100644
--- a/ZR.Service/mes/wms/WmGoodsOutProductionService.cs
+++ b/ZR.Service/mes/wms/WmGoodsOutProductionService.cs
@@ -118,6 +118,12 @@ namespace ZR.Service.mes.wms
             {
                 model.Id = SnowFlakeSingle.Instance.NextId().ToString(); //也可以在程序中直接获取ID
             }
+            // 检查计划中是否有此零件号
+/*            bool hasMaterial = Context
+    .Queryable<WmMaterialOutorder>()
+    .Where(it => it.FkOutorderId == model.FkOutOrderId)
+    .Where(it => it.FkMaterialId == )
+    .Any();*/
 
             //2. 根据成品仓库id修改记录
             WmGoodsNowProduction updateModel = new WmGoodsNowProduction();