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

更改location的is_use字段为string

Browse Source
This commit is contained in:
FanLian
2023-07-04 11:03:28 +08:00
parent a4298ca2d9
commit ff66b1fa04
7 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -214,7 +214,7 @@ namespace Tnb.WarehouseMgr
{ {
//var stauts = (int)EnumCarryStatus.空闲; //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(); 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) catch (Exception)
@@ -434,7 +434,7 @@ namespace Tnb.WarehouseMgr
//更新起始库位，状态改为空闲、锁定状态，未锁定 //更新起始库位，状态改为空闲、锁定状态，未锁定
if (startLocationIds?.Count > 0) if (startLocationIds?.Count > 0)
{ {
await _db.Updateable<BasLocation>().SetColumns(it => new BasLocation { is_use = (int)EnumCarryStatus.空闲, is_lock = 0 }).Where(it => startLocationIds.Contains(it.id)).ExecuteCommandAsync(); await _db.Updateable<BasLocation>().SetColumns(it => new BasLocation { is_use = ((int)EnumCarryStatus.空闲).ToString(), is_lock = 0 }).Where(it => startLocationIds.Contains(it.id)).ExecuteCommandAsync();
} }
await _db.Ado.CommitTranAsync(); await _db.Ado.CommitTranAsync();
@@ -494,7 +494,7 @@ namespace Tnb.WarehouseMgr
carryStatus = ((int)EnumCarryStatus.占用).ToString(); carryStatus = ((int)EnumCarryStatus.占用).ToString();
} }
var cStatus = carryStatus.ParseToInt(); var cStatus = carryStatus.ParseToInt();
await _db.Updateable<BasLocation>().SetColumns(it => new BasLocation { is_use = cStatus, is_lock = 0 }).Where(it => it.id == multis[i].endlocation_id).ExecuteCommandAsync(); await _db.Updateable<BasLocation>().SetColumns(it => new BasLocation { is_use = cStatus.ToString(), is_lock = 0 }).Where(it => it.id == multis[i].endlocation_id).ExecuteCommandAsync();
} }
//更新业务主表的单据状态 //更新业务主表的单据状态
if (disTasks?.Count > 0) if (disTasks?.Count > 0)

2
WarehouseMgr/Tnb.WarehouseMgr/WmsInStockService.cs
View File

