转义

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;
         }