更新版本

be/Hosts/Basedata.Host/Win_in.Sfs.Basedata.HttpApi.Host/Properties/PublishProfiles/FolderProfile.pubxml

@@ -10,7 +10,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
     <LastUsedPlatform>Any CPU</LastUsedPlatform>
     <PublishProvider>FileSystem</PublishProvider>
-    <PublishUrl>D:\发布\WMS</PublishUrl>
+    <PublishUrl>C:\发布\WMS</PublishUrl>
     <WebPublishMethod>FileSystem</WebPublishMethod>
     <SiteUrlToLaunchAfterPublish />
     <TargetFramework>net6.0</TargetFramework>

be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Equipments/Inputs/EquipmentImportInput.cs

@@ -36,11 +36,6 @@ public class EquipmentImportInput : SfsBaseDataImportInputBase
     [Display(Name = "状态")]
     public int State { get; set; } = 0;
     /// <summary>
-    /// 备注
-    /// </summary>
-    [Display(Name = "备注")]
-    public string Remark { get; set; } = string.Empty;
-    /// <summary>
     ///  创建人
     /// </summary>
     [Display(Name = "创建人")]

be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/Equipments/EquipmentAppService.cs

@@ -227,6 +227,7 @@ public class EquipmentAppService
     public virtual async Task UpsertAsync(EquipmentEditInput input)
     {
         var entity = ObjectMapper.Map<EquipmentEditInput, Equipment>(input);
+
         await _repository.UpsertAsync(entity).ConfigureAwait(false);
     }
 
@@ -238,6 +239,9 @@ public class EquipmentAppService
         if (first == null)
         {
             var entity = ObjectMapper.Map<EquipmentEditInput, Equipment>(input);
+            entity.Code = string.Format("{0}{1}", "Q", entity.Code);
+            entity.Model = "Q";
+
             await _repository.UpsertAsync(entity).ConfigureAwait(false);
             var entity1=_repository.WithDetails().FirstOrDefault(p => p.Code == input.Code);
             return ObjectMapper.Map<Equipment,EquipmentDTO>(entity1);

be/Modules/BaseData/src/Win_in.Sfs.Basedata.EntityFrameworkCore/Kittings/KittingDbContextModelCreatingExtensions.cs

@@ -43,7 +43,7 @@ public static class KittingDbContextModelCreatingExtensions
             
             b.Property(p => p.Desc1).HasMaxLength(SfsPropertyConst.DescLength);
             //Properties
-            b.Property(q => q.Desc2).IsRequired().HasMaxLength(SfsPropertyConst.CodeLength);
+            b.Property(q => q.Desc2).HasMaxLength(SfsPropertyConst.CodeLength);
             //Relations
             b.Property(q => q.MasterId).IsRequired();
             //Indexes

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Equipments/IEquipmentRecordAppService.cs

@@ -7,7 +7,7 @@ namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
 public interface IEquipmentRecordAppService
     :
-   // ,ISfsStoreMasterAppServiceBase<EquipmentRecordDTO, SfsStoreRequestInputBase, EquipmentRecordEditInput, EquipmentRecordDTO, SfsStoreRequestInputBase>
+   ISfsStoreMasterAppServiceBase<EquipmentRecordDTO, SfsStoreRequestInputBase, EquipmentRecordEditInput, EquipmentRecordDTO, SfsStoreRequestInputBase>,
          ISfsCheckStatusAppService
         , ISfsUpsertAppService<EquipmentRecordEditInput>
 {

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Equipments/EquipmentAppService.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Equipments/EquipmentRecordAppService.cs

@@ -10,6 +10,8 @@ using Volo.Abp;
 using Volo.Abp.Domain.Entities;
 using Volo.Abp.Domain.Repositories;
 using Volo.Abp.ObjectMapping;
+using Win_in.Sfs.Shared.Application;
+using Win_in.Sfs.Shared.Application.Contracts;
 using Win_in.Sfs.Store.Application.Contracts;
 using Win_in.Sfs.Wms.Store.Application.Contracts;
 using Win_in.Sfs.Wms.Store.Domain;
@@ -19,9 +21,9 @@ using Win_in.Sfs.Wms.Store.Equipments;
 namespace Win_in.Sfs.Wms.Store.Application;
 
 [Authorize]
-[Route($"{StoreConsts.RootPath}Equipment")]
+[Route($"{StoreConsts.RootPath}EquipmentRecord")]
 public class EquipmentRecordAppService
-    : SfsStoreAppServiceBase<EquipmentRecord, EquipmentRecordDTO, SfsStoreRequestInputBase, EquipmentRecordEditInput,
+    : SfsCrudAppServiceBase<EquipmentRecord, EquipmentRecordDTO, SfsStoreRequestInputBase, EquipmentRecordEditInput,
             ExchangeDataImportInput>
         , IEquipmentRecordAppService
 
@@ -41,17 +43,38 @@ public class EquipmentRecordAppService
         _repository = repository;
     }
 
-    
+    public Task AddDetailListAsync(Guid id, List<EquipmentRecordDTO> list)
+    {
+        throw new NotImplementedException();
+    }
+
     public Task CheckStatusAsync(string number)
     {
         throw new NotImplementedException();
     }
 
+    public Task<List<EquipmentRecordDTO>> GetDetailListAsync(Guid id, SfsStoreRequestInputBase requestInput)
+    {
+        throw new NotImplementedException();
+    }
+
+    public Task UpdateDetailAsync(Guid id, Guid detailId, EquipmentRecordDTO updateDTO)
+    {
+        throw new NotImplementedException();
+    }
+
     public Task UpsertAsync(EquipmentRecordEditInput input)
     {
         throw new NotImplementedException();
     }
 
+    Task<EquipmentRecordDTO> ISfsReadOnlyWithDetailsAppService<EquipmentRecordDTO, SfsStoreRequestInputBase, EquipmentRecordDTO, SfsStoreRequestInputBase>.GetDetailAsync(Guid id, Guid detailId)
+    {
+        throw new NotImplementedException();
+    }
+
+
+
     //[HttpGet("by-batchsize")]
     //public virtual async Task<List<EquipmentRecordDTO>> GetToBeProcessedListAsync(int batchSize)
     //{