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

Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev

Browse Source
This commit is contained in:
贺立波
2023-11-13 15:18:42 +08:00
parent 1ac220b170 48a5512d0c
commit 82909e116d
4 changed files with 31 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairApply.part.cs Normal file
View File

@@ -0,0 +1,13 @@
using SqlSugar;
namespace Tnb.EquipMgr.Entities
{
public partial class EqpRepairApply
{
/// <summary>
/// 故障名称
/// </summary>
[SugarColumn(IsIgnore = true)]
public string? fault_name { get; set; }
}
}

7
EquipMgr/Tnb.EquipMgr/EqpRepairApplyService.cs
View File

@@ -11,6 +11,7 @@ using JNPF.VisualDev;
using JNPF.VisualDev.Interfaces; using JNPF.VisualDev.Interfaces;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json; using Newtonsoft.Json;
using SQLitePCL;
using SqlSugar; using SqlSugar;
using Tnb.BasicData; using Tnb.BasicData;
using Tnb.EquipMgr.Entities; using Tnb.EquipMgr.Entities;
@@ -281,10 +282,12 @@ namespace Tnb.EquipMgr
public async Task<RepairApplyDetailOutput> GetRepairApplyDetail(Dictionary<string, string> dic) public async Task<RepairApplyDetailOutput> GetRepairApplyDetail(Dictionary<string, string> dic)
{ {
string id = dic["id"]; string id = dic["id"];
var db = _repository.AsSugarClient();
EqpRepairApply eqpRepairApply = await _repository.GetSingleAsync(x => x.id == id); EqpRepairApply eqpRepairApply = await _repository.GetSingleAsync(x => x.id == id);
EqpRepairOutApply eqpRepairOutApply = await _repository.AsSugarClient().Queryable<EqpRepairOutApply>().FirstAsync(x => x.repair_apply_id == id); EqpRepairOutApply eqpRepairOutApply = await db.Queryable<EqpRepairOutApply>().FirstAsync(x => x.repair_apply_id == id);
EqpFault eqpFault = await db.Queryable<EqpFault>().SingleAsync(x => x.id == eqpRepairApply.fault_id);
eqpRepairApply.fault_name = eqpFault != null ? eqpFault.fault_name : "";
return new RepairApplyDetailOutput() return new RepairApplyDetailOutput()
{ {
eqpRepairApply = eqpRepairApply, eqpRepairApply = eqpRepairApply,

18
WarehouseMgr/Tnb.WarehouseMgr/WmsCheckTaskService.cs
View File

@@ -37,6 +37,8 @@ namespace Tnb.WarehouseMgr
private readonly IVisualDevService _visualDevService; private readonly IVisualDevService _visualDevService;
private readonly IRunService _runService; private readonly IRunService _runService;
private readonly IBillRullService _billRullService; private readonly IBillRullService _billRullService;
private static Dictionary<string, object> _carryMap = new();
public WmsCheckTaskService( public WmsCheckTaskService(
ISqlSugarRepository<WmsCheckstockH> repository, ISqlSugarRepository<WmsCheckstockH> repository,
IWareHouseService wareHouseService, IWareHouseService wareHouseService,
@@ -288,6 +290,11 @@ namespace Tnb.WarehouseMgr
[HttpGet] [HttpGet]
public async Task<dynamic> GetTaskDetailByCheckType([FromQuery] CheckDetailQuery input) public async Task<dynamic> GetTaskDetailByCheckType([FromQuery] CheckDetailQuery input)
{ {
if(_carryMap.Count == 0)
{
_carryMap = await _db.Queryable<WmsCarryH>().ToDictionaryAsync(x => x.id, x => x.carry_code);
}
var filterExpable = Expressionable.Create<BasLocation, WmsCarryCode, WmsCarryH>() var filterExpable = Expressionable.Create<BasLocation, WmsCarryCode, WmsCarryH>()
.And((a, b, c) => a.wh_id == input.warehouse_id) .And((a, b, c) => a.wh_id == input.warehouse_id)
.And((a, b, c) => a.is_type == ((int)EnumLocationType.存储库位).ToString()) .And((a, b, c) => a.is_type == ((int)EnumLocationType.存储库位).ToString())
@@ -307,17 +314,16 @@ namespace Tnb.WarehouseMgr
.Where(filterExpable.ToExpression()) .Where(filterExpable.ToExpression())
.Select<WmsCarryCode>() .Select<WmsCarryCode>()
.ToListAsync(); .ToListAsync();
var carryIds = carryCodes?.Select(x => x.carry_id) ?? Enumerable.Empty<string>();
var checkStockDs = await _db.Queryable<WmsCheckstockD>().Where(it => carryIds.Contains(it.carry_id)).ToListAsync(); List<CheckTaskDetailOutput> outputs = carryCodes.GroupBy(g => new { g.material_code, g.code_batch, g.location_code, g.carry_id }).Select(x => new CheckTaskDetailOutput
List<CheckTaskDetailOutput> outputs = checkStockDs.GroupBy(g => new { g.material_code, g.code_batch, g.location_code, g.carry_code }).Select(x => new CheckTaskDetailOutput
{ {
material_code = x.Key.material_code, material_code = x.Key.material_code,
code_batch = x.Key.code_batch, code_batch = x.Key.code_batch,
location_code = x.Key.location_code, location_code = x.Key.location_code,
carry_code = x.Key.carry_code, carry_code = _carryMap[x.Key.carry_id]?.ToString() ?? string.Empty,
pr_qty = x.Sum(d => d.pr_qty), pr_qty = x.Sum(d => d.codeqty),
closing_status = WmsWareHouseConst.CLOSINGSTATUS_WJS_ID, closing_status = WmsWareHouseConst.CLOSINGSTATUS_WJS_ID,
qty = x.Sum(d => d.qty), qty = 0,
}) })
.ToList(); .ToList();
return outputs; return outputs;

2
apihost/Tnb.API.Entry/Startup.cs
View File

@@ -57,7 +57,7 @@ public class Startup : AppStartup
//定时任务 //定时任务
services.AddHostedService<TimedTaskBackgroundService>(); services.AddHostedService<TimedTaskBackgroundService>();
services.AddHostedService<RedisBackGround>(); //services.AddHostedService<RedisBackGround>();
} }