转义

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;
+
+/// <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; }
+    /// <summary>
+    /// 物料ID
+    /// </summary>
+    public string? material_id { get; set; }
+    /// <summary>
+    /// 区域ID    
+    /// </summary>
+    public string area_id { get; set; }
+}

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<string, object> _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<dynamic> GetCheckTaskInfo(string carryCode)
         {
+            var checkTypeMap = await _dataService.GetDicByKey("CheckType");
+            var checkSpeciesMap = await _dataService.GetDicByKey("CheckSpecies");
             var result = await _db.Queryable<WmsDistaskH>().InnerJoin<WmsCheckstockH>((a, b) => a.require_id == b.id)
-                 .Where((a, b) => a.carry_code == carryCode)
-                 .Select<WmsCheckstockH>()
+                 .InnerJoin<BasWarehouse>((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;
         }