diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCheckstockH.part.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCheckstockH.part.cs new file mode 100644 index 00000000..4d93f685 --- /dev/null +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCheckstockH.part.cs @@ -0,0 +1,114 @@ +using JNPF.Common.Contracts; +using JNPF.Common.Security; +using SqlSugar; + +namespace Tnb.WarehouseMgr.Entities; + +/// +/// 盘点任务主表 +/// +[SugarTable("wms_checkstock_h")] +public partial class WmsCheckstockH : BaseEntity +{ + public WmsCheckstockH() + { + id = SnowflakeIdHelper.NextId(); + } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 单号 + /// + public string? checkstock_code { get; set; } + + /// + /// 盘点计划ID + /// + public string? checkplan_id { get; set; } + + /// + /// 仓库ID + /// + public string? warehouse_id { get; set; } + + /// + /// 盘点状态 + /// + public string? status { get; set; } + + /// + /// 盘点类型 + /// + public string? checkstock_type { get; set; } + + /// + /// 盘点种类 + /// + public string? handle_kinds { get; set; } + + /// + /// 盘点开始时间 + /// + public DateTime? check_start_date { get; set; } + + /// + /// 盘点结束时间 + /// + public DateTime? check_end_date { get; set; } + + /// + /// 盘点人ID + /// + public string? checkstock_id { get; set; } + + /// + /// 扩展 + /// + public string? extras { get; set; } + + /// + /// 时间戳 + /// + public DateTime? timestamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 流程任务Id + /// + public string? f_flowtaskid { get; set; } + + /// + /// 流程引擎Id + /// + public string? f_flowid { get; set; } + /// + /// 物料ID + /// + public string? material_id { get; set; } + /// + /// 区域ID + /// + public string area_id { get; set; } +} diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsCheckTaskService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCheckTaskService.cs index f31161e9..e1b6cb0f 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsCheckTaskService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsCheckTaskService.cs @@ -42,6 +42,7 @@ namespace Tnb.WarehouseMgr private readonly IVisualDevService _visualDevService; private readonly IRunService _runService; private readonly IBillRullService _billRullService; + private readonly IDictionaryDataService _dataService; private static Dictionary _carryMap = new(); public WmsCheckTaskService( @@ -51,6 +52,7 @@ namespace Tnb.WarehouseMgr IRunService runService, IBillRullService billRullService, IUserManager userManager, + IDictionaryDataService dataService, IEventPublisher eventPublisher ) { @@ -59,6 +61,7 @@ namespace Tnb.WarehouseMgr _visualDevService = visualDevService; _runService = runService; _billRullService = billRullService; + _dataService = dataService; _userManager = userManager; OverideFuncs.CreateAsync = Create; @@ -421,9 +424,16 @@ namespace Tnb.WarehouseMgr [HttpGet("{carryCode}")] public async Task GetCheckTaskInfo(string carryCode) { + var checkTypeMap = await _dataService.GetDicByKey("CheckType"); + var checkSpeciesMap = await _dataService.GetDicByKey("CheckSpecies"); var result = await _db.Queryable().InnerJoin((a, b) => a.require_id == b.id) - .Where((a, b) => a.carry_code == carryCode) - .Select() + .InnerJoin((a, b, c) => b.warehouse_id == c.id) + .Where(a => a.carry_code == carryCode) + .Select((a, b, c) => new WmsCheckstockH { warehouse_name = c.whname }, true) + .Mapper(it => + { + it.checkstock_type = checkTypeMap.ContainsKey(it.checkstock_type) ? checkTypeMap[it.checkstock_type]?.ToString() ?? "" : ""; + }) .ToListAsync(); return result; }