更新器具

1 year ago · c6c79da5c7
24 changed files with 550 additions and 31 deletions
--- a/be/Hosts/Wms.Host/Win_in.Sfs.Wms.Store.HttpApi.Host/Properties/PublishProfiles/FolderProfile1.pubxml
+++ b/be/Hosts/Wms.Host/Win_in.Sfs.Wms.Store.HttpApi.Host/Properties/PublishProfiles/FolderProfile1.pubxml
@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project>
+  <PropertyGroup>
+    <DeleteExistingFiles>false</DeleteExistingFiles>
+    <ExcludeApp_Data>false</ExcludeApp_Data>
+    <LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
+    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
+    <LastUsedPlatform>Any CPU</LastUsedPlatform>
+    <PublishProvider>FileSystem</PublishProvider>
+    <PublishUrl>bin\Release\net6.0\publish\</PublishUrl>
+    <WebPublishMethod>FileSystem</WebPublishMethod>
+    <_TargetId>Folder</_TargetId>
+  </PropertyGroup>
+</Project>
--- a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Properties/PublishProfiles/FolderProfile1.pubxml
+++ b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Properties/PublishProfiles/FolderProfile1.pubxml
@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project>
+  <PropertyGroup>
+    <DeleteExistingFiles>false</DeleteExistingFiles>
+    <ExcludeApp_Data>false</ExcludeApp_Data>
+    <LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
+    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
+    <LastUsedPlatform>Any CPU</LastUsedPlatform>
+    <PublishProvider>FileSystem</PublishProvider>
+    <PublishUrl>bin\Release\net6.0\publish\</PublishUrl>
+    <WebPublishMethod>FileSystem</WebPublishMethod>
+    <_TargetId>Folder</_TargetId>
+  </PropertyGroup>
+</Project>
--- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Equipments/DTOs/EquipmentDTO.cs
+++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Equipments/DTOs/EquipmentDTO.cs
@ -16,7 +16,7 @@ public class EquipmentDTO : SfsBaseDataDTOBase, IHasCode
    /// 类型
    /// </summary>
    [Display(Name = "类型")]
-    public EnumEquipmentType Type { get; set; } 
+    public EnumContainerType Type { get; set; } 
    /// <summary>
    /// 器具编号
    /// </summary>
@ -25,18 +25,18 @@ public class EquipmentDTO : SfsBaseDataDTOBase, IHasCode
    public string Code { get; set; }


-    /// <summary>
-    ///  标包数量
-    /// </summary>
-    [Display(Name = "标包数")]
-    [Required(ErrorMessage = "{0}是必填项")]
-    public decimal StdQty { get; set; }
+    ///// <summary>
+    /////  标包数量
+    ///// </summary>
+    //[Display(Name = "标包数")]
+    //[Required(ErrorMessage = "{0}是必填项")]
+    //public decimal StdQty { get; set; }

    /// <summary>
    /// 型号
    /// </summary>
    [Display(Name = "型号")]
-    public EnumEquipmentModel Model { get; set; }
+    public string Model { get; set; }
    /// <summary>
    /// 库位编号
    /// </summary>
--- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Equipments/Inputs/EquipmentEditInput.cs
+++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Equipments/Inputs/EquipmentEditInput.cs
@ -12,7 +12,7 @@ public class EquipmentEditInput : SfsBaseDataCreateOrUpdateInputBase
    /// 类型
    /// </summary>
    [Display(Name = "类型")]
-    public EnumEquipmentType Type { get; set; } 
+    public EnumContainerType Type { get; set; } 
    /// <summary>
    /// 器具编号
    /// </summary>
@ -21,18 +21,18 @@ public class EquipmentEditInput : SfsBaseDataCreateOrUpdateInputBase
    public string Code { get; set; }


-    /// <summary>
-    ///  标包数量
-    /// </summary>
-    [Display(Name = "标包数")]
-    [Required(ErrorMessage = "{0}是必填项")]
-    public decimal StdQty { get; set; }
+    ///// <summary>
+    /////  标包数量
+    ///// </summary>
+    //[Display(Name = "标包数")]
+    //[Required(ErrorMessage = "{0}是必填项")]
+    //public decimal StdQty { get; set; }

    /// <summary>
    /// 型号
    /// </summary>
    [Display(Name = "型号")]
