From 17c0c88cb5419351e4f0bf498e4b9535c5b39197 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周日, 11 5月 2025 21:55:40 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo
---
HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialStockAppService.cs | 28 ++++++++++++++++++++--------
1 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialStockAppService.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialStockAppService.cs
index 87b4765..491abba 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialStockAppService.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialStockAppService.cs
@@ -90,10 +90,10 @@
throw new UserFriendlyException("鐗╂枡淇℃伅涓嶅瓨鍦�");
}
var container = await _wmscontainerRepository.FindByNameAsync(input.ContainerNo);
- if (container == null)
- {
- throw new UserFriendlyException("鎵樼洏淇℃伅涓嶅瓨鍦�");
- }
+ //if (container == null)
+ //{
+ // throw new UserFriendlyException("鎵樼洏淇℃伅涓嶅瓨鍦�");
+ //}
var wmsmaterialstock = ObjectMapper.Map<WmsMaterialStockCreateDto, WmsMaterialStock>(input);
input.MapExtraPropertiesTo(wmsmaterialstock, MappingPropertyDefinitionChecks.None);
@@ -101,7 +101,7 @@
wmsmaterialstock.MaterialName = material.MaterialName;
wmsmaterialstock.ContainerStatus = Domain.Shared.Enums.ContainerStatusEnum.KUWEI;
- wmsmaterialstock.ContainerType = container.ContainerType;
+ wmsmaterialstock.ContainerType = container == null ? Domain.Shared.Enums.ContainerTypeEnum.XUNI : container.ContainerType;
wmsmaterialstock.StorageTypeNo = Domain.Shared.Enums.PlaceTypeEnum.XUNIKUWEI;
wmsmaterialstock.PlaceStatus = Domain.Shared.Enums.PlaceStatusEnum.DAIRU;
if (!string.IsNullOrEmpty(input.PlaceNo))
@@ -158,10 +158,22 @@
await _wmsmaterialstockRepository.InsertManyAsync(stockList);
+ if (container == null)
+ {
+ container = new WmsContainer
+ {
+ ContainerNo = input.ContainerNo,
+ ContainerType = Domain.Shared.Enums.ContainerTypeEnum.XUNI,
+ ContainerStatus = Domain.Shared.Enums.ContainerStatusEnum.KUWEI,
+ };
+ var result = await _wmscontainerRepository.InsertAsync(container);
+ }
+ else
+ {
+ container.ContainerStatus = Domain.Shared.Enums.ContainerStatusEnum.KUWEI;
- container.ContainerStatus = Domain.Shared.Enums.ContainerStatusEnum.KUWEI;
-
- await _wmscontainerRepository.UpdateAsync(container);
+ await _wmscontainerRepository.UpdateAsync(container);
+ }
//if (input.Sort.HasValue && wmsmaterialstock.Sort != maxSort)
//{
--
Gitblit v1.9.3