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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
周科达
2023-07-26 15:19:17 +08:00
parent 6ec90d3dbe 1f0f302489
commit cfdf7048ec
8 changed files with 509 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -152,5 +152,9 @@ public class ModuleConsts
/// 模块标识-任务执行
/// </summary>
public const string MODULE_WMSDISTASK_ID = "26128621455141";
/// <summary>
/// 模块标识-盘点任务
/// </summary>
public const string MODULE_WMSCHECKTASK_ID = "27582377555221";
}

102
WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCheckstockCode.cs Normal file
View File

@@ -0,0 +1,102 @@
using JNPF.Common.Contracts;
using JNPF.Common.Security;
using SqlSugar;
namespace Tnb.WarehouseMgr.Entities;
/// <summary>
/// 盘点任务明细表
/// </summary>
[SugarTable("wms_checkstock_code")]
public partial class WmsCheckstockCode : BaseEntity<string>
{
public WmsCheckstockCode()
{
id = SnowflakeIdHelper.NextId();
}
/// <summary>
/// 盘点任务ID
/// </summary>
public string? checkstock_id { get; set; }
/// <summary>
/// 盘点任务物料明细ID
/// </summary>
public string? checkstock_d_id { get; set; }
/// <summary>
/// 载具ID
/// </summary>
public string? carry_id { get; set; }
/// <summary>
/// 载具编号
/// </summary>
public string? carry_code { get; set; }
/// <summary>
/// 物料ID
/// </summary>
public string? material_id { get; set; }
/// <summary>
/// 物料编号
/// </summary>
public string? material_code { get; set; }
/// <summary>
/// 条码编号
/// </summary>
public string? barcode { get; set; }
/// <summary>
/// 批次
/// </summary>
public string? code_batch { get; set; }
/// <summary>
/// 条码数量
/// </summary>
public int? codeqty { get; set; }
/// <summary>
/// 单位ID
/// </summary>
public string? unit_id { get; set; }
/// <summary>
/// 备注
/// </summary>
public string? remark { get; set; }
/// <summary>
/// 扩展
/// </summary>
public string? extras { get; set; }
/// <summary>
/// 时间戳
/// </summary>
public string? timestamp { get; set; }
/// <summary>
/// 创建用户
/// </summary>
public string? create_id { get; set; }
/// <summary>
/// 创建时间
/// </summary>
public DateTime? create_time { get; set; }
/// <summary>
/// 修改用户
/// </summary>
public string? modify_id { get; set; }
/// <summary>
/// 修改时间
/// </summary>
public DateTime? modify_time { get; set; }
}

102
WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCheckstockD.cs Normal file
View File

@@ -0,0 +1,102 @@
using JNPF.Common.Contracts;
using JNPF.Common.Security;
using SqlSugar;
namespace Tnb.WarehouseMgr.Entities;
/// <summary>
/// 盘点任务子表
/// </summary>
[SugarTable("wms_checkstock_d")]
public partial class WmsCheckstockD : BaseEntity<string>
{
public WmsCheckstockD()
{
id = SnowflakeIdHelper.NextId();
}
/// <summary>
/// 盘点任务ID
/// </summary>
public string? checkstock_id { get; set; }
/// <summary>
/// 物料ID
/// </summary>
public string? material_id { get; set; }
/// <summary>
/// 物料编号
/// </summary>
public string? material_code { get; set; }
/// <summary>
/// 批次
/// </summary>
public string? code_batch { get; set; }
/// <summary>
/// 库位ID
/// </summary>
public string? location_id { get; set; }
/// <summary>
/// 库位编号
/// </summary>
public string? location_code { get; set; }
/// <summary>
/// 载具ID
/// </summary>
public string? carry_id { get; set; }
/// <summary>
/// 载具编号
/// </summary>
public string? carry_code { get; set; }
/// <summary>
/// 理论库存数量
/// </summary>
public decimal? pr_qty { get; set; }
/// <summary>
/// 已盘点数量
/// </summary>
public decimal? qty { get; set; }
/// <summary>
/// 扩展
/// </summary>
public string? extras { get; set; }
/// <summary>
/// 时间戳
/// </summary>
public DateTime? timestamp { get; set; }
/// <summary>
/// 创建用户
/// </summary>
public string? create_id { get; set; }
/// <summary>
/// 创建时间
/// </summary>
public DateTime? create_time { get; set; }
/// <summary>
/// 修改用户
/// </summary>
public string? modify_id { get; set; }
/// <summary>
/// 修改时间
/// </summary>
public DateTime? modify_time { get; set; }
/// <summary>
/// 结算状态
/// </summary>
public string? closing_status { get; set; }
}