-    public EnumEquipmentModel Model { get; set; } 
+    public string Model { get; set; } 
    /// <summary>
    /// 库位编号
    /// </summary>
--- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Equipments/Inputs/EquipmentImportInput.cs
+++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Equipments/Inputs/EquipmentImportInput.cs
@ -1,18 +1,18 @@
 using System;
 using System.ComponentModel.DataAnnotations;
-
+using Win_in.Sfs.Shared.Domain.Shared;
 using Win_in.Sfs.Shared.Domain.Shared.Enums.Basedata;

 namespace Win_in.Sfs.Basedata.Application.Contracts;

-[Display(Name = "物品")]
+[Display(Name = "器具")]
 public class EquipmentImportInput : SfsBaseDataImportInputBase
 {
    /// <summary>
    /// 类型
    /// </summary>
    [Display(Name = "类型")]
-    public Win_in.Sfs.Shared.Domain.Shared.Enums.Basedata.EnumEquipmentType Type { get; set; } 
+    public EnumContainerType Type { get; set; } 
    /// <summary>
    /// 器具编号
    /// </summary>
@ -21,18 +21,18 @@ public class EquipmentImportInput : SfsBaseDataImportInputBase
    public string Code { get; set; }


-    /// <summary>
-    ///  标包数量
-    /// </summary>
-    [Display(Name = "标包数")]
-    [Required(ErrorMessage = "{0}是必填项")]
-    public decimal StdQty { get; set; }
+    ///// <summary>
+    /////  标包数量
+    ///// </summary>
+    //[Display(Name = "标包数")]
+    //[Required(ErrorMessage = "{0}是必填项")]
+    //public decimal StdQty { get; set; }

    /// <summary>
    /// 型号
    /// </summary>
    [Display(Name = "型号")]
-    public EnumEquipmentModel Model { get; set; } 
+    public string Model { get; set; } 
    /// <summary>
    /// 库位编号
    /// </summary>
--- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/Equipments/EquipmentAutoMapperProfile.cs
+++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/Equipments/EquipmentAutoMapperProfile.cs
@ -15,6 +15,7 @@ public partial class BasedataApplicationAutoMapperProfile : Profile

        CreateMap<EquipmentImportInput, Equipment>()
            .IgnoreAuditedObjectProperties()
+            .Ignore(x => x.StdQty)
            .Ignore(x => x.TenantId)
            .Ignore(x => x.Remark)
            .Ignore(x => x.ExtraProperties)
@ -28,6 +29,7 @@ public partial class BasedataApplicationAutoMapperProfile : Profile
        //    .Ignore(x => x.Color);
        CreateMap<EquipmentEditInput, Equipment>()
             .IgnoreAuditedObjectProperties()
+              .Ignore(x => x.StdQty)
             .Ignore(x => x.ConcurrencyStamp).Ignore(x => x.Id);
    }
 }
--- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/Equipments/Equipment.cs
+++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/Equipments/Equipment.cs
@ -1,5 +1,6 @@
 using System;
 using System.ComponentModel.DataAnnotations;
+using Microsoft.Extensions.Hosting;
 using Win_in.Sfs.Shared.Domain;
 using Win_in.Sfs.Shared.Domain.Entities;
 using Win_in.Sfs.Shared.Domain.Shared;
@ -19,13 +20,13 @@ public class Equipment : SfsBaseDataAggregateRootBase, IHasCode
    /// </summary>
    public string Code { get; set; }
    /// <summary>
-    /// 类型
+    /// 器具类型
    /// </summary>
-    public EnumEquipmentType Type { get; set; }
+    public EnumContainerType Type { get; set; }
    /// <summary>
-    /// 型号
+    /// 器具规格
    /// </summary>
