From 1d5806bb69891d4045438b12c15cd42cc937e5a2 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 24 4月 2024 11:14:24 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/iWare_RawMaterialWarehouse
---
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/WmsMaterialService.cs | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/WmsMaterialService.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/WmsMaterialService.cs
index bc3e25c..ce56c81 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/WmsMaterialService.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/WmsMaterialService.cs
@@ -166,9 +166,10 @@
public async Task<List<WmsMaterialOutput>> List([FromQuery] WmsMaterialInput input)
{
return await _wmsMaterialRep.DetachedEntities.ProjectToType<WmsMaterialOutput>().ToListAsync();
- }
+ }
#region 澧炪�佸垹銆佹敼
+
/// <summary>
/// 澧炲姞鐗╂枡淇℃伅琛�
@@ -176,10 +177,19 @@
/// <param name="input"></param>
/// <returns></returns>
[HttpPost("WmsMaterial/add")]
- public async Task Add(AddWmsMaterialInput input)
+ public async Task Add(AddWmsMaterialInfoInput input)
{
- var wmsMaterial = input.Adapt<WmsMaterial>();
- //楠岃瘉
+
+
+ //鐗╂枡淇℃伅
+ var wmsMaterial = input.MaterialInput.Adapt<WmsMaterial>();
+ //鎺у埗瑙勫垯淇℃伅
+ var controlRuleld = input.ControlRuleld;
+ //鐗╂枡瀹㈡埛鍏宠仈淇℃伅
+ var materialCustomerList = input.MaterialCustomerList.Adapt<WmsMaterialCustomer>();
+ //鏇夸唬鍝佷俊鎭�
+ var substituteGoodList = input.SubstituteGoodList.Adapt<WmsSubstituteGood>();
+ //楠岃瘉
await CheckExisit(wmsMaterial);
wmsMaterial.CreatedUserId = wmsMaterial.UpdatedUserId = SysHelper.GetUserId();
--
Gitblit v1.9.3