18923810322/WMS-Api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'v1.0.5' of https://codeup.aliyun.com/62ce7bca487c500c27f70a79/OPS/WMS-Api into v1.0.5

Browse Source
This commit is contained in:
tongfei
2024-03-27 10:12:54 +08:00
parent ca3a43c775 ecf64bc0c9
commit 616fb43f57
22 changed files with 729 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/WMS.Web.Repositories/Configuration/RepositoryDbContext.cs
View File

@@ -66,18 +66,26 @@ namespace WMS.Web.Repositories.Configuration
v => JsonConvert.DeserializeObject<List<string>>(v));
});
#region 序列号
//序列号
builder.Entity<SerialNumbers>(ent =>
{
ent.ToTable("t_wms_serialnumbers");
ent.HasKey(x => x.Id);
});
//序列号
builder.Entity<SerialNumbers_Ops>(ent =>
{
ent.ToTable("t_wms_serialnumbers_ops");
ent.HasKey(x => x.Id);
});
//序列号操作记录
builder.Entity<SerialNumberOperate>(ent =>
{
ent.ToTable("t_wms_serialnumberoperate");
ent.HasKey(x => x.Id);
});
#endregion
//定时任务时间记录表
builder.Entity<ErpOpsSyncDate>(ent =>
@@ -397,6 +405,7 @@ namespace WMS.Web.Repositories.Configuration
public DbSet<BoxMark> BoxMark { get; set; }
public DbSet<FileDownManager> FileDownManager { get; set; }
public DbSet<SerialNumbers> SerialNumbers { get; set; }
public DbSet<SerialNumbers_Ops> SerialNumbers_Ops { get; set; }
public DbSet<ErpOpsSyncDate> ErpOpsSyncDate { get; set; }
public DbSet<SerialNumberOperate> SerialNumberOperate { get; set; }
public DbSet<ChangeBoxRecord> ChangeBoxRecord { get; set; }

4
src/WMS.Web.Repositories/OutStockRepositories.cs
View File

@@ -306,12 +306,12 @@ namespace WMS.Web.Repositories
/// </summary>
/// <param name="taskId"></param>
/// <returns></returns>
public async Task<OutStock> GetByTaskId(int taskId)
public async Task<List<OutStock>> GetByTaskId(int taskId)
{
var res = await _context.OutStock
.Include(s => s.Details).ThenInclude(s => s.ErpDetails)
.Include(s => s.Details).ThenInclude(s => s.BoxsDetails)
.FirstOrDefaultAsync(f => taskId == f.TaskId);
.Where(f => taskId == f.TaskId).ToListAsync();
return res.Clone();
}

86
src/WMS.Web.Repositories/SerialNumbersRepositories.cs
View File

@@ -81,6 +81,16 @@ namespace WMS.Web.Repositories
var res = await _context.SerialNumbers
.Where(f => list.Contains(f.Id)).ToListAsync();
var ids_e = res.Select(s => s.Id).ToList();
//在序列表里没找到的序列码 则到老ops序列码数据里去处理 list比较 取差集
var ids_c = list.Except(ids_e);
if (ids_c.Count() > 0)
{
var entitys_ops = entitys.Where(w => ids_c.Contains(w.Id)).ToList();
var res_ops = await EditEntityList_Ops(entitys_ops, false);
if (!res_ops) return false;
}
_mapper.ToMapList(entitys, res);
await _context.SaveChangesAsync();
@@ -178,7 +188,7 @@ namespace WMS.Web.Repositories
/// </summary>
/// <param name="serialNumbers"></param>
/// <returns></returns>
public async Task<MaterialResponse> GetSerialNumber(string serialNumber, string orgCode)
public async Task<MaterialResponse> GetSerialNumber(string serialNumber, string orgCode, bool IsOps = false)
{
MaterialResponse response = new MaterialResponse();
var materials_result = await _erpService.BillQueryForMaterial();
@@ -203,6 +213,46 @@ namespace WMS.Web.Repositories
.GroupJoin(_context.Box, s => s.serial.BoxId, box => box.Id, (s, box) => new { s.serial, s.boxInventory, box })
.SelectMany(x => x.box.DefaultIfEmpty(), (p, box) => new { p.serial, p.boxInventory, box })
.FirstOrDefaultAsync(w => serialNumber.Equals(w.serial.SerialNumber));
if (entity == null || entity.serial == null)
{
if (IsOps)
return await GetSerialNumber_Ops(serialNumber);
else
return null;
}
response.BoxId = entity.serial.BoxId;
response.BoxBillNo = entity?.box?.BoxBillNo ?? "";
response.SubStockCode = entity?.boxInventory?.SubStockCode ?? "";
response.SerialNumber = entity.serial.SerialNumber;
response.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, entity.serial.MaterialNumber);
response.MaterialNumber = entity.serial.MaterialNumber;
response.Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, entity.serial.MaterialNumber);
if (entity.boxInventory != null)
response.IsBoxInventory = entity.boxInventory.Details.SelectMany(s => s.SerialNumbers).Where(w => serialNumber.Equals(w)).Count() >= 1 ? true : false;
return response;
}
/// <summary>
/// 查询老ops序列码
/// </summary>
/// <param name="serialNumbers"></param>
/// <returns></returns>
private async Task<MaterialResponse> GetSerialNumber_Ops(string serialNumber)
{
MaterialResponse response = new MaterialResponse();
var materials_result = await _erpService.BillQueryForMaterial();
if (!materials_result.IsSuccess)
return response;
var materials = materials_result.Data.ToList();
var entity = await _context.SerialNumbers_Ops
.GroupJoin(_context.BoxInventory.Include(x => x.Details), serial => serial.BoxId, boxInventory => boxInventory.BoxId, (serial, boxInventory) => new { serial, boxInventory })
.SelectMany(x => x.boxInventory.DefaultIfEmpty(), (p, boxInventory) => new { p.serial, boxInventory })
.GroupJoin(_context.Box, s => s.serial.BoxId, box => box.Id, (s, box) => new { s.serial, s.boxInventory, box })
.SelectMany(x => x.box.DefaultIfEmpty(), (p, box) => new { p.serial, p.boxInventory, box })
.FirstOrDefaultAsync(w => serialNumber.Equals(w.serial.SerialNumber));
if (entity == null || entity.serial == null) return null;
response.BoxId = entity.serial.BoxId;
response.BoxBillNo = entity?.box?.BoxBillNo ?? "";
@@ -217,5 +267,39 @@ namespace WMS.Web.Repositories
return response;
}
/// <summary>
/// 老ops条码批量修改
/// </summary>
/// <param name="entitys"></param>
/// <param name="isTransaction"></param>
/// <returns></returns>
private async Task<bool> EditEntityList_Ops(List<SerialNumbers> entitys, bool isTransaction = true)
{
IDbContextTransaction _transaction = null;
if (isTransaction)
_transaction = _context.Database.BeginTransaction();
try
{
var opsList = _mapper.Map<List<SerialNumbers_Ops>>(entitys);
List<int> list = opsList.Select(s => s.Id).ToList();
var res = await _context.SerialNumbers_Ops
.Where(f => list.Contains(f.Id)).ToListAsync();
_mapper.ToMapList(opsList, res);
await _context.SaveChangesAsync();
if (_transaction != null)
_transaction.Commit();
}
catch (Exception ex)
{
if (_transaction != null)
_transaction.Rollback();
return false;
}
return true;
}
}
}