-    public EnumEquipmentModel  Model { get; set; }
+    public string  Model { get; set; }
    /// <summary>
    /// 库位编号
    /// </summary>
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/MesNotes/DTOs/MesNoteDTO.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/MesNotes/DTOs/MesNoteDTO.cs
@ -0,0 +1,26 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+
+public class MesNoteDTO : SfsStoreDTOBase<MesNoteDetailDTO>, IHasNumber
+{
+
+    /// <summary>
+    /// 任务ID
+    /// </summary>
+    [Display(Name = "任务ID")]
+    public string JobNumber { get; set; }
+
+    /// <summary>
+    /// 报废类型
+    /// </summary>
+    [Display(Name = "报废类型")]
+    public string Type { get; set; }
+
+    /// <summary>
+    /// 报废请求单号
+    /// </summary>
+    [Display(Name = "报废请求单号")]
+    public string ScrapRequestNumber { get; set; }
+
+}
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/MesNotes/DTOs/MesNoteDetailDTO.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/MesNotes/DTOs/MesNoteDetailDTO.cs
@ -0,0 +1,13 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+
+public class MesNoteDetailDTO : SfsStoreDetailWithFromToDTOBase
+{
+    /// <summary>
+    /// 原因代码
+    /// </summary>
+    [Display(Name = "原因代码")]
+    public string ReasonCode { get; set; }
+
+}
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/MesNotes/IMesNoteAppService.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/MesNotes/IMesNoteAppService.cs
@ -0,0 +1,17 @@
+using System.Threading.Tasks;
+using Volo.Abp.Application.Dtos;
+
+namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+
+using System.Threading;
+
+public interface IMesNoteAppService : ISfsStoreMasterReadOnlyAppServiceBase<MesNoteDTO, SfsStoreRequestInputBase, MesNoteDetailDTO, SfsStoreRequestInputBase>
+{
+    Task<MesNoteDTO> CreateAsync(MesNoteEditInput input);
+
+    Task<PagedResultDto<MesNoteDTO>> GetListByTypeAsync(
+        SfsStoreRequestInputBase requestInput,
+        string type,
+        bool includeDetails = false,
+        CancellationToken cancellationToken = default);
+}
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/MesNotes/Inputs/MesNoteDetailInput.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/MesNotes/Inputs/MesNoteDetailInput.cs
@ -0,0 +1,13 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+
+public class MesNoteDetailInput : SfsStoreDetailWithFromToInputBase
+{
+    /// <summary>
+    /// 原因代码
+    /// </summary>
+    [Display(Name = "原因代码")]
+    public string ReasonCode { get; set; }
+
+}
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/MesNotes/Inputs/MesNoteEditInput.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/MesNotes/Inputs/MesNoteEditInput.cs
@ -0,0 +1,41 @@
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using Win_in.Sfs.Shared.Domain;
+
+namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+
+public class MesNoteEditInput : SfsStoreCreateOrUpdateInputBase
+{
+    #region Create
+    /// <summary>
+    /// 任务ID
+    /// </summary>
+    [Display(Name = "任务ID")]
+    public string JobNumber { get; set; }
+
+    /// <summary>
+    /// 报废记录号
+    /// </summary>
+    [Display(Name = "报废记录号")]
+    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
+    public string Number { get; set; }
+
+    /// <summary>
+    /// 报废请求单号
+    /// </summary>
+    [Display(Name = "报废请求单号")]
+    public string ScrapRequestNumber { get; set; }
+
+    /// <summary>
+    /// 报废类型
+    /// </summary>
+    [Display(Name = "报废类型")]
+    public string Type { get; set; }
+
+    /// <summary>
+    /// 明细列表 
+    /// </summary>
+    [Display(Name = "明细列表")]
+    public List<MesNoteDetailInput> Details { get; set; }
+    #endregion
+}
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/MesNotes/Inputs/MesNoteImportInput.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/MesNotes/Inputs/MesNoteImportInput.cs
@ -0,0 +1,20 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+
+public class MesNoteImportInput : SfsStoreImportInputBase
+{
+
+    /// <summary>
+    /// 任务ID
+    /// </summary>
+    [Display(Name = "任务ID")]
+    public string JobNumber { get; set; }
+
+    /// <summary>
+    /// 报废请求单号
+    /// </summary>
+    [Display(Name = "报废请求单号")]
+    public string ScrapRequestNumber { get; set; }
+
+}
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/MesNotes/MesNotePermissions.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/MesNotes/MesNotePermissions.cs
@ -0,0 +1,30 @@
+using Volo.Abp.Authorization.Permissions;
+using Win_in.Sfs.Wms.Store.Domain;
+
+namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+
+public static class MesNotePermissions
+{
+
+    public const string Default = StorePermissions.GroupName + "." + nameof(MesNote);
+    public const string Create = Default + "." + StorePermissions.CreateStr;
+    public const string Update = Default + "." + StorePermissions.UpdateStr;
+    public const string Delete = Default + "." + StorePermissions.DeleteStr;
+
+    //完工收货报废记录
+    public const string ProductScrapNote = StorePermissions.GroupName + "." + nameof(ProductScrapNote);
+    //线边报废记录
+    public const string WipScrapNote = StorePermissions.GroupName + "." + nameof(WipScrapNote);
+
+    public static void AddMesNotePermission(this PermissionGroupDefinition permissionGroup)
+    {
+        var scrapNotePermission = permissionGroup.AddPermission(Default, StorePermissionDefinitionProvider.L(nameof(MesNote)));
+        scrapNotePermission.AddChild(Create, StorePermissionDefinitionProvider.L(StorePermissions.CreateStr));
+        scrapNotePermission.AddChild(Update, StorePermissionDefinitionProvider.L(StorePermissions.UpdateStr));
+        scrapNotePermission.AddChild(Delete, StorePermissionDefinitionProvider.L(StorePermissions.DeleteStr));
+
+        permissionGroup.AddPermission(ProductScrapNote, StorePermissionDefinitionProvider.L(nameof(ProductScrapNote)));
+        permissionGroup.AddPermission(WipScrapNote, StorePermissionDefinitionProvider.L(nameof(WipScrapNote)));
+
+    }
+}
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Permissions/StorePermissionDefinitionProvider.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Permissions/StorePermissionDefinitionProvider.cs
@ -37,6 +37,8 @@ public class StorePermissionDefinitionProvider : PermissionDefinitionProvider
        storeGroup.AddUnplannedIssueNotePermission();
        storeGroup.AddIsolationNotePermission();
        storeGroup.AddScrapNotePermission();
