调整格式
This commit is contained in:
@@ -160,7 +160,6 @@ namespace Tnb.WarehouseMgr
|
||||
try
|
||||
{
|
||||
items = await _db.Queryable<BasLocation>().Where(it => it.wh_id == input.warehouse_id && it.is_lock == 0 && it.is_type == "0" && it.is_use == ((int)EnumCarryStatus.空闲).ToString()).OrderBy(it => new { it.layers, it.loc_line, it.loc_column }, OrderByType.Asc).ToListAsync();
|
||||
|
||||
}
|
||||
catch (Exception)
|
||||
{
|
||||
@@ -553,7 +552,8 @@ namespace Tnb.WarehouseMgr
|
||||
{
|
||||
var roads = await _db.Queryable<WmsRoad>().ToListAsync();
|
||||
var points = await LocPathCalcAlgorithms(pStartId, pEndId, roads);
|
||||
|
||||
try
|
||||
{
|
||||
if (points.FindAll(x => x.location_code != null && x.location_code.Contains("ELE"))?.Count > 0)
|
||||
{
|
||||
//查询当前电梯点
|
||||
@@ -593,6 +593,11 @@ namespace Tnb.WarehouseMgr
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (Exception)
|
||||
{
|
||||
throw;
|
||||
}
|
||||
|
||||
return points;
|
||||
}
|
||||
|
||||
@@ -20,6 +20,7 @@ using JNPF.Systems.Interfaces.System;
|
||||
using Mapster;
|
||||
using Microsoft.AspNetCore.Http;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.CodeAnalysis.CSharp.Syntax;
|
||||
using SqlSugar;
|
||||
using Tnb.BasicData.Entities;
|
||||
using Tnb.WarehouseMgr.Entities;
|
||||
@@ -341,8 +342,6 @@ namespace Tnb.WarehouseMgr
|
||||
if (input.IsNull()) throw new ArgumentNullException(nameof(input));
|
||||
try
|
||||
{
|
||||
|
||||
|
||||
await _db.Ado.BeginTranAsync();
|
||||
List<WmsKittingoutD> kittingOutDs = new();
|
||||
var kittingOuts = input.Adapt<List<WmsKittingoutH>>();
|
||||
@@ -372,6 +371,7 @@ namespace Tnb.WarehouseMgr
|
||||
kittingOutDs.AddRange(d);
|
||||
}
|
||||
}
|
||||
|
||||
await _db.Insertable(kittingOuts).ExecuteCommandAsync();
|
||||
await _db.Insertable(kittingOutDs).ExecuteCommandAsync();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user