From a44d4ac81a863fb3b93e1c8ad8526ef754c24615 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期三, 18 十二月 2024 09:08:01 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/MaterielInfoService.cs | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/MaterielInfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/MaterielInfoService.cs"
index e419149..17c4dbe 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/MaterielInfoService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/MaterielInfoService.cs"
@@ -9,6 +9,7 @@
using WIDESEA_Core;
using WIDESEA_Core.BaseServices;
using WIDESEA_DTO.Basic;
+using WIDESEA_DTO.ERP;
using WIDESEA_IBasicRepository;
using WIDESEA_IBasicService;
using WIDESEA_Model.Models;
@@ -66,6 +67,12 @@
{
try
{
+ Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseCode == model.WaId);
+ if (warehouse == null)
+ {
+ return WebResponseContent.Instance.Error($"鏈壘鍒颁粨搴撲俊鎭�");
+ }
+
if (model.OperateType == 0)
{
Dt_MaterielInfo materielInfo = new Dt_MaterielInfo()
@@ -78,14 +85,14 @@
MaterielName = model.Name,
MaterielSize = model.Size,
MaterielSourceType = (MaterielSourceTypeEnum)model.ItemSourceType,
- MaterielSpec = "model.",
+ MaterielSpec = model.StandType,
MaterielState = (EnableEnum)model.State,
MaterielThickness = model.Thickness,
MaterielType = (MaterielTypeEnum)model.ItemType,
MaterielUnit = model.Unit,
MaterielVersion = model.MaterialVersion,
MaterielWide = model.Wide,
- WarehouseId = model.WaId,
+ WarehouseId = warehouse.WarehouseId,
};
BaseDal.AddData(materielInfo);
}
@@ -112,7 +119,7 @@
materielInfo.MaterielUnit = model.Unit;
materielInfo.MaterielVersion = model.MaterialVersion;
materielInfo.MaterielWide = model.Wide;
- materielInfo.WarehouseId = model.WaId;
+ materielInfo.WarehouseId = warehouse.WarehouseId;
BaseDal.UpdateData(materielInfo);
}
else if (model.OperateType == 2)
--
Gitblit v1.9.3