wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加载具导入功能

Browse Source
This commit is contained in:
FanLian
2023-08-08 09:15:17 +08:00
parent 744d053801
commit fabf6a2f4e
4 changed files with 23 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/ModuleConsts.cs
View File

@@ -164,5 +164,9 @@ public class ModuleConsts
/// 模块标识-载具台账
/// </summary>
public const string MODULE_WMSCARRY_ID = "26038721525029";
/// <summary>
/// 模块标识-仓库定义
/// </summary>
public const string MODULE_WMSWAREHOUSEDEFINITION_ID = "25905106252053";
}

6
WarehouseMgr/Tnb.WarehouseMgr/BaseWareHouseService.cs
View File

@@ -124,7 +124,7 @@ namespace Tnb.WarehouseMgr
ICellStyle style = workbook.CreateCellStyle();
IFont font = workbook.CreateFont();
font.Color = IndexedColors.Red.Index; // 将字体颜色设置为红色
font.Color = IndexedColors.Black.Index; // 将字体颜色设置为红色
style.SetFont(font);
var nameRow = sheet?.GetRow(0);
if (nameRow != null)
@@ -132,6 +132,10 @@ namespace Tnb.WarehouseMgr
Dictionary<string, object> dic = new Dictionary<string, object>();
List<string> columns = new List<string>();
columns = nameRow.Cells.Select(x => x.StringCellValue).ToList();
columns.ForEach(x => {
var strings =x.Split(new char[2] { '(', ')' });
x = strings[1];
});
if (columns?.Count > 0)
{
for (rowIndex = 1; rowIndex <= sheet?.LastRowNum; rowIndex++)

17
WarehouseMgr/Tnb.WarehouseMgr/WmsCarryLedgerService.cs
View File

@@ -48,6 +48,11 @@ namespace Tnb.WarehouseMgr
OverideFuncs.ImportAsync = DataImport;
}
/// <summary>
/// 载具导入
/// </summary>
/// <param name="file"></param>
/// <returns></returns>
private async Task<dynamic> DataImport(IFormFile file)
{
int row = 0;
@@ -65,9 +70,10 @@ namespace Tnb.WarehouseMgr
string carryStdId = string.Empty;
foreach (var d in dics)
{
var stdCodeKey = d["carrystd_code"].ToString();
var stdCodeKey = d["carrystd_id"].ToString();
carryStdId = carryStdDic.ContainsKey(stdCodeKey) ? carryStdDic[stdCodeKey]?.ToString() ?? "" : "";
d.Add("carrystd_id", carryStdId);
d.Add("carrystd_code", stdCodeKey??"");
d["carrystd_id"] = carryStdId;
locCodes.Add(d["location_code"]?.ToString() ?? string.Empty);
carryH = d.Adapt<WmsCarryH>();
carrys.Add(carryH);
@@ -80,17 +86,22 @@ namespace Tnb.WarehouseMgr
var c = carrys.Find(x => x.location_code == loc);
if (c != null)
c.location_id = locs[loc].ToString();
}
}
carrys.ForEach(x =>
{
x.id = SnowflakeIdHelper.NextId();
x.org_id = _userManager.User.OrganizeId;
x.status = 1;
x.is_lock = 0;
x.carry_status = ((int)EnumCarryStatus.空闲).ToString();
x.out_status = ((int)EnumOutStatus.正常).ToString();
x.is_check = 0;
x.is_check = 1;
x.create_id = _userManager.UserId;
x.create_time = DateTime.Now;
x.modify_id = null;
x.modify_time = null;
});
}
await _db.Ado.BeginTranAsync();

63
WarehouseMgr/Tnb.WarehouseMgr/WmsImportAndExportService.cs
View File

@@ -61,68 +61,5 @@ namespace Tnb.WarehouseMgr
return fileStreamResult;
}
/// <summary>
/// 载具导入
/// </summary>
/// <param name="file"></param>
/// <returns></returns>
[HttpPost]
public async Task<dynamic> CarryImport(IFormFile file)
{
int row = 0;
try
{
//例1 获取所有表
List<Dictionary<string, object>> dics = await ImportExcelToMemory(file);
List<WmsCarryH> carrys = new List<WmsCarryH>();
var carryStdDic = await _db.Queryable<WmsCarrystd>().ToDictionaryAsync(x => x.carrystd_code, x => x.id);
List<string> locCodes = new();
WmsCarryH carryH = new WmsCarryH();
if (carryStdDic?.Count > 0)
{
string carryStdId = string.Empty;
foreach (var d in dics)
{
var stdCodeKey = d["carrystd_code"].ToString();
carryStdId = carryStdDic.ContainsKey(stdCodeKey) ? carryStdDic[stdCodeKey]?.ToString() ?? "" : "";
d.Add("carrystd_id", carryStdId);
locCodes.Add(d["location_code"]?.ToString() ?? string.Empty);
carryH = d.Adapt<WmsCarryH>();
carrys.Add(carryH);
}
if (!locCodes.IsNullOrEmpty())
{
var locs = await _db.Queryable<BasLocation>().Where(it => locCodes.Contains(it.location_code)).ToDictionaryAsync(x => x.location_code, x => x.id);
foreach (var loc in locCodes)
{
var c = carrys.Find(x => x.location_code == loc);
if (c != null)
c.location_id = locs[loc].ToString();
}
}
carrys.ForEach(x =>
{
x.id = SnowflakeIdHelper.NextId();
x.is_lock = 0;
x.carry_status = ((int)EnumCarryStatus.空闲).ToString();
x.out_status = ((int)EnumOutStatus.正常).ToString();
x.is_check = 0;
x.create_id = _userManager.UserId;
x.create_time = DateTime.Now;
});
}
await _db.Ado.BeginTranAsync();
row = await _db.Insertable(carrys).ExecuteCommandAsync();
await _db.Ado.CommitTranAsync();
}
catch (Exception ex)
{
await _db.Ado.RollbackTranAsync();
Log.Error("导入失败", ex);
throw Oops.Bah("导入失败");
}
return row > 0;
}
}
}