新增盘点任务模块
This commit is contained in:
alex
@@ -128,7 +128,7 @@ namespace Tnb.WarehouseMgr
|
||||
wmsCarryReplaceH.modify_id = null;
|
||||
wmsCarryReplaceH.modify_time = null;
|
||||
row = await _db.Insertable(wmsCarryReplaceH).ExecuteCommandAsync();
|
||||
row = await UpdateNullCarry(oldCarry).Unwrap();
|
||||
row = await await UpdateNullCarry(oldCarry);
|
||||
isOk = (row > 0);
|
||||
if (!isOk) throw Oops.Oh(ErrorCode.COM1001);
|
||||
}
|
||||
|
||||
151
WarehouseMgr/Tnb.WarehouseMgr/WmsCheckTaskService.cs
Normal file
151
WarehouseMgr/Tnb.WarehouseMgr/WmsCheckTaskService.cs
Normal file
@@ -0,0 +1,151 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Linq.Expressions;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using JNPF.Common.Core.Manager;
|
||||
using JNPF.Common.Dtos.VisualDev;
|
||||
using JNPF.Common.Extension;
|
||||
using JNPF.FriendlyException;
|
||||
using JNPF.VisualDev;
|
||||
using JNPF.VisualDev.Entitys;
|
||||
using JNPF.VisualDev.Interfaces;
|
||||
using Mapster;
|
||||
using OBS.Internal;
|
||||
using SqlSugar;
|
||||
using Tnb.BasicData.Entities;
|
||||
using Tnb.WarehouseMgr.Entities;
|
||||
using Tnb.WarehouseMgr.Entities.Consts;
|
||||
using Tnb.WarehouseMgr.Entities.Enums;
|
||||
using Tnb.WarehouseMgr.Interfaces;
|
||||
|
||||
namespace Tnb.WarehouseMgr
|
||||
{
|
||||
/// <summary>
|
||||
/// 盘点任务
|
||||
/// </summary>
|
||||
[OverideVisualDev(ModuleConsts.MODULE_WMSCHECKTASK_ID)]
|
||||
public class WmsCheckTaskService : BaseWareHouseService
|
||||
{
|
||||
private readonly ISqlSugarClient _db;
|
||||
private readonly IWareHouseService _warehouseService;
|
||||
private readonly IUserManager _userManager;
|
||||
private readonly IVisualDevService _visualDevService;
|
||||
private readonly IRunService _runService;
|
||||
public WmsCheckTaskService(
|
||||
ISqlSugarRepository<WmsCheckstockH> repository,
|
||||
IWareHouseService wareHouseService,
|
||||
IVisualDevService visualDevService,
|
||||
IRunService runService,
|
||||
IUserManager userManager)
|
||||
{
|
||||
_db = repository.AsSugarClient();
|
||||
_warehouseService = wareHouseService;
|
||||
_visualDevService = visualDevService;
|
||||
_runService = runService;
|
||||
_userManager = userManager;
|
||||
OverideFuncs.CreateAsync = Create;
|
||||
}
|
||||
|
||||
private async Task<dynamic> Create(VisualDevModelDataCrInput input)
|
||||
{
|
||||
if (input == null) throw new ArgumentNullException(nameof(input));
|
||||
try
|
||||
{
|
||||
await _db.Ado.BeginTranAsync();
|
||||
|
||||
if (input.data?.Count > 0)
|
||||
{
|
||||
var checkType = input.data[nameof(WmsCheckstockH.checkstock_type)]?.ToString();
|
||||
if (!checkType.IsNullOrEmpty())
|
||||
{
|
||||
var billStatus = new List<string>
|
||||
{
|
||||
WmsWareHouseConst.PRETASK_BILL_STATUS_CANCEL_ID,
|
||||
WmsWareHouseConst.PRETASK_BILL_STATUS_COMPLE_ID,
|
||||
};
|
||||
var filter = Expressionable.Create<WmsDistaskH, BasLocation>()
|
||||
.And((a, b) => b.wh_id == input.data[nameof(WmsCheckstockH.warehouse_id)].ToString())
|
||||
.And((a, b) => b.is_type == ((int)EnumLocationType.存储库位).ToString())
|
||||
.And((a, b) => !billStatus.Contains(a.status))
|
||||
.ToExpression();
|
||||
|
||||
var queryTasks = new List<Task<List<WmsDistaskH>>>();
|
||||
queryTasks.Add(Task.Run(() => FetchDisTasks((a, b) => a.startlocation_id == b.id, filter)));
|
||||
queryTasks.Add(Task.Run(() => FetchDisTasks((a, b) => a.endlocation_id == b.id, filter)));
|
||||
var disTasks = await Task.WhenAll(queryTasks);
|
||||
if (disTasks?.Length > 0)
|
||||
{
|
||||
throw new AppFriendlyException("该仓库还有未完成的任务，不允许盘点!", 500);
|
||||
}
|
||||
VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSCHECKTASK_ID, true);
|
||||
await _runService.Create(templateEntity, input);
|
||||
List<WmsCarryCode> carryCodes = new();
|
||||
List<WmsCheckstockD> details = new();
|
||||
switch (checkType.ToEnum<EnumCheckType>())
|
||||
{
|
||||
case EnumCheckType.全库盘点:
|
||||
carryCodes = await _db.Queryable<BasLocation>().InnerJoin<WmsCarryCode>((a, b) => a.id == b.location_id)
|
||||
.Where(a => a.wh_id == input.data[nameof(WmsCheckstockH.warehouse_id)].ToString() && a.is_type == ((int)EnumLocationType.存储库位).ToString())
|
||||
.Select<WmsCarryCode>()
|
||||
.ToListAsync();
|
||||
carryCodes ??= Enumerable.Empty<WmsCarryCode>().ToList();
|
||||
var checkStockDs = carryCodes.Adapt<List<WmsCheckstockD>>();
|
||||
var prQtyDic = checkStockDs.GroupBy(g => new { g.carry_id, g.material_id, g.code_batch }).ToDictionary(x => x.Key, x => x.Sum(d => d.codeqty));
|
||||
|
||||
foreach (var (k, v) in prQtyDic)
|
||||
{
|
||||
WmsCheckstockD? checkstockD = checkStockDs?.Find(x => string.Equals(k, $"{x.carry_id}{x.material_id}{x.code_batch}"));
|
||||
if (checkstockD != null)
|
||||
{
|
||||
checkstockD.pr_qty = v;
|
||||
details.Add(checkstockD);
|
||||
}
|
||||
}
|
||||
details.ForEach(x =>
|
||||
{
|
||||
x.create_id = _userManager.UserId;
|
||||
x.create_time = DateTime.Now;
|
||||
});
|
||||
await _db.Insertable(details).ExecuteCommandAsync();
|
||||
break;
|
||||
case EnumCheckType.物料盘点:
|
||||
break;
|
||||
case EnumCheckType.批次盘点:
|
||||
break;
|
||||
}
|
||||
//生成预任务信息
|
||||
if (details.Count > 0 && carryCodes.Count > 0)
|
||||
{
|
||||
var locTypes = new[] { ((int)EnumLocationType.出库库位).ToString(), ((int)EnumLocationType.出入库位).ToString() };
|
||||
var endLocs = _db.Queryable<BasLocation>().Where(it=>it.wh_id == input.data[nameof(WmsCheckstockH.warehouse_id)].ToString() && locTypes.Contains(it.is_type)).ToListAsync();
|
||||
var curDetails = details.DistinctBy(x => x.carry_id).ToList();
|
||||
var curCarryCodes = carryCodes.FindAll(x => curDetails.Select(d => d.carry_id).Contains(x.carry_id));
|
||||
if (curCarryCodes.Count > 0)
|
||||
{
|
||||
foreach (var item in curCarryCodes)
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
await _db.Ado.CommitTranAsync();
|
||||
}
|
||||
catch (Exception)
|
||||
{
|
||||
await _db.Ado.RollbackTranAsync();
|
||||
throw;
|
||||
}
|
||||
return Task.FromResult(1);
|
||||
}
|
||||
|
||||
private Task<List<WmsDistaskH>> FetchDisTasks(Expression<Func<WmsDistaskH, BasLocation, bool>> joinExp, Expression<Func<WmsDistaskH, BasLocation, bool>> whereExp)
|
||||
{
|
||||
return _db.Queryable<WmsDistaskH>().InnerJoin<BasLocation>(joinExp).Where(whereExp).Select<WmsDistaskH>().ToListAsync();
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user