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

解决入库申请bug

Browse Source
This commit is contained in:
张涛
2023-06-27 16:43:16 +08:00
parent 379901c7b4
commit d23b8b125a
3 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BasicData/Tnb.BasicData.Entities/Entity/BasLocation.cs
View File

@@ -43,7 +43,7 @@ public partial class BasLocation : BaseEntity<string>
/// <summary> /// <summary>
/// 是否使用 /// 是否使用
/// </summary> /// </summary>
[SugarColumn(ColumnDataType = "varchar(1)", SqlParameterDbType = typeof(CommonPropertyConvert))] //[SugarColumn(ColumnDataType = "varchar(32)", SqlParameterDbType = typeof(CommonPropertyConvert))]
public int is_use { get; set; } public int is_use { get; set; }
/// <summary> /// <summary>

14
WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
View File

@@ -210,7 +210,19 @@ namespace Tnb.WarehouseMgr
[HttpGet] [HttpGet]
public async Task<List<BasLocation>> InStockStrategy([FromQuery] InStockStrategyQuery input) public async Task<List<BasLocation>> InStockStrategy([FromQuery] InStockStrategyQuery input)
{ {
var items = await _db.Queryable<BasLocation>().Where(it => it.wh_id == input.warehouse_id && it.is_lock == 0 && it.is_use == (int)EnumCarryStatus.空闲 && it.is_type == "0").OrderBy(it => new { it.layers, it.loc_line, it.loc_column }, OrderByType.Asc).ToListAsync(); var items = new List<BasLocation>();
try
{
//var stauts = (int)EnumCarryStatus.空闲;
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.空闲).OrderBy(it => new { it.layers, it.loc_line, it.loc_column }, OrderByType.Asc).ToListAsync();
}
catch (Exception ex)
{
throw;
}
return items.Take(input.Size).ToList(); return items.Take(input.Size).ToList();
} }
/// <summary> /// <summary>

4
WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInStockService.cs
View File

@@ -69,8 +69,8 @@ namespace Tnb.WarehouseMgr
/// </summary> /// </summary>
/// <param name="input"></param> /// <param name="input"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost] //[HttpPost]
public async Task<dynamic> ScanCodeInStock(VisualDevModelDataCrInput input) private async Task<dynamic> ScanCodeInStock(VisualDevModelDataCrInput input)
{ {
try try
{ {