From 1cab3c66faf50250b1670cb749a88fcf28bbfe75 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周五, 16 5月 2025 17:52:05 +0800
Subject: [PATCH] 托盘号
---
HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialStockAppService.cs | 35 +++++++++++++++++++----------------
1 files changed, 19 insertions(+), 16 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 60d1674..8959e82 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialStockAppService.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialStockAppService.cs
@@ -188,18 +188,33 @@
}
var palceInfo = await _wmsplaceRepository.FindByNameAsync(input.PlaceNo);
- var container = await _wmscontainerRepository.FindByNameAsync(input.ContainerNo);
//if (container == null)
//{
// throw new UserFriendlyException("鎵樼洏淇℃伅涓嶅瓨鍦�");
//}
- input.ContainerNo = string.IsNullOrEmpty(input.ContainerNo) ? "TP_" + DateTime.Now.ToString("yyMMddHHmmssfff") : input.ContainerNo;
+ input.ContainerNo = string.IsNullOrEmpty(input.ContainerNo) ? "TP_" + "yyMMddHHmmssfff" : input.ContainerNo;
var wmsmaterialstock = ObjectMapper.Map<WmsMaterialStockCreateDto, WmsMaterialStock>(input);
input.MapExtraPropertiesTo(wmsmaterialstock, MappingPropertyDefinitionChecks.None);
wmsmaterialstock.MaterialId = Guid.NewGuid().ToString("N");
wmsmaterialstock.MaterialNo = material.MaterialNo;
wmsmaterialstock.MaterialName = material.MaterialName;
+
+ var wmsmaterialstockList = await _wmsmaterialstockRepository.GetStockListAsync(new WmsMaterialStock { PlaceNo = input.PlaceNo });
+ if (wmsmaterialstockList.Count > 0)
+ {
+ if (wmsmaterialstock.StorageTypeNo == PlaceTypeEnum.YUANLIAOKUWEI)
+ {
+ wmsmaterialstock.ContainerNo = wmsmaterialstockList[0].ContainerNo;
+ input.ContainerNo = wmsmaterialstockList[0].ContainerNo;
+ }
+ if (wmsmaterialstockList[0].MaterialNo != material.MaterialNo)
+ {
+ throw new UserFriendlyException("褰撳墠搴撲綅宸插瓨鏀惧埆鐨勭墿鏂�");
+ }
+ }
+
+ var container = await _wmscontainerRepository.FindByNameAsync(input.ContainerNo);
wmsmaterialstock.ContainerStatus = ContainerStatusEnum.KUWEI;
wmsmaterialstock.ContainerType = container == null ? ContainerTypeEnum.XUNI : container.ContainerType;
@@ -228,19 +243,7 @@
await _wmsplaceRepository.UpdateAsync(place);
}
- var wmsmaterialstockList = await _wmsmaterialstockRepository.GetStockListAsync(new WmsMaterialStock { PlaceNo = input.PlaceNo });
- if (wmsmaterialstockList.Count > 0)
- {
- if(wmsmaterialstock.StorageTypeNo == PlaceTypeEnum.YUANLIAOKUWEI)
- {
- wmsmaterialstock.ContainerNo = wmsmaterialstockList[0].ContainerNo;
- input.ContainerNo = wmsmaterialstockList[0].ContainerNo;
- }
- if (wmsmaterialstockList[0].MaterialNo != material.MaterialNo)
- {
- throw new UserFriendlyException("褰撳墠搴撲綅宸插瓨鏀惧埆鐨勭墿鏂�");
- }
- }
+
var maxSort = await _wmsmaterialstockRepository.GetMaxSortAsync();
var sort = input.Sort ?? maxSort;
@@ -288,7 +291,7 @@
{
container = new WmsContainer
{
- ContainerNo = input.ContainerNo,
+ ContainerNo = wmsmaterialstock.ContainerNo,
ContainerType = Domain.Shared.Enums.ContainerTypeEnum.XUNI,
ContainerStatus = Domain.Shared.Enums.ContainerStatusEnum.KUWEI,
};
--
Gitblit v1.9.3