This commit is contained in:
2024-09-27 18:17:21 +08:00
parent be070f85e2
commit 064a849b97
73 changed files with 3248 additions and 589 deletions
+32 -7
View File
@@ -1,6 +1,7 @@
using EmitMapper;
using FineUIPro;
using Microsoft.Office.Interop.Word;
using Microsoft.SqlServer.Dts.Runtime;
using MiniExcelLibs;
using Model;
using NPOI.Util;
@@ -213,10 +214,6 @@ namespace BLL
responeData.message = "导入数据为空!";
return responeData;
}
var queryAll = new Tw_InOutMasterOutput()
{
ProjectId = projectid
};
var warehouseCodeList = temeplateDtoIns.Select(x => x.WarehouseCode).Distinct().ToList(); //获取导入文件的仓库编号
string errorWarehouseCode = "";
foreach (var item in warehouseCodeList)
@@ -251,7 +248,15 @@ namespace BLL
return responeData;
}
}
string cusbilcode = GetDataInCusBillCode(projectid,UnitService.GetUnitCodeByUnitId(Person_PersonsService.GetPerson_PersonsById(creatUserId).UnitId));
foreach (var item in temeplateDtoIns)
{
item.CusBillCode = cusbilcode;
}
/*var queryAll = new Tw_InOutMasterOutput()
{
ProjectId = projectid
};
var queryAllresult = GetModle(queryAll).Select(x => x.CusBillCode).Distinct().ToList();//查询所有的编号
var CusBillCodeList = temeplateDtoIns.Select(x => x.CusBillCode).Distinct().ToList(); //获取导入文件的编号
var IsContain = CusBillCodeList.Intersect(queryAllresult).ToList(); //判断导入文件中是有已存在的编号
@@ -260,7 +265,8 @@ namespace BLL
responeData.code = 0;
responeData.message = string.Join(",", IsContain)+ "编号已存在!";
return responeData;
}
}*/
var CusBillCodeList = temeplateDtoIns.Select(x => x.CusBillCode).Distinct().ToList(); //获取导入文件的编号
#endregion
//根据申请单编号分组插入数据
foreach (var CusBillCode in CusBillCodeList)
@@ -510,6 +516,23 @@ namespace BLL
return cusBillCode;
}
public static string GetDataInCusBillCode(string projectid, string unitcode)
{
//生成规则是20240919-unitcode-AP-GR01
string cusBillCode = string.Format("{0:yyyyMMdd}", DateTime.Now) + unitcode + "-AP-GR";
var queryAll = new Tw_InOutMasterOutput()
{
ProjectId = projectid,
CusBillCode=cusBillCode,
};
var queryAllresult = GetModle(queryAll).Count();
cusBillCode = cusBillCode + (queryAllresult + 1).ToString().PadLeft(2, '0');
return cusBillCode;
}
/// <summary>
/// 根据任务单生成出库计划单
/// </summary>
@@ -655,5 +678,7 @@ namespace BLL
}
}
}
}