This commit is contained in:
2026-05-20 14:58:26 +08:00
parent 2b1edf17c1
commit 2e2dd81c16
15 changed files with 462 additions and 818 deletions
+19 -18
View File
@@ -273,12 +273,12 @@ namespace BLL
if (!string.IsNullOrEmpty(errorWarehouseCode))
{
if (temeplateDtoIns.Count == 0)
{
//if (temeplateDtoIns.Count == 0)
//{
responeData.code = 0;
responeData.message = errorWarehouseCode + "仓库不存在!";
return responeData;
}
//}
}
var typeString = temeplateDtoIns.Select(x => x.TypeString).Distinct().ToList(); //获取导入文件的类型
if (typeString.Where(x => string.IsNullOrEmpty(x)).Count() > 0)
@@ -295,21 +295,21 @@ namespace BLL
}
var materialCodeList = temeplateDtoIns.Select(x => x.MaterialCode).Distinct().ToList(); //获取导入文件的材料编码
var IsExitMaterialCode =
from x in Funs.DB.HJGL_MaterialCodeLib
where materialCodeList.Contains(x.MaterialCode)
select x.MaterialCode;
if (IsExitMaterialCode.Count() < materialCodeList.Count)
{
var errorMaterialCode = materialCodeList.Except(IsExitMaterialCode.ToList());
if (errorMaterialCode.Count() > 0)
{
responeData.code = 0;
responeData.message = string.Join(",", errorMaterialCode) + "材料不存在!";
return responeData;
}
}
//var materialCodeList = temeplateDtoIns.Select(x => x.MaterialCode).Distinct().ToList(); //获取导入文件的材料编码
//var IsExitMaterialCode =
// from x in Funs.DB.HJGL_MaterialCodeLib
// where materialCodeList.Contains(x.MaterialCode)
// select x.MaterialCode;
//if (IsExitMaterialCode.Count() < materialCodeList.Count)
//{
// var errorMaterialCode = materialCodeList.Except(IsExitMaterialCode.ToList());
// if (errorMaterialCode.Count() > 0)
// {
// responeData.code = 0;
// responeData.message = string.Join(",", errorMaterialCode) + "材料不存在!";
// return responeData;
// }
//}
string cusbilcode = GetDataInCusBillCode(projectid, UnitService.GetUnitCodeByUnitId(Person_PersonsService.GetPerson_PersonsById(creatUserId).UnitId), temeplateDtoIns.FirstOrDefault().TypeString);
foreach (var item in temeplateDtoIns)
{
@@ -367,6 +367,7 @@ namespace BLL
twInOutPlanMaster.CreateDate = DateTime.Now;
twInOutPlanMaster.Remark = OriFileName;
Add(twInOutPlanMaster);
MaterialCodeLibService.AddList(temeplateDtoIns); //插入材料编码库
TwInOutplandetailService.AddList(twInOutPlanDetails, twInOutPlanMaster.Id); //插入入库明细
}