ZZY/shanghaigangxiangtuzhuangMES
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整1

Browse Source
This commit is contained in:
赵正易
2025-11-14 17:31:27 +08:00
parent fc7ab6e3fb
commit 196b9b48e5
3 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ZR.Admin.WebApi/DataProtection/key-c75f1c71-3372-4542-8617-d458b0dfc5ad.xml Normal file
View File

@@ -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>

2
ZR.Model/MES/qc/DTO/gp12/QcGp12BaseSiteDto.cs
View File

@@ -14,7 +14,7 @@ namespace ZR.Model.Dto
/// </summary> /// </summary>
public class QcGp12BaseSiteDto public class QcGp12BaseSiteDto
{ {
[Required(ErrorMessage = "序号不能为空")] //[Required(ErrorMessage = "序号不能为空")]
public int Id { get; set; } public int Id { get; set; }
public string Name { get; set; } public string Name { get; set; }

6
ZR.Service/mes/wms/WmGoodsOutProductionService.cs
View File

@@ -118,6 +118,12 @@ namespace ZR.Service.mes.wms
{ {
model.Id = SnowFlakeSingle.Instance.NextId().ToString(); //也可以在程序中直接获取ID 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修改记录 //2. 根据成品仓库id修改记录
WmGoodsNowProduction updateModel = new WmGoodsNowProduction(); WmGoodsNowProduction updateModel = new WmGoodsNowProduction();