12
src/WMS.Web.Repositories/SubscribeNotificationRepositories.cs
View File

@@ -184,10 +184,10 @@ namespace WMS.Web.Repositories
query = query.Where(w => EF.Functions.Like(w.CustomerName, "%" + dto.CustomerName + "%"));
if (!string.IsNullOrEmpty(dto.CustomerNumber))
query = query.Where(w => EF.Functions.Like(w.CustomerNumber, "%" + dto.CustomerNumber + "%"));
if (dto.OperateBeginDate != null)
query = query.Where(w => w.OperateTime >= dto.OperateBeginDate);
if (dto.OperateEndDate != null)
query = query.Where(w => w.OperateTime <= dto.OperateEndDate);
if (dto.CreateBeginDate != null)
query = query.Where(w => w.OperateTime >= dto.CreateBeginDate);
if (dto.CreateEndDate != null)
query = query.Where(w => w.OperateTime <= dto.CreateEndDate);
//组装
int total = await query.CountAsync();
var list = await query.Select(s => new SubscribeNotificationQueryInfoResponse()
@@ -196,8 +196,8 @@ namespace WMS.Web.Repositories
Id = s.Id,
CustomerName = s.CustomerName,
CustomerNumber = s.CustomerNumber,
Telephones = s.CustomerName,
Emails = s.CustomerName,
Telephones = string.Join(",", s.Telephones),
Emails = string.Join(",", s.Emails),
Operate = _singleDataService.GetSingleData(SingleAction.Staffs, companyId, s.OperateId),
OperateTime = s.OperateTime.DateToStringSeconds(),
Creator = _singleDataService.GetSingleData(SingleAction.Staffs, companyId, s.CreatorId),