bug修改

be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/PositionCodes/PositionCodeAppService.cs

@@ -56,14 +56,14 @@ public class PositionCodeAppService
         var existEntity = await GetByCodeAsync(input.Code).ConfigureAwait(false);
         if (existEntity != null)
         {
-            throw new UserFriendlyException($"{input.Code} 已存在");
+            throw new UserFriendlyException($"位置码{input.Code} 已存在！");
         }
 
-        var itemEntity = await _repository.FirstOrDefaultAsync(p => p.PartCode == input.PartCode).ConfigureAwait(false);
-        if(itemEntity != null)
-        {
-            throw new UserFriendlyException($"{input.PartCode} 物品已存在");
-        }
+        //var itemEntity = await _repository.FirstOrDefaultAsync(p =>p.LocationCode==input.LocationCode && p.PartCode == input.PartCode&&p.Type==input.Type).ConfigureAwait(false);
+        //if(itemEntity != null)
+        //{
+        //    throw new UserFriendlyException($"类型{input.Type.ToString()}物品{input.PartCode}目标库位{input.LocationCode}已存在！");
+        //}
 
         var itemBasic = await ItemBasicAppService.GetByCodeAsync(input.PartCode).ConfigureAwait(false);
         Check.NotNull(itemBasic, "ERP料号", $"物品 {input.PartCode} 不存在");

be/Modules/Shared/src/Win_in.Sfs.Shared.Domain.Shared/Enums/Inventory/EnumTransType.cs

@@ -174,8 +174,4 @@ public enum EnumTransType
     MesUnFreezed = 41,
 
 
-
-
-
-
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/InventoryInitialNotes/Inputs/InventoryInitialNoteImportInput.cs

@@ -10,6 +10,7 @@ public class InventoryInitialNoteImportInput : SfsStoreImportInputBase, IHasQty,
     /// 仓库代码
     /// </summary>
     [Display(Name = "仓库代码")]
+    [Required(ErrorMessage = "{0}是必填项")]
     public string WarehouseCode { get; set; }
 
     /// <summary>
@@ -22,6 +23,7 @@ public class InventoryInitialNoteImportInput : SfsStoreImportInputBase, IHasQty,
     /// ERP料号
     /// </summary>
     [Display(Name = "ERP料号")]
+    [Required(ErrorMessage = "{0}是必填项")]
     public string ItemCode { get; set; }
 
     /// <summary>
@@ -35,24 +37,28 @@ public class InventoryInitialNoteImportInput : SfsStoreImportInputBase, IHasQty,
     /// 单位
     /// </summary>
     [Display(Name = "单位")]
+    [Required(ErrorMessage = "{0}是必填项")]
     public string Uom { get; set; }
 
     /// <summary>
     /// 批次
     /// </summary>
     [Display(Name = "批次")]
+    [Required(ErrorMessage = "{0}是必填项")]
     public string Lot { get; set; }
 
     /// <summary>
     /// 库位代码
     /// </summary>
     [Display(Name = "库位代码")]
+    [Required(ErrorMessage = "{0}是必填项")]
     public string LocationCode { get; set; }
 
     /// <summary>
     /// ERP库位
     /// </summary>
     [Display(Name = "ERP库位")]
+    [Required(ErrorMessage = "{0}是必填项")]
     public string LocationErpCode { get; set; }
 
     /// <summary>
@@ -72,11 +78,13 @@ public class InventoryInitialNoteImportInput : SfsStoreImportInputBase, IHasQty,
     /// 库区
     /// </summary>
     [Display(Name = "库区")]
+    [Required(ErrorMessage = "{0}是必填项")]
     public string LocationArea { get; set; }
 
     /// <summary>
     /// 库位组
     /// </summary>
     [Display(Name = "库位组")]
+    [Required(ErrorMessage = "{0}是必填项")]
     public string LocationGroup { get; set; }
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/SparePartIssueRequests/Inputs/SparePartIssueRequestImportInput.cs

@@ -13,18 +13,21 @@ public class SparePartIssueRequestImportInput : SfsStoreImportInputBase
     /// ERP料号
     /// </summary>
     [Display(Name = "ERP料号")]
+    [Required(ErrorMessage = "{0}是必填项")]
     public string ItemCode { get; set; }
 
     /// <summary>
     /// 需求数量
     /// </summary>
     [Display(Name = "需求数量")]
+    [Required(ErrorMessage = "{0}是必填项")]
     public decimal Qty { get; set; }
 
     /// <summary>
     /// 目标库位
     /// </summary>
     [Display(Name = "目标库位")]
