修改 采购收货 赋值

be/Hosts/Wms.Host/Win_in.Sfs.Wms.Store.HttpApi.Host/scripts/db.Microsoft.EntityFrameworkCore.SqlServer.StoreDbContext.sql

@@ -293,6 +293,7 @@ CREATE TABLE [Job_PurchaseReceiptJob] (
     [PoNumber] nvarchar(64) NULL,
     [SupplierCode] nvarchar(64) NOT NULL,
     [SupplierName] nvarchar(64) NULL,
+    [SupplierAdress] nvarchar(max) NULL,
     [Type] nvarchar(64) NOT NULL,
     [TimeWindow] nvarchar(64) NULL,
     [PlanArriveDate] datetime2 NOT NULL,
@@ -1349,6 +1350,8 @@ CREATE TABLE [Store_ProductRecycleRequest] (
 CREATE TABLE [Store_PurchaseOrder] (
     [Id] uniqueidentifier NOT NULL,
     [SupplierCode] nvarchar(64) NULL,
+    [SupplierName] nvarchar(max) NULL,
+    [SupplierAdress] nvarchar(max) NULL,
     [PoType] nvarchar(64) NULL,
     [OrderStatus] nvarchar(64) NOT NULL,
     [IsConsignment] bit NOT NULL DEFAULT CAST(0 AS bit),
@@ -1381,6 +1384,8 @@ CREATE TABLE [Store_PurchaseReceiptNote] (
     [RpNumber] nvarchar(64) NULL,
     [PoNumber] nvarchar(64) NULL,
     [SupplierCode] nvarchar(64) NOT NULL,
+    [SupplierName] nvarchar(max) NULL,
+    [SupplierAdress] nvarchar(max) NULL,
     [ReceiveTime] datetime2 NOT NULL,
     [JobNumber] nvarchar(64) NULL,
     [Type] nvarchar(64) NOT NULL,
@@ -1407,6 +1412,7 @@ CREATE TABLE [Store_PurchaseReceiptRequest] (
     [PoNumber] nvarchar(64) NULL,
     [SupplierCode] nvarchar(64) NOT NULL,
     [SupplierName] nvarchar(64) NULL,
+    [SupplierAdress] nvarchar(max) NULL,
     [TruckNumber] nvarchar(64) NULL,
     [DockCode] nvarchar(64) NOT NULL,
     [TimeWindow] nvarchar(64) NOT NULL,
@@ -1661,6 +1667,8 @@ CREATE TABLE [Store_SupplierAsn] (
     [RpNumber] nvarchar(64) NOT NULL,
     [PoNumber] nvarchar(64) NULL,
     [SupplierCode] nvarchar(64) NOT NULL,
+    [SupplierName] nvarchar(max) NULL,
+    [SupplierAdress] nvarchar(max) NULL,
     [Status] nvarchar(64) NOT NULL,
     [ContactName] nvarchar(64) NULL,
     [ContactPhone] nvarchar(64) NULL,

be/Modules/Message/src/Win_in.Sfs.Message.Application/MessageApplicationAutoMapperProfile.cs

@@ -9,5 +9,8 @@ public class MessageApplicationAutoMapperProfile : Profile
         /* You can configure your AutoMapper mapping configuration here.
          * Alternatively, you can split your mapping configurations
          * into multiple profile classes for a better organization. */
+
+        new MessageTypeAutoMapperProfile().MessageTypeAutoMapperProfileConfig();
+
     }
 }

be/Modules/Message/src/Win_in.Sfs.Message.Application/MessageTypes/MessageTypeAutoMapperProfile.cs

@@ -7,7 +7,7 @@ namespace Win_in.Sfs.Message.Application;
 
 public class MessageTypeAutoMapperProfile : Profile
 {
-    public MessageTypeAutoMapperProfile()
+    public void MessageTypeAutoMapperProfileConfig()
     {
         CreateMap<MessageType, MessageTypeDto>()
           .IgnoreAuditedObjectProperties()

be/Modules/Message/src/Win_in.Sfs.Message.Application/NotifyMessages/NotifyMessageAutoMapperProfile.cs

@@ -22,5 +22,8 @@ public class NotifyMessageAutoMapperProfile : Profile
             .Ignore(x => x.CreationTime)
             .Ignore(x => x.CreatorId)
             .ReverseMap();
+
+        CreateMap<NotifyMessageEditInput, NotifyMessage>()
+            ;
     }
 }

be/Modules/Shared/src/Win_in.Sfs.Shared.Application/Extensions/ObjectMapperExtensions.cs

@@ -47,7 +47,7 @@ public static class ObjectMapperExtensions
                 var fromList = list;
                 foreach (var item in fromList)
                 {
-                    toList.Add(Activator.CreateInstance(elementType).FromObject(item));
+                    toList.Add(Activator.CreateInstance(elementType).InjectFrom<DeepInjection>(item));
                 }
                 return (T)toList;
             }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/PurchaseReceiptJobs/DTOs/PurchaseReceiptJobDTO.cs

@@ -1,4 +1,5 @@
 using System;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using Win_in.Sfs.Shared.Domain;
 using Win_in.Sfs.Shared.Domain.Shared;
@@ -53,6 +54,18 @@ public class PurchaseReceiptJobDTO : SfsJobDTOBase<PurchaseReceiptJobDetailDTO>
     [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
     public string SupplierCode { get; set; }
 
+    /// <summary>
+    /// 供应商名称
+    /// </summary>
+    [DisplayName("供应商名称")]
+    public string SupplierName { get; set; }
+
+    /// <summary>
+    /// 供应商地址
+    /// </summary>
+    [DisplayName("供应商地址")]
+    public string SupplierAdress { get; set; }
+
     /// <summary>
     /// 时间窗口
     /// </summary>
@@ -65,11 +78,4 @@ public class PurchaseReceiptJobDTO : SfsJobDTOBase<PurchaseReceiptJobDetailDTO>
     /// </summary>
     [Display(Name = "计划到货时间")]
     public DateTime PlanArriveDate { get; set; }
-
-    /// <summary>
-    /// 供应商名称
-    /// </summary>
-    [Display(Name = "供应商名称")]
-    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
-    public string SupplierName { get; set; }
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/PurchaseReceiptJobs/Inputs/PurchaseReceiptJobEditInput.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using Win_in.Sfs.Shared.Domain;
 using Win_in.Sfs.Shared.Domain.Shared;
@@ -77,10 +78,15 @@ public class PurchaseReceiptJobEditInput : SfsJobCreateUpdateInputBase, ISfsJobC
     /// <summary>
     /// 供应商名称
     /// </summary>
-    [Display(Name = "供应商名称")]
+    [DisplayName("供应商名称")]
-    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
     public string SupplierName { get; set; }
 
+    /// <summary>
+    /// 供应商地址
+    /// </summary>
+    [DisplayName("供应商地址")]
+    public string SupplierAdress { get; set; }
+
     /// <summary>
     /// 类型
     /// </summary>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/PurchaseReceiptNotes/DTOs/PurchaseReceiptNoteDTO.cs

@@ -1,4 +1,5 @@
 using System;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using Win_in.Sfs.Shared.Domain;
 using Win_in.Sfs.Shared.Domain.Shared;
@@ -43,6 +44,18 @@ public class PurchaseReceiptNoteDTO : SfsStoreDTOBase<PurchaseReceiptNoteDetailD
     [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
     public string SupplierCode { get; set; }
 
+    /// <summary>
+    /// 供应商名称
+    /// </summary>
+    [DisplayName("供应商名称")]
+    public string SupplierName { get; set; }
+
+    /// <summary>
+    /// 供应商地址
+    /// </summary>
+    [DisplayName("供应商地址")]
+    public string SupplierAdress { get; set; }
+
     /// <summary>
     /// 收货时间
     /// </summary>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/PurchaseReceiptNotes/Inputs/PurchaseReceiptNoteEditInput.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using Win_in.Sfs.Shared.Domain;
 using Win_in.Sfs.Shared.Domain.Shared;
@@ -67,6 +68,18 @@ public class PurchaseReceiptNoteEditInput : SfsStoreCreateOrUpdateInputBase
     [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
     public string SupplierCode { get; set; }
 
+    /// <summary>
+    /// 供应商名称
+    /// </summary>
+    [DisplayName("供应商名称")]
+    public string SupplierName { get; set; }
+
+    /// <summary>
+    /// 供应商地址
+    /// </summary>
+    [DisplayName("供应商地址")]
+    public string SupplierAdress { get; set; }
+
     /// <summary>
     /// 明细列表
     /// </summary>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Orders/PurchaseOrders/DTOs/PurchaseOrderDTO.cs

@@ -1,4 +1,5 @@
 using System;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using Win_in.Sfs.Shared.Domain;
 using Win_in.Sfs.Shared.Domain.Shared;
@@ -16,6 +17,18 @@ public class PurchaseOrderDTO : SfsStoreDTOBase<PurchaseOrderDetailDTO>
     [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
     public string SupplierCode { get; set; }
 
+    /// <summary>
+    /// 供应商名称
+    /// </summary>
+    [DisplayName("供应商名称")]
+    public string SupplierName { get; set; }
+
+    /// <summary>
+    /// 供应商地址
+    /// </summary>
+    [DisplayName("供应商地址")]
+    public string SupplierAdress { get; set; }
+
     /// <summary>
     /// 订单类型
     /// </summary>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Orders/PurchaseOrders/Inputs/PurchaseOrderEditInput.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using Win_in.Sfs.Shared.Domain;
 using Win_in.Sfs.Shared.Domain.Shared;
@@ -92,6 +93,18 @@ public class PurchaseOrderEditInput
     [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
     public string SupplierCode { get; set; }
 
+    /// <summary>
+    /// 供应商名称
+    /// </summary>
+    [DisplayName("供应商名称")]
+    public string SupplierName { get; set; }
+
+    /// <summary>
+    /// 供应商地址
+    /// </summary>
+    [DisplayName("供应商地址")]
+    public string SupplierAdress { get; set; }
+
     /// <summary>
     /// 明细列表
     /// </summary>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Plans/SupplierAsns/DTOs/SupplierAsnDTO.cs

@@ -1,4 +1,5 @@
 using System;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using Win_in.Sfs.Shared.Domain;
 using Win_in.Sfs.Shared.Domain.Shared;
@@ -30,6 +31,18 @@ public class SupplierAsnDTO : SfsStoreDTOBase<SupplierAsnDetailDTO>
     [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
     public string SupplierCode { get; set; }
 
+    /// <summary>
+    /// 供应商名称
+    /// </summary>
+    [DisplayName("供应商名称")]
+    public string SupplierName { get; set; }
+
+    /// <summary>
+    /// 供应商地址
+    /// </summary>
+    [DisplayName("供应商地址")]
+    public string SupplierAdress { get; set; }
+
     /// <summary>
     /// 状态 0：新增1：发货中2：已发出3：已接收4：作废
     /// </summary>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Plans/SupplierAsns/Inputs/SupplierAsnEditInput.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using Win_in.Sfs.Shared.Domain;
 using Win_in.Sfs.Shared.Domain.Shared;
@@ -121,6 +122,18 @@ public class SupplierAsnEditInput : SfsStoreCreateOrUpdateInputBase
     [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
     public string SupplierCode { get; set; }
 
+    /// <summary>
+    /// 供应商名称
+    /// </summary>
+    [DisplayName("供应商名称")]
+    public string SupplierName { get; set; }
+
+    /// <summary>
+    /// 供应商地址
+    /// </summary>
+    [DisplayName("供应商地址")]
+    public string SupplierAdress { get; set; }
+
     /// <summary>
     /// 明细列表
     /// </summary>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Plans/SupplierAsns/Inputs/SupplierAsnImportInput.cs

@@ -1,4 +1,5 @@
 using System;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using Win_in.Sfs.Shared.Application.Contracts;
 
@@ -19,6 +20,18 @@ public class SupplierAsnImportInput : SfsStoreImportInputBase
     [Required(ErrorMessage = "供应商代码不能为空")]
     public string SupplierCode { get; set; }
 
+    /// <summary>
+    /// 供应商名称
+    /// </summary>
+    [DisplayName("供应商名称")]
+    public string SupplierName { get; set; }
+
+    /// <summary>
+    /// 供应商地址
+    /// </summary>
+    [DisplayName("供应商地址")]
+    public string SupplierAdress { get; set; }
+
     /// <summary>
     /// 筹措员代码
     /// </summary>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/PurchaseReceiptRequests/DTOs/PurchaseReceiptRequestDTO.cs

@@ -1,4 +1,5 @@
 using System;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using Win_in.Sfs.Shared.Domain;
 
@@ -38,10 +39,15 @@ public class PurchaseReceiptRequestDTO : SfsStoreRequestDTOBase<PurchaseReceiptR
     /// <summary>
     /// 供应商名称
     /// </summary>
-    [Display(Name = "供应商名称")]
+    [DisplayName("供应商名称")]
-    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
     public string SupplierName { get; set; }
 
+    /// <summary>
+    /// 供应商地址
+    /// </summary>
+    [DisplayName("供应商地址")]
+    public string SupplierAdress { get; set; }
+
     /// <summary>
     /// 车牌号
     /// </summary>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/PurchaseReceiptRequests/Inputs/PurchaseReceiptRequestEditInput.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using Win_in.Sfs.Shared.Domain;
 
@@ -78,10 +79,15 @@ public class PurchaseReceiptRequestEditInput : SfsStoreRequestCreateOrUpdateInpu
     /// <summary>
     /// 供应商名称
     /// </summary>
-    [Display(Name = "供应商名称")]
+    [DisplayName("供应商名称")]
-    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
     public string SupplierName { get; set; }
 
+    /// <summary>
+    /// 供应商地址
+    /// </summary>
+    [DisplayName("供应商地址")]
+    public string SupplierAdress { get; set; }
+
     /// <summary>
     /// 明细列表
     /// </summary>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/PurchaseReceiptRequests/Inputs/PurchaseReceiptRequestImportInput.cs

@@ -1,4 +1,5 @@
 using System;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using Win_in.Sfs.Shared.Domain;
 using Win_in.Sfs.Shared.Domain.Shared;
@@ -42,9 +43,15 @@ public class PurchaseReceiptRequestImportInput : SfsStoreImportInputBase, IHasPo
     /// <summary>
     /// 供应商名称
     /// </summary>
-    [Display(Name = "供应商名称")]
+    [DisplayName("供应商名称")]
     public string SupplierName { get; set; }
 
+    /// <summary>
+    /// 供应商地址
+    /// </summary>
+    [DisplayName("供应商地址")]
+    public string SupplierAdress { get; set; }
+
     /// <summary>
     /// 车牌号
     /// </summary>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Orders/PurchaseOrders/PurchaseOrderAppService.cs

@@ -34,7 +34,7 @@ public class PurchaseOrderAppService :
     private readonly IPurchaseOrderManager _purchaseOrderManager;
     private readonly ISupplierAppService _supplierAppService;
     private readonly IItemBasicAppService _itemBasicAppService;
-
+    
     public PurchaseOrderAppService(
         IPurchaseOrderRepository repository,
         IPurchaseOrderManager purchaseOrderManager,
@@ -62,12 +62,17 @@ public class PurchaseOrderAppService :
     {
         var addList= dictionary.Where(p => p.Value == EntityState.Added).Select(p => p.Key);
 
-        foreach (var PurchaseOrder in addList)
+        foreach (var purchaseOrder in addList)
         {
-            PurchaseOrder.CreatorId = CurrentUser.Id;
+            purchaseOrder.CreatorId = CurrentUser.Id;
-            PurchaseOrder.Worker = CurrentUser.Name;
+            purchaseOrder.Worker = CurrentUser.Name;
+
+            var supplierDto=await _supplierAppService.GetByCodeAsync(purchaseOrder.SupplierCode).ConfigureAwait(false);
+            purchaseOrder.SupplierCode = supplierDto.Code;
+            purchaseOrder.SupplierAdress = supplierDto.Address;
+            purchaseOrder.SupplierName= supplierDto.Name;
 
-            foreach (var detail in PurchaseOrder.Details)
+            foreach (var detail in purchaseOrder.Details)
             {
                 var itemBasicDto= await _itemBasicAppService.GetByCodeAsync(detail.ItemCode).ConfigureAwait(false);
 

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/PurchaseReceiptJobs/PurchaseReceiptJob.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using Win_in.Sfs.Shared.Domain.Entities;
 using Win_in.Sfs.Shared.Domain.Shared;
@@ -46,9 +47,15 @@ public class PurchaseReceiptJob : SfsJobAggregateRootBase<PurchaseReceiptJobDeta
     /// <summary>
     /// 供应商名称
     /// </summary>
-    [IgnoreUpdate]
+    [DisplayName("供应商名称")]
     public string SupplierName { get; set; }
 
+    /// <summary>
+    /// 供应商地址
+    /// </summary>
+    [DisplayName("供应商地址")]
+    public string SupplierAdress { get; set; }
+
     /// <summary>
     /// 类型
     /// </summary>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/PurchaseReceiptNotes/PurchaseReceiptNote.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Threading.Tasks;
 using Win_in.Sfs.Shared.Domain.Shared;
 
@@ -36,6 +37,18 @@ public class PurchaseReceiptNote : SfsStoreAggregateRootBase<PurchaseReceiptNote
     /// </summary>
     public string SupplierCode { get; set; }
 
+    /// <summary>
+    /// 供应商名称
+    /// </summary>
+    [DisplayName("供应商名称")]
+    public string SupplierName { get; set; }
+
+    /// <summary>
+    /// 供应商地址
+    /// </summary>
+    [DisplayName("供应商地址")]
+    public string SupplierAdress { get; set; }
+
     /// <summary>
     /// 收货时间
     /// </summary>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Orders/PurchaseOrders/PurchaseOrder.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Threading.Tasks;
 using Win_in.Sfs.Shared.Domain;
 using Win_in.Sfs.Shared.Domain.Entities;
@@ -19,6 +20,18 @@ public class PurchaseOrder : SfsStoreAggregateRootBase<PurchaseOrderDetail>
     [IgnoreUpdate]
     public string SupplierCode { get; set; }
 
+    /// <summary>
+    /// 供应商名称
+    /// </summary>
+    [DisplayName("供应商名称")]
+    public string SupplierName { get; set; }
+
+    /// <summary>
+    /// 供应商地址
+    /// </summary>
+    [DisplayName("供应商地址")]
+    public string SupplierAdress { get; set; }
+
     /// <summary>
     /// 订单类型
     /// </summary>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Plans/SupplierAsns/SupplierAsn.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using Win_in.Sfs.Shared.Domain;
 using Win_in.Sfs.Shared.Domain.Shared;
@@ -28,6 +29,18 @@ public class SupplierAsn : SfsStoreAggregateRootBase<SupplierAsnDetail>
     /// </summary>
     public string SupplierCode { get; set; }
 
+    /// <summary>
+    /// 供应商名称
+    /// </summary>
+    [DisplayName("供应商名称")]
+    public string SupplierName { get; set; }
+
+    /// <summary>
+    /// 供应商地址
+    /// </summary>
+    [DisplayName("供应商地址")]
+    public string SupplierAdress { get; set; }
+
     /// <summary>
     /// 状态 0：新增1：发货中2：已发出3：已接收4：作废
     /// </summary>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/PurchaseReceiptRequests/PurchaseReceiptRequest.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using Win_in.Sfs.Shared.Domain.Entities;
 
@@ -37,9 +38,15 @@ public class PurchaseReceiptRequest : SfsStoreRequestAggregateRootBase<PurchaseR
     /// <summary>
     /// 供应商名称
     /// </summary>
-    [IgnoreUpdate]
+    [DisplayName("供应商名称")]
     public string SupplierName { get; set; }
 
+    /// <summary>
+    /// 供应商地址
+    /// </summary>
+    [DisplayName("供应商地址")]
+    public string SupplierAdress { get; set; }
+
     /// <summary>
     /// 车牌号
     /// </summary>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20230404020712_Added_Store_Add_SupplierAdress_SupplierName.cs

@@ -0,0 +1,95 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Win_in.Sfs.Wms.Store.Migrations
+{
+    public partial class Added_Store_Add_SupplierAdress_SupplierName : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "SupplierAdress",
+                table: "Store_SupplierAsn",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "SupplierName",
+                table: "Store_SupplierAsn",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "SupplierAdress",
+                table: "Store_PurchaseReceiptRequest",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "SupplierAdress",
+                table: "Store_PurchaseReceiptNote",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "SupplierName",
+                table: "Store_PurchaseReceiptNote",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "SupplierAdress",
+                table: "Store_PurchaseOrder",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "SupplierName",
+                table: "Store_PurchaseOrder",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "SupplierAdress",
+                table: "Job_PurchaseReceiptJob",
+                type: "nvarchar(max)",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "SupplierAdress",
+                table: "Store_SupplierAsn");
+
+            migrationBuilder.DropColumn(
+                name: "SupplierName",
+                table: "Store_SupplierAsn");
+
+            migrationBuilder.DropColumn(
+                name: "SupplierAdress",
+                table: "Store_PurchaseReceiptRequest");
+
+            migrationBuilder.DropColumn(
+                name: "SupplierAdress",
+                table: "Store_PurchaseReceiptNote");
+
+            migrationBuilder.DropColumn(
+                name: "SupplierName",
+                table: "Store_PurchaseReceiptNote");
+
+            migrationBuilder.DropColumn(
+                name: "SupplierAdress",
+                table: "Store_PurchaseOrder");
+
+            migrationBuilder.DropColumn(
+                name: "SupplierName",
+                table: "Store_PurchaseOrder");
+
+            migrationBuilder.DropColumn(
+                name: "SupplierAdress",
+                table: "Job_PurchaseReceiptJob");
+        }
+    }
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/StoreDbContextModelSnapshot.cs

@@ -12426,10 +12426,16 @@ namespace Win_in.Sfs.Wms.Store.Migrations
                         .HasColumnType("nvarchar(3072)")
                         .HasColumnName("Remark");
 
+                    b.Property<string>("SupplierAdress")
+                        .HasColumnType("nvarchar(max)");
+
                     b.Property<string>("SupplierCode")
                         .HasMaxLength(64)
                         .HasColumnType("nvarchar(64)");
 
+                    b.Property<string>("SupplierName")
+                        .HasColumnType("nvarchar(max)");
+
                     b.Property<decimal>("TaxRate")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("decimal(18,6)")
@@ -12459,9 +12465,6 @@ namespace Win_in.Sfs.Wms.Store.Migrations
                     b.Property<Guid>("Id")
                         .HasColumnType("uniqueidentifier");
 
-                    b.Property<string>("PlanUserCode")
-                        .HasColumnType("nvarchar(max)");
-
                     b.Property<decimal>("ConvertRate")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("decimal(18,6)")
@@ -12542,6 +12545,9 @@ namespace Win_in.Sfs.Wms.Store.Migrations
                     b.Property<DateTime>("PlanArriveDate")
                         .HasColumnType("datetime2");
 
+                    b.Property<string>("PlanUserCode")
+                        .HasColumnType("nvarchar(max)");
+
                     b.Property<string>("PoLine")
                         .HasMaxLength(64)
                         .HasColumnType("nvarchar(64)");
@@ -12714,6 +12720,9 @@ namespace Win_in.Sfs.Wms.Store.Migrations
                         .HasMaxLength(64)
                         .HasColumnType("nvarchar(64)");
 
+                    b.Property<string>("SupplierAdress")
+                        .HasColumnType("nvarchar(max)");
+
                     b.Property<string>("SupplierCode")
                         .IsRequired()
                         .HasMaxLength(64)
@@ -13054,11 +13063,17 @@ namespace Win_in.Sfs.Wms.Store.Migrations
                         .HasMaxLength(64)
                         .HasColumnType("nvarchar(64)");
 
+                    b.Property<string>("SupplierAdress")
+                        .HasColumnType("nvarchar(max)");
+
                     b.Property<string>("SupplierCode")
                         .IsRequired()
                         .HasMaxLength(64)
                         .HasColumnType("nvarchar(64)");
 
+                    b.Property<string>("SupplierName")
+                        .HasColumnType("nvarchar(max)");
+
                     b.Property<Guid?>("TenantId")
                         .HasColumnType("uniqueidentifier")
                         .HasColumnName("TenantId");
@@ -13454,6 +13469,9 @@ namespace Win_in.Sfs.Wms.Store.Migrations
                         .HasMaxLength(64)
                         .HasColumnType("nvarchar(64)");
 
+                    b.Property<string>("SupplierAdress")
+                        .HasColumnType("nvarchar(max)");
+
                     b.Property<string>("SupplierCode")
                         .IsRequired()
                         .HasMaxLength(64)
@@ -16926,11 +16944,17 @@ namespace Win_in.Sfs.Wms.Store.Migrations
                         .HasMaxLength(64)
                         .HasColumnType("nvarchar(64)");
 
+                    b.Property<string>("SupplierAdress")
+                        .HasColumnType("nvarchar(max)");
+
                     b.Property<string>("SupplierCode")
                         .IsRequired()
                         .HasMaxLength(64)
                         .HasColumnType("nvarchar(64)");
 
+                    b.Property<string>("SupplierName")
+                        .HasColumnType("nvarchar(max)");
+
                     b.Property<Guid?>("TenantId")
                         .HasColumnType("uniqueidentifier")
                         .HasColumnName("TenantId");

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Plans/SupplierAsnAutoMapperProfile.cs

@@ -21,7 +21,6 @@ public partial class StoreEventAutoMapperProfile : Profile
                 .Ignore(x => x.AutoCompleteJob)
                 .Ignore(x => x.Number)
                 .Ignore(x => x.DirectCreateNote)
-                .Ignore(x => x.SupplierName)
                 ;
 
         #endregion
@@ -33,27 +32,5 @@ public partial class StoreEventAutoMapperProfile : Profile
                 ;
 
         #endregion
-
-        // 发货单 - 采购订单
-        #region SupplierAsn, PurchaseOrderCreateInput
-
-        CreateMap<SupplierAsn, PurchaseOrderEditInput>()
-            .Ignore(x => x.PoType)
-            .Ignore(x => x.IsConsignment)
-            .Ignore(x => x.OrderDate)
-            .Ignore(x => x.Version)
-            .Ignore(x => x.TaxRate)
-            .Ignore(x => x.ContactName)
-            .Ignore(x => x.ContactPhone)
-            .Ignore(x => x.ContactEmail)
-            .Ignore(x => x.Details)
-
-            .ForMember(x => x.Number, y => y.MapFrom(d => d.PoNumber))
-            .ForMember(x => x.OrderStatus, y => y.MapFrom(d => EnumOrderStatus.Open))
-            .ForMember(x => x.PoType, y => y.MapFrom(d => "schedule"))
-
-            ;
-
-        #endregion
     }
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Orders/PurchaseOrderEventHandler.cs

@@ -103,6 +103,15 @@ public class PurchaseOrderEventHandler
         //赋值采购订单编号
         supplierAsnEditInput.PoNumber = purchaseOrder.Number;
 
+        //日期 //todo 这几个日期 有点问题
+        supplierAsnEditInput.ShipDate = purchaseOrder.OrderDate;
+        supplierAsnEditInput.PlanArriveDate= purchaseOrder.Details.First().PlanArriveDate;
+        supplierAsnEditInput.Ctype= purchaseOrder.Details.First().Ctype;
+        supplierAsnEditInput.PlanUserCode = purchaseOrder.Details.First().PlanUserCode;
+
+        //新到货
+        supplierAsnEditInput.Status = EnumSupplierAsnStatus.New;
+
         //要货单号
         supplierAsnEditInput.RpNumber = "无";
 
@@ -169,12 +178,15 @@ public class PurchaseOrderEventHandler
                 p.ItemCode == detail.ItemCode && p.SupplierCode == supplierAsnEditInput.SupplierCode);
             detail.SupplierPackQty = supplierItemDto.SupplierPackQty;
             detail.SupplierPackUom= supplierItemDto.SupplierPackUom;
+            detail.SupplierBatch=supplierItemDto.
 
             //订单行
             detail.PoLine = purchaseOrderDetail.PoLine;
 
             //推荐ERP库位
             detail.RecommendErpCode = purchaseOrderDetail.LocationErpCode;
+
+            detail.PoNumber = purchaseOrder.Number;
         });
 
         return supplierAsnEditInput;