From 0b9cc0e4fce1170a32f2040d27288ab5c1b62cc7 Mon Sep 17 00:00:00 2001
From: lvzb <35200379@qq.com>
Date: Thu, 11 Jul 2024 13:22:43 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ItemContainers/ItemContainerAppService.cs   | 17 +++++++++++++++--
 .../PositionCodes/PositionCodeAppService.cs     |  5 +++--
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/ItemContainers/ItemContainerAppService.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/ItemContainers/ItemContainerAppService.cs
index 10ba51340..37792339b 100644
--- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/ItemContainers/ItemContainerAppService.cs
+++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/ItemContainers/ItemContainerAppService.cs
@@ -5,6 +5,7 @@ using System.Threading.Tasks;
 
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
 using Volo.Abp;
 using Volo.Abp.Caching;
 using Volo.Abp.Domain.Repositories;
@@ -39,7 +40,19 @@ public class ItemContainerAppService
         _repository = repository;
         _manager = manager;
     }
-
+    protected override async Task<Dictionary<ItemContainer, EntityState>> ImportProcessingEntityAsync( Dictionary<ItemContainer, EntityState> dictionary)
+    {
+        var addList = dictionary.Where(p => p.Value == EntityState.Added).Select(p => p.Key);
+        foreach (var itemContainer in addList)
+        {
+            if (string.IsNullOrEmpty(itemContainer.BasicUom))
+            {
+                var itemBasic = await ItemBasicAppService.GetByCodeAsync(itemContainer.ItemCode).ConfigureAwait(false);
+                itemContainer.BasicUom = itemBasic.BasicUom;
+            }         
+        }
+        return dictionary;
+    }
     /// <summary>
     /// 用来重写 新增实体
     /// </summary>
@@ -86,7 +99,7 @@ public class ItemContainerAppService
     {
         //20240520苑静雯删除
         await base.CheckItemBasicItemCodeAsync(importInput.ItemCode, validationRresult).ConfigureAwait(false);
-       // await base.CheckItemBasicPackUomAsync(importInput.ItemCode, importInput.BasicUom, validationRresult).ConfigureAwait(false);
+        //await base.CheckItemBasicPackUomAsync(importInput.ItemCode, importInput.BasicUom, validationRresult).ConfigureAwait(false);
         //await base.CheckItemContainerAsync(importInput.ContainerCode, validationRresult).ConfigureAwait(false);
     }
 
diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/PositionCodes/PositionCodeAppService.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/PositionCodes/PositionCodeAppService.cs
index 4365fbf6c..95d6ed088 100644
--- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/PositionCodes/PositionCodeAppService.cs
+++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/PositionCodes/PositionCodeAppService.cs
@@ -95,10 +95,10 @@ public class PositionCodeAppService
         {
             throw new UserFriendlyException($"{id} 未找到位置码信息");
         }
-        var itemEntity = await _repository.FirstOrDefaultAsync(p => p.PartCode == input.PartCode && p.Code!=input.Code).ConfigureAwait(false);
+        var itemEntity = await _repository.FirstOrDefaultAsync(p => p.PartCode == input.PartCode && p.Code==input.Code).ConfigureAwait(false);
         if (itemEntity != null)
         {
-            throw new UserFriendlyException($"{input.PartCode} 物品已存在");
+            throw new UserFriendlyException($"位置码{input.Code}已存在物品{input.PartCode}的信息 ");
         }
         
 
@@ -142,6 +142,7 @@ public class PositionCodeAppService
             var itemBasic = await ItemBasicAppService.GetByCodeAsync(positionCode.PartCode).ConfigureAwait(false);
             positionCode.PartName = itemBasic.Name;
             positionCode.PartDesc = itemBasic.Desc1;
+            if (string.IsNullOrEmpty(positionCode.BasicUom)) positionCode.BasicUom = itemBasic.BasicUom;
             switch (positionCode.Type)
             {   
                 case EnumPositionCodeType.InjectionIssue: