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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
周科达
2023-06-29 14:04:11 +08:00
parent aaee683025 b9b27bd885
commit c8b44b41bc
3 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryCode.cs
View File

@@ -49,11 +49,6 @@ public partial class WmsCarryCode : BaseEntity<string>, IWmsCarryEntity
/// </summary> /// </summary>
public decimal codeqty { get; set; } public decimal codeqty { get; set; }
/// <summary>
/// 行号
/// </summary>
public int no { get; set; }
/// <summary> /// <summary>
/// 是否出库 /// 是否出库
/// </summary> /// </summary>

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

@@ -36,7 +36,7 @@ namespace Tnb.WarehouseMgr
} }
} }
} }
[NonAction]
protected async Task DoUpdate(WareHouseUpInput input) protected async Task DoUpdate(WareHouseUpInput input)
{ {
if (_stroageMap.ContainsKey(input.loginType)) if (_stroageMap.ContainsKey(input.loginType))
@@ -44,7 +44,7 @@ namespace Tnb.WarehouseMgr
await _stroageMap[input.loginType].Do(input); await _stroageMap[input.loginType].Do(input);
} }
} }
[NonAction]
public virtual Task ModifyAsync(WareHouseUpInput input) public virtual Task ModifyAsync(WareHouseUpInput input)
{ {
return Task.CompletedTask; return Task.CompletedTask;

12
WarehouseMgr/Tnb.WarehouseMgr/WmsOutStockService.cs
View File

@@ -338,7 +338,8 @@ namespace Tnb.WarehouseMgr
await _db.Updateable<WmsOutstockH>().SetColumns(it => new WmsOutstockH { status = WmsWareHouseConst.BILLSTATUS_COMPLETE_ID }).Where(it => it.id == input.requireId).ExecuteCommandAsync(); await _db.Updateable<WmsOutstockH>().SetColumns(it => new WmsOutstockH { status = WmsWareHouseConst.BILLSTATUS_COMPLETE_ID }).Where(it => it.id == input.requireId).ExecuteCommandAsync();
//如果是自动单据，需要回更上层系统 //如果是自动单据，需要回更上层系统
} }
else { else
{
//如果没有完成，修改为工作中 //如果没有完成，修改为工作中
await _db.Updateable<WmsOutstockH>().SetColumns(it => new WmsOutstockH { status = WmsWareHouseConst.BILLSTATUS_ON_ID }).Where(it => it.id == input.requireId).ExecuteCommandAsync(); await _db.Updateable<WmsOutstockH>().SetColumns(it => new WmsOutstockH { status = WmsWareHouseConst.BILLSTATUS_ON_ID }).Where(it => it.id == input.requireId).ExecuteCommandAsync();
} }
@@ -413,9 +414,12 @@ namespace Tnb.WarehouseMgr
{ {
foreach (var pair in dicUpdate) foreach (var pair in dicUpdate)
{ {
WmsCarryCode carryCode = new(); WmsCarryCode? carryCode = carryCodes.Find(x => x.barcode == pair.Key);
carryCode.codeqty = pair.Value; if (carryCode != null)
await _db.Updateable(carryCode).UpdateColumns(it => it.codeqty).Where(it => it.barcode == pair.Key).ExecuteCommandAsync(); {
carryCode.codeqty = pair.Value;
await _db.Updateable(carryCode).UpdateColumns(it => it.codeqty).ExecuteCommandAsync();
}
} }
await _db.Updateable<WmsCarryH>().SetColumns(it => new WmsCarryH { out_status = ((int)EnumOutStatus.正常).ToString() }).Where(it => input.carryIds.Contains(it.id)).ExecuteCommandAsync(); await _db.Updateable<WmsCarryH>().SetColumns(it => new WmsCarryH { out_status = ((int)EnumOutStatus.正常).ToString() }).Where(it => input.carryIds.Contains(it.id)).ExecuteCommandAsync();
await _db.Deleteable<WmsCarryMat>().Where(it => input.carryIds.Contains(it.carry_id)).ExecuteCommandAsync(); await _db.Deleteable<WmsCarryMat>().Where(it => input.carryIds.Contains(it.carry_id)).ExecuteCommandAsync();