From 37a2ba4582ca3d450902fe5b3833b2b07925ee7c Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Mon, 13 Nov 2023 09:54:22 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E7=AE=B1=E6=94=B9=E7=AE=B1=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E8=AE=A2=E5=8D=95=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 | Bin 228751 -> 228751 bytes src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml | 5 ++++ src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml | 10 ++++++++ src/WMS.Web.Domain/Entitys/ChangeBoxRecord.cs | 22 ++++++++++++++++++ src/WMS.Web.Domain/Entitys/MoveBoxRecord.cs | 22 ++++++++++++++++++ .../ChangeBoxRecordRepositories.cs | 18 ++++++++++---- .../MoveBoxRecordRepositories.cs | 10 ++++---- 7 files changed, 77 insertions(+), 10 deletions(-) diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 index 94e1a988fefe0a18393884918e723ab62f5b2dc6..0d472f8861c72d4e8fb2f41c191bb6f7894fe28a 100644 GIT binary patch delta 7683 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 delta 7941 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 + + + 单据编号 + + 所属箱号ID diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml index 2a468b9f..5a899556 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml @@ -284,6 +284,11 @@ + + + 生成单据号 + + erp同步时间管理 记录最新一次重金蝶和ops拉取数据时间 @@ -734,6 +739,11 @@ + + + 生成单据号 + + wms出库单 diff --git a/src/WMS.Web.Domain/Entitys/ChangeBoxRecord.cs b/src/WMS.Web.Domain/Entitys/ChangeBoxRecord.cs index e0f6d70d..d8c97553 100644 --- a/src/WMS.Web.Domain/Entitys/ChangeBoxRecord.cs +++ b/src/WMS.Web.Domain/Entitys/ChangeBoxRecord.cs @@ -76,5 +76,27 @@ namespace WMS.Web.Domain.Entitys this.CreatorId = creatorId; this.CreateTime = DateTime.Now; } + /// + /// 生成单据号 + /// + public void GenerateNo() + { + //用户手动输入了 就不自动生成了 + if (!string.IsNullOrEmpty(this.BillNo)) return; + + if (this.Id.ToString().Length >= 8) + { + this.BillNo = "GX" + this.Id.ToString(); + return; + } + + string idStr = this.Id.ToString(); + while (true) + { + idStr = "0" + idStr; + if (idStr.Length >= 8) break; + } + this.BillNo = "GX" + idStr; + } } } diff --git a/src/WMS.Web.Domain/Entitys/MoveBoxRecord.cs b/src/WMS.Web.Domain/Entitys/MoveBoxRecord.cs index d1f7d138..10454ccf 100644 --- a/src/WMS.Web.Domain/Entitys/MoveBoxRecord.cs +++ b/src/WMS.Web.Domain/Entitys/MoveBoxRecord.cs @@ -70,5 +70,27 @@ namespace WMS.Web.Domain.Entitys this.CreatorId = creatorId; this.CreateTime = DateTime.Now; } + /// + /// 生成单据号 + /// + public void GenerateNo() + { + //用户手动输入了 就不自动生成了 + if (!string.IsNullOrEmpty(this.BillNo)) return; + + if (this.Id.ToString().Length >= 8) + { + this.BillNo = "YX" + this.Id.ToString(); + return; + } + + string idStr = this.Id.ToString(); + while (true) + { + idStr = "0" + idStr; + if (idStr.Length >= 8) break; + } + this.BillNo = "YX" + idStr; + } } } diff --git a/src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs b/src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs index 762b6ef2..8b45a925 100644 --- a/src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs +++ b/src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs @@ -58,11 +58,11 @@ namespace WMS.Web.Repositories await _context.ChangeBoxRecord.AddAsync(entity); await _context.SaveChangesAsync(); - //if (string.IsNullOrEmpty(entity.OutSourcFeedNo)) - //{ - // entity.GenerateNo(); - // await _context.SaveChangesAsync(); - //} + if (string.IsNullOrEmpty(entity.BillNo)) + { + entity.GenerateNo(); + await _context.SaveChangesAsync(); + } if (_transaction != null) _transaction.Commit(); @@ -92,6 +92,14 @@ namespace WMS.Web.Repositories _context.ChangeBoxRecord.AddRange(list); await _context.SaveChangesAsync(); + foreach (var item in list) + { + if (string.IsNullOrEmpty(item.BillNo)) + //自动生成单据编号 + item.GenerateNo(); + } + await _context.SaveChangesAsync(); + if (_transaction != null) _transaction.Commit(); return true; diff --git a/src/WMS.Web.Repositories/MoveBoxRecordRepositories.cs b/src/WMS.Web.Repositories/MoveBoxRecordRepositories.cs index 3cc2a3de..e6792154 100644 --- a/src/WMS.Web.Repositories/MoveBoxRecordRepositories.cs +++ b/src/WMS.Web.Repositories/MoveBoxRecordRepositories.cs @@ -53,11 +53,11 @@ namespace WMS.Web.Repositories await _context.MoveBoxRecord.AddAsync(entity); await _context.SaveChangesAsync(); - //if (string.IsNullOrEmpty(entity.OutSourcFeedNo)) - //{ - // entity.GenerateNo(); - // await _context.SaveChangesAsync(); - //} + if (string.IsNullOrEmpty(entity.BillNo)) + { + entity.GenerateNo(); + await _context.SaveChangesAsync(); + } if (_transaction != null) _transaction.Commit();