From 842152a5c5e37437f7fb13c4958bca90ead23025 Mon Sep 17 00:00:00 2001
From: FanLian <fanlian2@163.com>
Date: Mon, 3 Jul 2023 17:11:50 +0800
Subject: [PATCH 1/2] 1

---
 WarehouseMgr/Tnb.WarehouseMgr/WmsPDAFeedingService.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAFeedingService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAFeedingService.cs
index 349e1ab6..1f3f458c 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAFeedingService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAFeedingService.cs
@@ -77,7 +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();
+                //var carryCodes = await _db.Queryable<WmsCarryCode>().Where(it => it.carry_id == carryId).ToListAsync();
                 if (carryMaterial != null && feedBox != null && carry != null)
                 {
                     //更新投料箱

From a4298ca2d928dc48c535ff9db81f181169d22676 Mon Sep 17 00:00:00 2001
From: FanLian <fanlian2@163.com>
Date: Tue, 4 Jul 2023 09:35:13 +0800
Subject: [PATCH 2/2] 1

---
 .../Dto/Inputs/BarCodePrintInput.cs            |  2 +-
 .../Dto/Inputs/GenPreTaskUpInput.cs            | 18 +++++++++---------
 .../Dto/Inputs/InOutStockApplyforUpInput.cs    |  6 +++---
 3 files changed, 13 insertions(+), 13 deletions(-)

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
         /// <summary>
         /// 入库申请单Id列表
         /// </summary>
-        public List<string> BillIds { get; set; }
+        public List<string>? 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
         /// <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>
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
         /// <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; }
     }
 }