@@ -445,7 +445,7 @@ namespace Tnb.WarehouseMgr
await _db.Insertable(carryCodes).ExecuteCommandAsync(); await _db.Insertable(carryCodes).ExecuteCommandAsync();
await _wareHouseService.GenInStockTaskHandleAfter(preTaskUpInput, await _wareHouseService.GenInStockTaskHandleAfter(preTaskUpInput,
it => new WmsCarryH { carry_code = input.data[nameof(WmsCarryH.carry_code)].ToString()!, is_lock = 1, carry_status = ((int)EnumCarryStatus.占用).ToString(), location_id = preTaskUpInput.CarryStartLocationId, location_code = preTaskUpInput.CarryStartLocationCode }, it => new WmsCarryH { carry_code = input.data[nameof(WmsCarryH.carry_code)].ToString()!, is_lock = 1, carry_status = ((int)EnumCarryStatus.占用).ToString(), location_id = preTaskUpInput.CarryStartLocationId, location_code = preTaskUpInput.CarryStartLocationCode },
it => new BasLocation { is_lock = 1, is_use = (int)EnumCarryStatus.占用 }); it => new BasLocation { is_lock = 1, is_use = ((int)EnumCarryStatus.占用).ToString() });
if (instockCOdes?.Count > 0) if (instockCOdes?.Count > 0)
{ {
await _db.Updateable<WmsInstockD>().SetColumns(it => new WmsInstockD { line_status = WmsWareHouseConst.BILLSTATUS_ON_ID }).Where(it => instockCOdes.Select(x => x.bill_d_id).Contains(it.id)).ExecuteCommandAsync(); await _db.Updateable<WmsInstockD>().SetColumns(it => new WmsInstockD { line_status = WmsWareHouseConst.BILLSTATUS_ON_ID }).Where(it => instockCOdes.Select(x => x.bill_d_id).Contains(it.id)).ExecuteCommandAsync();

2
WarehouseMgr/Tnb.WarehouseMgr/WmsRobotCallbackService.cs
View File

@@ -109,7 +109,7 @@ namespace Tnb.WarehouseMgr
} }
else else
{ {
if (location != null && location.is_use == (int)EnumCarryStatus.空闲 && location.is_lock == 0) if (location != null && location.is_use == ((int)EnumCarryStatus.空闲).ToString() && location.is_lock == 0)
{ {
//出库 //出库
var sPoint = await _db.Queryable<WmsPointH>().FirstAsync(it => it.location_id == carry.location_id); var sPoint = await _db.Queryable<WmsPointH>().FirstAsync(it => it.location_id == carry.location_id);

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

@@ -161,7 +161,7 @@ namespace Tnb.WarehouseMgr
GenPreTaskUpInput genPreTaskAfterUpInput = new(); GenPreTaskUpInput genPreTaskAfterUpInput = new();
genPreTaskAfterUpInput.CarryIds = preTasks.Select(x => x.carry_id).ToList(); genPreTaskAfterUpInput.CarryIds = preTasks.Select(x => x.carry_id).ToList();
genPreTaskAfterUpInput.LocationIds = new HashSet<string>(locIds).ToList(); genPreTaskAfterUpInput.LocationIds = new HashSet<string>(locIds).ToList();
await _wareHouseService.GenInStockTaskHandleAfter(genPreTaskAfterUpInput, it => new WmsCarryH { is_lock = 1, carry_status = ((int)EnumCarryStatus.齐套分拣).ToString() }, it => new BasLocation { is_use = (int)EnumCarryStatus.齐套分拣, is_lock = 1 }); await _wareHouseService.GenInStockTaskHandleAfter(genPreTaskAfterUpInput, it => new WmsCarryH { is_lock = 1, carry_status = ((int)EnumCarryStatus.齐套分拣).ToString() }, it => new BasLocation { is_use = ((int)EnumCarryStatus.齐套分拣).ToString(), is_lock = 1 });
} }
} }
@@ -288,7 +288,7 @@ namespace Tnb.WarehouseMgr
{ {
if (carry!.location_id!.IsNotEmptyOrNull()) if (carry!.location_id!.IsNotEmptyOrNull())
{ {
await _db.Updateable<BasLocation>().SetColumns(it => new BasLocation { is_use = (int)EnumCarryStatus.空闲 }).Where(it => it.id == carry.location_id).ExecuteCommandAsync(); await _db.Updateable<BasLocation>().SetColumns(it => new BasLocation { is_use = ((int)EnumCarryStatus.空闲).ToString() }).Where(it => it.id == carry.location_id).ExecuteCommandAsync();
} }
carry.out_status = ((int)EnumOutStatus.正常).ToString(); carry.out_status = ((int)EnumOutStatus.正常).ToString();
carry.carry_status = ((int)EnumCarryStatus.齐套).ToString(); carry.carry_status = ((int)EnumCarryStatus.齐套).ToString();

2
WarehouseMgr/Tnb.WarehouseMgr/WmsSignForDeliveryService.cs
View File

@@ -71,7 +71,7 @@ namespace Tnb.WarehouseMgr
if (carry!.location_id!.IsNotEmptyOrNull()) if (carry!.location_id!.IsNotEmptyOrNull())
{ {
var loc = await _db.Queryable<BasLocation>().SingleAsync(it => it.id == carry.location_id); var loc = await _db.Queryable<BasLocation>().SingleAsync(it => it.id == carry.location_id);
loc.is_use = (int)EnumCarryStatus.空闲; loc.is_use = ((int)EnumCarryStatus.空闲).ToString();
await _db.Updateable(loc).UpdateColumns(it => it.is_use).ExecuteCommandAsync(); await _db.Updateable(loc).UpdateColumns(it => it.is_use).ExecuteCommandAsync();
} }
carry.location_id = null; carry.location_id = null;

2
WarehouseMgr/Tnb.WarehouseMgr/WmskittingOutService.cs
View File

@@ -137,7 +137,7 @@ namespace Tnb.WarehouseMgr
var grpList = kittingOuts.GroupBy(g => g.location_id).ToList(); var grpList = kittingOuts.GroupBy(g => g.location_id).ToList();
foreach (var koGrp in grpList) foreach (var koGrp in grpList)
{ {
var locs = await _db.Queryable<BasLocation>().Where(it => it.id == koGrp.Key && it.is_use == (int)EnumCarryStatus.空闲 && it.is_lock == 0).ToListAsync(); var locs = await _db.Queryable<BasLocation>().Where(it => it.id == koGrp.Key && it.is_use == ((int)EnumCarryStatus.空闲).ToString() && it.is_lock == 0).ToListAsync();
if (locs?.Count > 0) if (locs?.Count > 0)
{ {