1、库位导入代码调整

2、电梯通信代码调整
This commit is contained in:
yang.lee
2023-12-11 13:52:54 +08:00
parent c8d5847941
commit 0dd220ee4f
14 changed files with 352 additions and 130 deletions

View File

@@ -13,6 +13,7 @@ using JNPF.VisualDev.Entitys;
using JNPF.VisualDev.Interfaces;
using Mapster;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Configuration;
using Newtonsoft.Json;
using NPOI.SS.Formula.PTG;
using SqlSugar;
@@ -43,6 +44,7 @@ namespace Tnb.WarehouseMgr
private readonly IBillRullService _billRullService;
private readonly IUserManager _userManager;
private readonly ChannelWriter<NotifyMessage> _channelWriter;
private readonly IConfiguration _configuration;
public WmsEmptyInstockService(
ISqlSugarRepository<WmsCarryH> repository,
IRunService runService,
@@ -50,7 +52,8 @@ namespace Tnb.WarehouseMgr
IWareHouseService wareHouseService,
IUserManager userManager,
IBillRullService billRullService,
IEventPublisher eventPublisher
IEventPublisher eventPublisher,
IConfiguration configuration
)
{
_db = repository.AsSugarClient();
@@ -59,6 +62,7 @@ namespace Tnb.WarehouseMgr
_wareHouseService = wareHouseService;
_userManager = userManager;
_billRullService = billRullService;
_configuration = configuration;
OverideFuncs.CreateAsync = WmsEmptyIn;
}
@@ -71,7 +75,9 @@ namespace Tnb.WarehouseMgr
//入库取终点
InStockStrategyQuery inStockStrategyInput = new() { warehouse_id = input.data[nameof(InStockStrategyQuery.warehouse_id)].ToString()!, Size = 1 };
List<BasLocation> endLocations = await _wareHouseService.InStockStrategy(inStockStrategyInput);
//test
BasLocation llll = await _db.Queryable<BasLocation>().FirstAsync(it=>it.location_code == _configuration["TestLocation"]);
List<BasLocation> endLocations = new() { llll }; //await _wareHouseService.InStockStrategy(inStockStrategyInput);
WmsPointH? sPoint = null;
WmsPointH? ePoint = null;
if (input.data.ContainsKey(nameof(WmsPointH.location_id)))