diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/BarCodePrintInput.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/BarCodePrintInput.cs
index bae70e4a..32c63039 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/BarCodePrintInput.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/BarCodePrintInput.cs
@@ -14,6 +14,6 @@ namespace Tnb.WarehouseMgr.Entities.Dto.Inputs
///
/// 入库申请单Id列表
///
- public List BillIds { get; set; }
+ public List? BillIds { get; set; }
}
}
diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/GenPreTaskUpInput.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/GenPreTaskUpInput.cs
index 3d9fcd52..e705315c 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/GenPreTaskUpInput.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/GenPreTaskUpInput.cs
@@ -14,39 +14,39 @@ namespace Tnb.WarehouseMgr.Entities.Dto
///
/// 预任务Id
///
- public string RquireId { get; set; }
+ public string? RquireId { get; set; }
///
/// 载具Id
///
- public string CarryId { get; set; }
+ public string? CarryId { get; set; }
///
/// 载具id集合
///
- public List CarryIds { get; set; }
+ public List? CarryIds { get; set; }
///
/// 载具Code
///
- public string CarryCode { get; set; }
+ public string? CarryCode { get; set; }
///
/// 载具起始库位Id
///
- public string CarryStartLocationId { get; set; }
+ public string? CarryStartLocationId { get; set; }
///
/// 载具起始库位编号
///
- public string CarryStartLocationCode { get; set; }
+ public string? CarryStartLocationCode { get; set; }
///
/// 库位IdS
///
- public List LocationIds { get; set; }
+ public List? LocationIds { get; set; }
///
/// 预任务操作记录
///
- public List PreTaskRecords { get; set; }
+ public List? PreTaskRecords { get; set; }
///
/// 预任务操作记录
///
- public WmsHandleH PreTaskRecord { get; set; }
+ public WmsHandleH? PreTaskRecord { get; set; }
///
/// 预任务条码记录
///
diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/InOutStockApplyforUpInput.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/InOutStockApplyforUpInput.cs
index b3124df2..2e4da1c2 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/InOutStockApplyforUpInput.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/InOutStockApplyforUpInput.cs
@@ -16,7 +16,7 @@ namespace Tnb.WarehouseMgr.Entities.Dto
///
/// 出入库明细Id
///
- public string id { get; set; }
+ public string? id { get; set; }
///
/// 出入库申请类型 1、入库 2、出库
///
@@ -215,7 +215,7 @@ namespace Tnb.WarehouseMgr.Entities.Dto
///
public string? carry_code { get; set; }
- public List InstockCodes { get; set; }
- public List OutstockCodes { get; set; }
+ public List? InstockCodes { get; set; }
+ public List? OutstockCodes { get; set; }
}
}
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAFeedingService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAFeedingService.cs
index a76e9516..ff96cddc 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAFeedingService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAFeedingService.cs
@@ -77,6 +77,7 @@ namespace Tnb.WarehouseMgr
var carry = await _db.Queryable().SingleAsync(it => it.id == carryId);
var feedBox = await _db.Queryable().SingleAsync(it => it.feedbox_code == feedBoxCode);
var carryMaterial = await _db.Queryable().FirstAsync(it => it.carry_id == carryId);
+ var carryCodes = await _db.Queryable().Where(it => it.carry_id == carryId).ToListAsync();
if (carryMaterial != null && feedBox != null && carry != null)
{
//更新投料箱