+
+        storeGroup.AddMesNotePermission();
        storeGroup.AddDeliverPlanPermission();
        storeGroup.AddDeliverRequestPermission();
        storeGroup.AddDeliverNotePermission();
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/MesNotes/MesNoteAppService.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/MesNotes/MesNoteAppService.cs
@ -0,0 +1,134 @@
+using System;
+using System.Linq.Expressions;
+using System.Threading;
+using System.Threading.Tasks;
+using DocumentFormat.OpenXml.Bibliography;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using Volo.Abp.Application.Dtos;
+using Volo.Abp.EventBus;
+using Win_in.Sfs.Basedata.Application.Contracts;
+using Win_in.Sfs.Wms.Store.Application.Contracts;
+using Win_in.Sfs.Wms.Store.Domain;
+using Win_in.Sfs.Wms.Store.Domain.Shared;
+
+namespace Win_in.Sfs.Wms.Store.Application;
+
+using System.Collections.Generic;
+using System.Linq;
+using IdentityModel;
+using Volo.Abp.Domain.Entities;
+using Volo.Abp.ObjectMapping;
+using Win_in.Sfs.Shared.Domain;
+using Win_in.Sfs.Shared.Domain.Shared;
+using Win_in.Sfs.Shared.Event;
+using Win_in.Sfs.Wms.Inventory.Application.Contracts;
+
+[Authorize]
+[Route($"{StoreConsts.RootPath}mes-note")]
+public class MesNoteAppService :
+    SfsStoreWithDetailsAppServiceBase<MesNote, MesNoteDTO, SfsStoreRequestInputBase, MesNoteEditInput,
+        MesNoteDetail, MesNoteDetailDTO, SfsStoreRequestInputBase, MesNoteImportInput>,
+    IMesNoteAppService
+{
+    private readonly ILocationAppService _locationAppService;
+    private readonly  IItemBasicAppService _itemBasicAppService;
+    private readonly IBalanceAppService _balanceAppService;
+    public MesNoteAppService(
+        IMesNoteRepository repository, ILocationAppService locationAppService, IItemBasicAppService itemBasicAppService,IBalanceAppService balanceAppService) : base(repository)
+    {
+        _locationAppService = locationAppService;
+        _itemBasicAppService = itemBasicAppService;
+        _balanceAppService = balanceAppService;
+    }
+
+    [HttpPost("")]
+    public override async Task<MesNoteDTO> CreateAsync(MesNoteEditInput input)
+    {
+        var entity = ObjectMapper.Map<MesNoteEditInput, MesNote>(input);
+
+        var number = string.IsNullOrEmpty(entity.Number) ? await GenerateNumberAsync(nameof(MesNote), entity.ActiveDate).ConfigureAwait(false) : entity.Number;
+        entity.SetIdAndNumberWithDetails(GuidGenerator, number);
+
+        foreach (var detail in entity.Details)
+        {
+            var fromLocation=await _locationAppService.GetByCodeAsync(detail.FromLocationCode).ConfigureAwait(false);
+            var toLocation =await _locationAppService.GetByCodeAsync(detail.ToLocationCode).ConfigureAwait(false);
+            var itemBasicDto =await _itemBasicAppService.GetByCodeAsync(detail.ItemCode).ConfigureAwait(false);
+
+            detail.SetIdAndNumber(GuidGenerator, entity.Id, entity.Number);
+            detail.FromLocationArea = fromLocation.AreaCode;
+            detail.FromLocationErpCode = fromLocation.ErpLocationCode;
+            detail.FromLocationGroup = fromLocation.LocationGroupCode;
+            detail.FromWarehouseCode = fromLocation.WarehouseCode;
+            detail.ToLocationArea = toLocation.AreaCode;
+            detail.ToLocationErpCode = toLocation.ErpLocationCode;
+            detail.ToLocationGroup = toLocation.LocationGroupCode;
+            detail.ToWarehouseCode = toLocation.WarehouseCode;
+            detail.ToStatus = detail.FromStatus;
+            detail.Uom = itemBasicDto.BasicUom;
+            detail.StdPackQty = itemBasicDto.StdPackQty;
+
+            #region 添加校验
+
+            RecommendBalanceRequestInput rInput = new RecommendBalanceRequestInput();
+            rInput.ItemCode = detail.ItemCode;
+            rInput.Locations = new List<string>() { detail.FromLocationCode };
+            rInput.Qty = detail.Qty;
+            rInput.Statuses = new List<EnumInventoryStatus> { EnumInventoryStatus.OK };
+            var balanceLst = await _balanceAppService.GetRecommendBalancesByLocationsAsync(rInput).ConfigureAwait(false);
+
+            var first = balanceLst.FirstOrDefault();
+            if (first != null)
+            {
+                if (detail.Qty > first.Qty)
+                { }
+
+
+
+
+
+            }
+            else
+            {
+
+
+
+
+
+            }
+
+
+
+
+
+            #endregion
+
+
+
+        }
+
+        entity = await _repository.InsertAsync(entity).ConfigureAwait(false);
+        await LocalEventBus.PublishAsync(new SfsCreatedEntityEventData<MesNote>(entity), false).ConfigureAwait(false);
+
+        var dto = ObjectMapper.Map<MesNote, MesNoteDTO>(entity);
+        return dto;
+    }
+       
+    [HttpPost("by-type/{type}")]
+    public virtual async Task<PagedResultDto<MesNoteDTO>> GetListByTypeAsync(
+        SfsStoreRequestInputBase requestInput,
+        string type,
+        bool includeDetails = false,
+        CancellationToken cancellationToken = default)
+    {
+        Expression<Func<MesNote, bool>> expression = p => p.Type == type;
+        if (requestInput.Condition.Filters?.Count > 0)
+        {
+            expression = expression.And(requestInput.Condition.Filters.ToLambda<MesNote>());
+        }
+
+        return await GetPagedListAsync(expression, requestInput.SkipCount, requestInput.MaxResultCount,
+            requestInput.Sorting, includeDetails, cancellationToken).ConfigureAwait(false);
+    }
+}
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/MesNotes/MesNoteAutoMapperProfile.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/MesNotes/MesNoteAutoMapperProfile.cs
@ -0,0 +1,38 @@
+using AutoMapper;
+using Volo.Abp.AutoMapper;
+using Win_in.Sfs.Wms.Store.Application.Contracts;
+using Win_in.Sfs.Wms.Store.Domain;
+
+namespace Win_in.Sfs.Wms.Store.Application;
+
+public partial class StoreApplicationAutoMapperProfile : Profile
+{
+    private void MesNoteAutoMapperProfile()
+    {
+        CreateMap<MesNote, MesNoteDTO>()
+            .ReverseMap();
+
+        CreateMap<MesNoteDetail, MesNoteDetailDTO>();
+
+        CreateMap<MesNoteDetailInput, MesNoteDetail>()
+            .IgnoreAuditedObjectProperties()
+            .Ignore(x => x.MasterID)
+            .Ignore(x => x.TenantId)
+            .Ignore(x => x.Number)
+            .Ignore(x => x.Id);
+
+        CreateMap<MesNoteEditInput, MesNote>()
+            .IgnoreAuditedObjectProperties()
+            .Ignore(x => x.TenantId)
+            .Ignore(x => x.Number)
+            .Ignore(x => x.Id);
+        ;
+        CreateMap<MesNoteDetailInput, MesNoteDetail>()
+            .IgnoreAuditedObjectProperties()
+            .Ignore(x => x.MasterID)
+            .Ignore(x => x.TenantId)
+            .Ignore(x => x.Number)
+            .Ignore(x => x.Id);
+        ;
+    }
+}
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/MesNotes/IMesNoteManager.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/MesNotes/IMesNoteManager.cs
@ -0,0 +1,5 @@
+namespace Win_in.Sfs.Wms.Store.Domain;
+
+public interface IMesNoteManager : ISfsStoreManager<MesNote, MesNoteDetail>
+{
+}
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/MesNotes/IMesNoteRepository.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/MesNotes/IMesNoteRepository.cs
@ -0,0 +1,6 @@
+namespace Win_in.Sfs.Wms.Store.Domain;
+
+public interface IMesNoteRepository : ISfsStoreRepositoryBase<MesNote>
+{
+
+}
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/MesNotes/MesNote.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/MesNotes/MesNote.cs
@ -0,0 +1,34 @@
+using System.Collections.Generic;
+using Win_in.Sfs.Shared.Domain.Entities;
+
+namespace Win_in.Sfs.Wms.Store.Domain;
+
+/// <summary>
+/// 报废记录
+/// </summary>
+public class MesNote : SfsStoreAggregateRootBase<MesNoteDetail>, IHasJobNumber
+{
+    /// <summary>
+    /// 任务ID
+    /// </summary>
+    [IgnoreUpdate]
+    public string JobNumber { get; set; }
+
+    /// <summary>
+    /// 报废请求单号
+    /// </summary>
+    [IgnoreUpdate]
+    public string ScrapRequestNumber { get; set; }
+
+    /// <summary>
+    /// Mes类型
+    /// </summary>
+    [IgnoreUpdate]
+    public string Type { get; set; }
+
+    /// <summary>
+    /// 明细列表 
+    /// </summary>
+    [IgnoreUpdate]
+    public override List<MesNoteDetail> Details { get; set; } = new List<MesNoteDetail>();
+}
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/MesNotes/MesNoteDetail.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/MesNotes/MesNoteDetail.cs
@ -0,0 +1,13 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace Win_in.Sfs.Wms.Store.Domain;
+
+public class MesNoteDetail : SfsStoreDetailWithFromToEntityBase
+{
+    /// <summary>
+    /// 原因代码
+    /// </summary>
+    [Display(Name = "原因代码")]
+    public string ReasonCode { get; set; }
+
+}
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/MesNotes/MesNoteManager.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/MesNotes/MesNoteManager.cs
@ -0,0 +1,14 @@
+using System.Threading.Tasks;
+
+namespace Win_in.Sfs.Wms.Store.Domain;
+
+public class MesNoteManager : SfsStoreManagerBase<MesNote, MesNoteDetail>, IMesNoteManager
+{
+
+    public MesNoteManager(
+        IMesNoteRepository repository
+        ) : base(repository)
+    {
+        
+    }
+}
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Notes/MesNotes/MesNoteDbContextModelCreatingExtensions.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Notes/MesNotes/MesNoteDbContextModelCreatingExtensions.cs
@ -0,0 +1,65 @@
+using Microsoft.EntityFrameworkCore;
+using Volo.Abp.EntityFrameworkCore.Modeling;
+using Win_in.Sfs.Shared.Domain.Shared;
+using Win_in.Sfs.Wms.Store.Domain;
+
+namespace Win_in.Sfs.Wms.Store.EntityFrameworkCore;
+
+public static class MesNoteDbContextModelCreatingExtensions
+{
+    public static void ConfigureMesNote(this ModelBuilder builder, StoreModelBuilderConfigurationOptions options)
+    {
+        builder.Entity<MesNote>(b =>
+        {
+            //Configure table & schema name
+            b.ToTable(options.TablePrefix + nameof(MesNote), options.Schema);
+            //Configure ABP properties
+            b.ConfigureByConvention();
+            //Configure Sfs base properties
+            b.ConfigureSfsStoreBase();
+
+            //Properties
+            b.Property(q => q.Type).HasMaxLength(SfsPropertyConst.CodeLength);
+            b.Property(q => q.ScrapRequestNumber).HasMaxLength(SfsPropertyConst.CodeLength);
+            //Relations
+            b.HasMany(q => q.Details).WithOne().HasForeignKey(d => d.MasterID).IsRequired();
+
+            //Indexes
+            b.HasIndex(q => new { q.Number }).IsUnique();
+        });
+
+        builder.Entity<MesNoteDetail>(b =>
+        {
+            //Configure table & schema name
+            b.ToTable(options.TablePrefix + nameof(MesNoteDetail), options.Schema);
+            //Configure ABP properties
+            b.ConfigureByConvention();
+            //Configure Sfs base properties
+            b.ConfigureSfsStoreBase();
+            //Configure Sfs store detail properties
+            b.ConfigureSfsStoreDetailBase();
+
+            //Properties
+            b.Property(q => q.ReasonCode).HasMaxLength(SfsPropertyConst.CodeLength);
+            b.Property(q => q.FromStatus).HasMaxLength(SfsPropertyConst.NameLength).HasConversion<string>();
+            b.Property(q => q.ToStatus).HasMaxLength(SfsPropertyConst.NameLength).HasConversion<string>();
+            b.Property(q => q.FromPackingCode).HasMaxLength(SfsPropertyConst.CodeLength);
+            b.Property(q => q.FromLocationCode).HasMaxLength(SfsPropertyConst.CodeLength);
+
+            //Relations
+
+            //Indexes
+            b.HasIndex(
+                q => new
+                {
+                    q.Number,
+                    q.ItemCode,
+                    q.FromPackingCode,
+                    q.FromLocationCode,
+                    q.ToLocationCode,
+                    q.FromLot,
+                    q.FromStatus
+                }).IsUnique();
+        });
+    }
+}
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Notes/MesNotes/MesNoteEfCoreRepository.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Notes/MesNotes/MesNoteEfCoreRepository.cs
@ -0,0 +1,11 @@
+using Volo.Abp.EntityFrameworkCore;
+using Win_in.Sfs.Wms.Store.Domain;
+
+namespace Win_in.Sfs.Wms.Store.EntityFrameworkCore;
+
+public class MesNoteEfCoreRepository : SfsStoreEfCoreRepositoryBase<StoreDbContext, MesNote>, IMesNoteRepository
+{
+    public MesNoteEfCoreRepository(IDbContextProvider<StoreDbContext> dbContextProvider) : base(dbContextProvider)
+    {
+    }
+}