18
WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCheckstockD.part.cs Normal file
View File

@@ -0,0 +1,18 @@
using JNPF.Common.Contracts;
using JNPF.Common.Security;
using SqlSugar;
namespace Tnb.WarehouseMgr.Entities;
/// <summary>
/// 盘点任务子表
/// </summary>
public partial class WmsCheckstockD
{
/// <summary>
/// 条码数量
/// </summary>
[SugarColumn(IsIgnore = true)]
public decimal codeqty { get; set; }
}

107
WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCheckstockH.cs Normal file
View File

@@ -0,0 +1,107 @@
using JNPF.Common.Contracts;
using JNPF.Common.Security;
using SqlSugar;
namespace Tnb.WarehouseMgr.Entities;
/// <summary>
/// 盘点任务主表
/// </summary>
[SugarTable("wms_checkstock_h")]
public partial class WmsCheckstockH : BaseEntity<string>
{
public WmsCheckstockH()
{
id = SnowflakeIdHelper.NextId();
}
/// <summary>
/// 所属组织
/// </summary>
public string? org_id { get; set; }
/// <summary>
/// 单号
/// </summary>
public string? checkstock_code { get; set; }
/// <summary>
/// 盘点计划ID
/// </summary>
public string? checkplan_id { get; set; }
/// <summary>
/// 仓库ID
/// </summary>
public string? warehouse_id { get; set; }
/// <summary>
/// 盘点状态
/// </summary>
public string? status { get; set; }
/// <summary>
/// 盘点类型
/// </summary>
public string? checkstock_type { get; set; }
/// <summary>
/// 盘点种类
/// </summary>
public string? handle_kinds { get; set; }
/// <summary>
/// 盘点开始时间
/// </summary>
public DateTime? check_start_date { get; set; }
/// <summary>
/// 盘点结束时间
/// </summary>
public DateTime? check_end_date { get; set; }
/// <summary>
/// 盘点人ID
/// </summary>
public string? checkstock_id { get; set; }
/// <summary>
/// 扩展
/// </summary>
public string? extras { get; set; }
/// <summary>
/// 时间戳
/// </summary>
public DateTime? timestamp { get; set; }
/// <summary>
/// 创建用户
/// </summary>
public string? create_id { get; set; }
/// <summary>
/// 创建时间
/// </summary>
public DateTime? create_time { get; set; }
/// <summary>
/// 修改用户
/// </summary>
public string? modify_id { get; set; }
/// <summary>
/// 修改时间
/// </summary>
public DateTime? modify_time { get; set; }
/// <summary>
/// 流程任务Id
/// </summary>
public string? f_flowtaskid { get; set; }
/// <summary>
/// 流程引擎Id
/// </summary>
public string? f_flowid { get; set; }
}

24
WarehouseMgr/Tnb.WarehouseMgr.Entities/Enums/EnumCheckType.cs Normal file
View File

@@ -0,0 +1,24 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.WarehouseMgr.Entities.Enums
{
public enum EnumCheckType
{
/// <summary>
/// 全库盘点
/// </summary>
全库盘点 = 0,
/// <summary>
/// 物料盘点
/// </summary>
物料盘点,
/// <summary>
/// 批次盘点
/// </summary>
批次盘点,
}
}

2
WarehouseMgr/Tnb.WarehouseMgr/WmsCarryService.cs
View File

@@ -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
View 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();
}
}
}