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

Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev

Browse Source
This commit is contained in:
alex
2023-07-04 09:45:27 +08:00
parent 418133e475 a4298ca2d9
commit 4e42d12e21
4 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/BarCodePrintInput.cs
View File

@@ -14,6 +14,6 @@ namespace Tnb.WarehouseMgr.Entities.Dto.Inputs
/// <summary>
/// 入库申请单Id列表
/// </summary>
public List<string> BillIds { get; set; }
public List<string>? BillIds { get; set; }
}
}

18
WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/GenPreTaskUpInput.cs
View File

@@ -14,39 +14,39 @@ namespace Tnb.WarehouseMgr.Entities.Dto
/// <summary>
/// 预任务Id
/// </summary>
public string RquireId { get; set; }
public string? RquireId { get; set; }
/// <summary>
/// 载具Id
/// </summary>
public string CarryId { get; set; }
public string? CarryId { get; set; }
/// <summary>
/// 载具id集合
/// </summary>
public List<string> CarryIds { get; set; }
public List<string>? CarryIds { get; set; }
/// <summary>
/// 载具Code
/// </summary>
public string CarryCode { get; set; }
public string? CarryCode { get; set; }
/// <summary>
/// 载具起始库位Id
/// </summary>
public string CarryStartLocationId { get; set; }
public string? CarryStartLocationId { get; set; }
/// <summary>
/// 载具起始库位编号
/// </summary>
public string CarryStartLocationCode { get; set; }
public string? CarryStartLocationCode { get; set; }
/// <summary>
/// 库位IdS
/// </summary>
public List<string> LocationIds { get; set; }
public List<string>? LocationIds { get; set; }
/// <summary>
/// 预任务操作记录
/// </summary>
public List<WmsHandleH> PreTaskRecords { get; set; }
public List<WmsHandleH>? PreTaskRecords { get; set; }
/// <summary>
/// 预任务操作记录
/// </summary>
public WmsHandleH PreTaskRecord { get; set; }
public WmsHandleH? PreTaskRecord { get; set; }
/// <summary>
/// 预任务条码记录
/// </summary>

6
WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/InOutStockApplyforUpInput.cs
View File

@@ -16,7 +16,7 @@ namespace Tnb.WarehouseMgr.Entities.Dto
/// <summary>
/// 出入库明细Id
/// </summary>
public string id { get; set; }
public string? id { get; set; }
/// <summary>
/// 出入库申请类型 1、入库 2、出库
/// </summary>
@@ -215,7 +215,7 @@ namespace Tnb.WarehouseMgr.Entities.Dto
/// </summary>
public string? carry_code { get; set; }
public List<WmsInstockCode> InstockCodes { get; set; }
public List<WmsOutstockCode> OutstockCodes { get; set; }
public List<WmsInstockCode>? InstockCodes { get; set; }
public List<WmsOutstockCode>? OutstockCodes { get; set; }
}
}

1
WarehouseMgr/Tnb.WarehouseMgr/WmsPDAFeedingService.cs
View File

@@ -77,6 +77,7 @@ namespace Tnb.WarehouseMgr
var carry = await _db.Queryable<WmsCarryH>().SingleAsync(it => it.id == carryId);
var feedBox = await _db.Queryable<WmsFeedbox>().SingleAsync(it => it.feedbox_code == feedBoxCode);
var carryMaterial = await _db.Queryable<WmsCarryMat>().FirstAsync(it => it.carry_id == carryId);
var carryCodes = await _db.Queryable<WmsCarryCode>().Where(it => it.carry_id == carryId).ToListAsync();
if (carryMaterial != null && feedBox != null && carry != null)
{
//更新投料箱