From 277609ae33b198900e926fe5246e778e0ce7fef2 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周四, 08 5月 2025 18:44:39 +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 | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 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 98eb755..a03b0b0 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialStockAppService.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialStockAppService.cs
@@ -104,6 +104,15 @@
{
throw new UserFriendlyException("搴撲綅搴撳尯淇℃伅涓嶅瓨鍦�");
}
+ var wmsmaterialstockList = await _wmsmaterialstockRepository.GetStockListAsync(new WmsMaterialStock { PlaceNo = input.PlaceNo });
+ if (wmsmaterialstockList.Count > 0)
+ {
+ if (wmsmaterialstockList[0].MaterialNo != input.MaterialNo)
+ {
+ throw new UserFriendlyException("褰撳墠搴撲綅宸插瓨鏀惧埆鐨勭墿鏂�");
+ }
+ }
+
var maxSort = await _wmsmaterialstockRepository.GetMaxSortAsync();
var sort = input.Sort ?? maxSort;
var wmsmaterialstock = ObjectMapper.Map<WmsMaterialStockCreateDto, WmsMaterialStock>(input);
@@ -133,7 +142,7 @@
stock = JsonSerializer.Deserialize<WmsMaterialStock>(json);
stock.MaterialId = Guid.NewGuid().ToString("N");
stock.StockNumber = 1;
- stockList.Add(stock);
+ stockList.Add(stock);
}
await _wmsmaterialstockRepository.InsertManyAsync(stockList);
@@ -146,10 +155,10 @@
await _wmscontainerRepository.UpdateAsync(container);
await _wmsplaceRepository.UpdateAsync(place);
- if (input.Sort.HasValue && wmsmaterialstock.Sort != maxSort)
- {
- await AdjustSortAsync(wmsmaterialstock.Id, wmsmaterialstock.Sort);
- }
+ //if (input.Sort.HasValue && wmsmaterialstock.Sort != maxSort)
+ //{
+ // await AdjustSortAsync(wmsmaterialstock.Id, wmsmaterialstock.Sort);
+ //}
await uow.SaveChangesAsync();
await uow.CompleteAsync();
return ObjectMapper.Map<WmsMaterialStock, WmsMaterialStockDto>(wmsmaterialstock);
--
Gitblit v1.9.3