From 548a14a16952e51c33aa046fc18e3e86a6576abb Mon Sep 17 00:00:00 2001
From: "boxu.zheng" <boxu.zheng@ccwin-in.com>
Date: Thu, 10 Aug 2023 10:36:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=E5=BA=93=E4=BD=8D?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MaterialRequestAppService.cs              | 24 ++++++++++++++-----
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/MaterialRequestAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/MaterialRequestAppService.cs
index b1d0efd78..9874ee8db 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/MaterialRequestAppService.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/MaterialRequestAppService.cs
@@ -133,6 +133,11 @@ public class MaterialRequestAppService : SfsStoreRequestAppServiceBase<MaterialR
         {
             throw new UserFriendlyException($"库位代码为【{LocationCode}】不存在");
         }
+
+        if (LocationDto.Type == EnumLocationType.WIP)
+        {
+            throw new UserFriendlyException($"库位代码【{LocationCode}】不是【{EnumLocationType.WIP.GetDisplayName()}】类型");
+        }
     }
 
 
@@ -212,7 +217,11 @@ public class MaterialRequestAppService : SfsStoreRequestAppServiceBase<MaterialR
         foreach (var detailInput in input.Details)
         {
             var toLocationDto= await _locationAppService.GetByCodeAsync(detailInput.ToLocationCode).ConfigureAwait(false);
-            var productionLineDto=await _productionLineAppService.GetByLocationGroupCodeAsync(toLocationDto.LocationGroupCode).ConfigureAwait(false);
+            CheckLocation(toLocationDto, detailInput.ToLocationCode);
+            var itemBasicDto = await _itemBasicAppService.GetByCodeAsync(detailInput.ItemCode).ConfigureAwait(false);
+            CheckItemBasic(itemBasicDto, detailInput.ItemCode);
+
+            var productionLineDto = await _productionLineAppService.GetByLocationGroupCodeAsync(toLocationDto.LocationGroupCode).ConfigureAwait(false);
 
             detailInput.ToLocationCode = toLocationDto.ErpLocationCode;
             if (productionLineDto != null)
@@ -242,8 +251,6 @@ public class MaterialRequestAppService : SfsStoreRequestAppServiceBase<MaterialR
         return dto;
     }
 
-
-
     /// <summary>
     /// 创建并且执行叫料请求
     /// </summary>
@@ -272,10 +279,15 @@ public class MaterialRequestAppService : SfsStoreRequestAppServiceBase<MaterialR
             }
         }
 
-        foreach (var item in input.Details) //赋值生产线
+        foreach (var detailInput in input.Details) //赋值生产线
         {
-            var location = await LocationAclService.GetByCodeAsync(item.ToLocationCode).ConfigureAwait(false);
-            item.ProdLine = location.LocationGroupCode;
+            var toLocationDto = await _locationAppService.GetByCodeAsync(detailInput.ToLocationCode).ConfigureAwait(false);
+            CheckLocation(toLocationDto, detailInput.ToLocationCode);
+            var itemBasicDto = await _itemBasicAppService.GetByCodeAsync(detailInput.ItemCode).ConfigureAwait(false);
+            CheckItemBasic(itemBasicDto, detailInput.ItemCode);
+
+            var location = await LocationAclService.GetByCodeAsync(detailInput.ToLocationCode).ConfigureAwait(false);
+            detailInput.ProdLine = location.LocationGroupCode;
             input.ProdLine = location.LocationGroupCode;
             input.Worker = input.Worker;
         }