+    [Required(ErrorMessage = "{0}是必填项")]
     [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
     public string ToLocationCode { get; set; }
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobAppService.cs

@@ -235,7 +235,9 @@ public class AssembleIssueJobAppService
         issueJobDetail.HandledToQty += issueJobDetailDto.HandledToQty;
         issueJobDetail.HandledFromQty += issueJobDetailDto.HandledFromQty;
         assembleIssueJob.Details = new EditableList<AssembleIssueJobDetail> { issueJobDetail };
-
+        assembleIssueJob.CompleteUserId = _currentUser.Id;
+        assembleIssueJob.CompleteUserName = _currentUser.Name;
+        assembleIssueJob.CompleteTime = DateTime.Now;
         if (assembleIssueJob.EnumIssueSendType == EnumIssueSendType.BoxQtyType) //按箱叫料 因为任务只有1箱 所以可以直接完成
         {
             if (issueJobDetailDto.RecommendToPackingCode != issueJobDetailDto.HandledToPackingCode)

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobAppService.cs

@@ -249,7 +249,9 @@ public class CoatingIssueJobAppService
         issueJobDetail.HandledToQty += issueJobDetailDto.HandledToQty;
         issueJobDetail.HandledFromQty += issueJobDetailDto.HandledFromQty;
         coatingIssueJob.Details = new EditableList<CoatingIssueJobDetail> { issueJobDetail };
-
+        coatingIssueJob.CompleteUserId = _currentUser.Id;
+        coatingIssueJob.CompleteUserName = _currentUser.Name;
+        coatingIssueJob.CompleteTime = DateTime.Now;
         if (coatingIssueJob.EnumIssueSendType == EnumIssueSendType.BoxQtyType) //按箱叫料 因为任务只有1箱 所以可以直接完成
         {
             if (issueJobDetailDto.RecommendToPackingCode != issueJobDetailDto.HandledToPackingCode)

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/InjectionIssueJobs/InjectionIssueJobAppService.cs

@@ -227,7 +227,9 @@ public class InjectionIssueJobAppService
         issueJobDetail.HandledToQty += issueJobDetailDto.HandledToQty;
         issueJobDetail.HandledFromQty += issueJobDetailDto.HandledFromQty;
         injectionIssueJob.Details = new EditableList<InjectionIssueJobDetail> { issueJobDetail };
-
+        injectionIssueJob.CompleteUserId = _currentUser.Id;
+        injectionIssueJob.CompleteUserName = _currentUser.Name;
+        injectionIssueJob.CompleteTime = DateTime.Now;
         if (injectionIssueJob.EnumIssueSendType == EnumIssueSendType.BoxQtyType) //按箱叫料 因为任务只有1箱 所以可以直接完成
         {
             if (issueJobDetailDto.RecommendToPackingCode != issueJobDetailDto.HandledToPackingCode)

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs

@@ -226,7 +226,9 @@ public class KittingIssueJobAppService
         issueJobDetail.HandledToQty += issueJobDetailDto.HandledToQty;
         issueJobDetail.HandledFromQty += issueJobDetailDto.HandledFromQty;
         kittingIssueJob.Details = new EditableList<KittingIssueJobDetail> { issueJobDetail };
-
+        kittingIssueJob.CompleteUserId = _currentUser.Id;
+        kittingIssueJob.CompleteUserName = _currentUser.Name;
+        kittingIssueJob.CompleteTime = DateTime.Now;
         if (kittingIssueJob.EnumIssueSendType == EnumIssueSendType.BoxQtyType) //按箱叫料 因为任务只有1箱 所以可以直接完成
         {
             if (issueJobDetailDto.RecommendToPackingCode != issueJobDetailDto.HandledToPackingCode)

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/SparePartIssueJobs/SparePartIssueJobAppService.cs

@@ -219,7 +219,9 @@ public class SparePartIssueJobAppService
         issueJobDetail.HandledToQty += issueJobDetailDto.HandledToQty;
         issueJobDetail.HandledFromQty += issueJobDetailDto.HandledFromQty;
         sparePartIssueJob.Details = new EditableList<SparePartIssueJobDetail> { issueJobDetail };
-
+        sparePartIssueJob.CompleteUserId = _currentUser.Id;
+        sparePartIssueJob.CompleteUserName = _currentUser.Name;
+        sparePartIssueJob.CompleteTime = DateTime.Now;
         if (sparePartIssueJob.EnumIssueSendType == EnumIssueSendType.BoxQtyType) //按箱叫料 因为任务只有1箱 所以可以直接完成
         {
             if (issueJobDetailDto.RecommendToPackingCode != issueJobDetailDto.HandledToPackingCode)

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/InventoryInitialNotes/InventoryInitialNoteAppService.cs

@@ -61,6 +61,10 @@ public class InventoryInitialNoteAppService :
             request.ActiveDate = DateTime.Now;
             foreach (var detail in request.Details)
             {
+                if (string.IsNullOrEmpty(detail.PackingCode))
+                {
+                    detail.PackingCode = "";
+                }
                 var itemBasicDto = await _itemBasicAppService.GetByCodeAsync(detail.ItemCode).ConfigureAwait(false);
                 CheckItemBasic(itemBasicDto, detail.ItemCode);
                 detail.ItemDesc1 = itemBasicDto.Desc1;