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 @@ + + + 2025-11-13T08:43:58.8664356Z + 2025-11-13T08:43:58.5846858Z + 2026-02-11T08:43:58.5846858Z + + + + + + + lc/uGj4VL3psLNDtLp3yu3M7TaB3C33sihHCQt2am7RBXVNp3VbRsJ2c6WVkPIRwpnXEHfrCTO5NaZbGcLOuqw== + + + + \ 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 /// 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() + .Where(it => it.FkOutorderId == model.FkOutOrderId) + .Where(it => it.FkMaterialId == ) + .Any();*/ //2. 根据成品仓库id修改记录 WmGoodsNowProduction updateModel = new WmGoodsNowProduction();