From 882d1553c65a01f62dc07af74d8c412c5f616dae Mon Sep 17 00:00:00 2001 From: "xinming.chen" <942005050@qq.com> Date: Wed, 12 Jul 2023 16:22:40 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20'fe/Faster'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fe/Faster | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 fe/Faster diff --git a/fe/Faster b/fe/Faster new file mode 100644 index 000000000..e69de29bb From 88f69a8c41668edebfc3e2715bbe6c4c27ac81b4 Mon Sep 17 00:00:00 2001 From: "xinming.chen" <942005050@qq.com> Date: Wed, 12 Jul 2023 16:23:19 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=88=A0=E9=99=A4=20'fe/Faster'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fe/Faster | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 fe/Faster diff --git a/fe/Faster b/fe/Faster deleted file mode 100644 index e69de29bb..000000000 From 142329636e3a168bf70f246a7358bebd3c4af4c1 Mon Sep 17 00:00:00 2001 From: "boxu.zheng" Date: Wed, 12 Jul 2023 16:27:28 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=A4=A7=E5=B1=8F?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A4=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fe/Dash/.gitignore | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 fe/Dash/.gitignore diff --git a/fe/Dash/.gitignore b/fe/Dash/.gitignore new file mode 100644 index 000000000..8ec7dcc20 --- /dev/null +++ b/fe/Dash/.gitignore @@ -0,0 +1,6 @@ +################################################################################ +# 此 .gitignore 文件已由 Microsoft(R) Visual Studio 自动创建。 +################################################################################ + +#/SqlData/Faster.Zheng.Winin.mdf +#/SqlData/Faster.Zheng.Winin_log.ldf 这是个例子 不需要上传的就写这 From 2788250f581f42664c181bb90f66f74aad46b6c0 Mon Sep 17 00:00:00 2001 From: "boxu.zheng" Date: Wed, 12 Jul 2023 16:40:55 +0800 Subject: [PATCH 4/6] 1 --- fe/InterFace.Dash/.gitignore | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 fe/InterFace.Dash/.gitignore diff --git a/fe/InterFace.Dash/.gitignore b/fe/InterFace.Dash/.gitignore new file mode 100644 index 000000000..8ec7dcc20 --- /dev/null +++ b/fe/InterFace.Dash/.gitignore @@ -0,0 +1,6 @@ +################################################################################ +# 此 .gitignore 文件已由 Microsoft(R) Visual Studio 自动创建。 +################################################################################ + +#/SqlData/Faster.Zheng.Winin.mdf +#/SqlData/Faster.Zheng.Winin_log.ldf 这是个例子 不需要上传的就写这 From 50a837e9c85535453251295c44344a74ea4a9be5 Mon Sep 17 00:00:00 2001 From: "boxu.zheng" Date: Wed, 12 Jul 2023 16:41:24 +0800 Subject: [PATCH 5/6] 1 --- fe/Dash/.gitignore | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 fe/Dash/.gitignore diff --git a/fe/Dash/.gitignore b/fe/Dash/.gitignore deleted file mode 100644 index 8ec7dcc20..000000000 --- a/fe/Dash/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -################################################################################ -# 此 .gitignore 文件已由 Microsoft(R) Visual Studio 自动创建。 -################################################################################ - -#/SqlData/Faster.Zheng.Winin.mdf -#/SqlData/Faster.Zheng.Winin_log.ldf 这是个例子 不需要上传的就写这 From 9df9e4979ec9e80096a574892dcbc2db22675de6 Mon Sep 17 00:00:00 2001 From: "boxu.zheng" Date: Wed, 12 Jul 2023 18:08:10 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=95=E7=9B=98?= =?UTF-8?q?=E5=8F=B7=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Inputs/DeliverRequestImportInput.cs | 14 +++++++------- .../DeliverRequestAutoMapperProfile.cs | 2 +- .../DeliverRequests/DeliverRequestFisAppService.cs | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/DeliverRequests/Inputs/DeliverRequestImportInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/DeliverRequests/Inputs/DeliverRequestImportInput.cs index bbbe95fb0..977870195 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/DeliverRequests/Inputs/DeliverRequestImportInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/DeliverRequests/Inputs/DeliverRequestImportInput.cs @@ -83,14 +83,14 @@ public class DeliverRequestFisImportInput : SfsStoreImportInputBase /// /// 起始底盘号 /// - [Display(Name = "起始底盘号")] + [Display(Name = "订单号")] [Required] public string FromVinCode { get; set; } - /// - /// 截止底盘号 - /// - [Display(Name = "截止底盘号")] - [Required] - public string ToVinCode { get; set; } + ///// + ///// 截止底盘号 + ///// + //[Display(Name = "截止底盘号")] + //[Required] + //public string ToVinCode { get; set; } } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/DeliverRequests/DeliverRequestAutoMapperProfile.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/DeliverRequests/DeliverRequestAutoMapperProfile.cs index c5a182fd9..b88d2249a 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/DeliverRequests/DeliverRequestAutoMapperProfile.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/DeliverRequests/DeliverRequestAutoMapperProfile.cs @@ -94,7 +94,7 @@ public partial class StoreApplicationAutoMapperProfile : Profile .Ignore(x => x.ExtraProperties) .Ignore(x => x.Remark) .AfterMap((x, y) => y.SetProperty(nameof(x.FromVinCode), x.FromVinCode)) - .AfterMap((x, y) => y.SetProperty(nameof(x.ToVinCode), x.ToVinCode)) + //.AfterMap((x, y) => y.SetProperty(nameof(x.ToVinCode), x.ToVinCode)) ; } } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/DeliverRequests/DeliverRequestFisAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/DeliverRequests/DeliverRequestFisAppService.cs index cf2e633cf..9e25e6475 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/DeliverRequests/DeliverRequestFisAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/DeliverRequests/DeliverRequestFisAppService.cs @@ -391,7 +391,7 @@ public class DeliverRequestFisAppService : await Task.CompletedTask.ConfigureAwait(false); detail.SetProperty(nameof(input.FromVinCode), input.FromVinCode); - detail.SetProperty(nameof(input.ToVinCode), input.ToVinCode); + //detail.SetProperty(nameof(input.ToVinCode), input.ToVinCode); } private async Task SetEntityPropertiesAsync(DeliverRequest entity, DeliverRequestFisImportInput input)