From 2bbe05074b5ece9412945317635eca0d091818b0 Mon Sep 17 00:00:00 2001
From: 18942506660 <18942506660@A18942506660>
Date: Wed, 22 Nov 2023 11:56:51 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/WMS.Web.Core/Dto/OutStock/SaveOutStockRequest.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/WMS.Web.Core/Dto/OutStock/SaveOutStockRequest.cs b/src/WMS.Web.Core/Dto/OutStock/SaveOutStockRequest.cs
index 34743998..59d1765f 100644
--- a/src/WMS.Web.Core/Dto/OutStock/SaveOutStockRequest.cs
+++ b/src/WMS.Web.Core/Dto/OutStock/SaveOutStockRequest.cs
@@ -41,9 +41,9 @@ namespace WMS.Web.Core.Dto.OutStock
         [Required(ErrorMessage = "箱不能为空")]
         public int BoxId { get; set; }
         /// <summary>
-        /// 仓位不能为空
+        /// 箱对应仓位不能为空
         /// </summary>
-        [Required(ErrorMessage = "箱不能为空")]
+        [Required(ErrorMessage = "仓位不能为空")]
         public int SubStockId { get; set; }
         /// <summary>
         /// 序列号集

From 999721abbb2304b3d54b6d9e53700e70ecadfdb1 Mon Sep 17 00:00:00 2001
From: 18942506660 <18942506660@A18942506660>
Date: Wed, 22 Nov 2023 13:49:30 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/WMS.Web.Api/Controllers/TestController.cs        | 9 +++++----
 src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml             | 2 +-
 src/WMS.Web.Domain/Entitys/OutStockTask.cs           | 2 +-
 src/WMS.Web.Domain/Services/OutStockTaskService.cs   | 2 +-
 src/WMS.Web.Repositories/OutStockTaskRepositories.cs | 2 +-
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/WMS.Web.Api/Controllers/TestController.cs b/src/WMS.Web.Api/Controllers/TestController.cs
index bb991418..f6124e8f 100644
--- a/src/WMS.Web.Api/Controllers/TestController.cs
+++ b/src/WMS.Web.Api/Controllers/TestController.cs
@@ -46,10 +46,11 @@ namespace WMS.Web.Api.Controllers
         [Route("hj")]
         public async Task<string> TestHJ()
         {
-            var bc = await _erpService.BillQueryForTransferOutOutStock(null, DateTime.Now.AddDays(-10));
-            var b=await _erpService.BillQueryForAssembledAppOutStock_Assembly(null, DateTime.Now.AddDays(-10));
-            var b2 = await _erpService.BillQueryForAssembledAppOutStock_Dassembly(null, DateTime.Now.AddDays(-10));
-            //var result = await this._outStockTaskService.Sync(null);
+            //var bc2 = await _erpService.BillQueryForMisDeliveryOutStock(null, DateTime.Now.AddDays(-10)); 
+            //var bc = await _erpService.BillQueryForTransferOutOutStock(null, DateTime.Now.AddDays(-10));
+            //var b=await _erpService.BillQueryForAssembledAppOutStock_Assembly(null, DateTime.Now.AddDays(-10));
+            //var b2 = await _erpService.BillQueryForAssembledAppOutStock_Dassembly(null, DateTime.Now.AddDays(-10));
+            var result = await this._outStockTaskService.Sync(null);
             //var t=await _outStockTaskRepositories.Get(1);
             // t.Details[0].Remark = "sdf";
             // t.Details[0].ErpDetails[0].SaleBillNo = "sdfsfsbbbb";
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
index 81652376..af1c87a8 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
@@ -3898,7 +3898,7 @@
         </member>
         <member name="P:WMS.Web.Core.Dto.OutStock.SaveOutStockDetailsRequest.SubStockId">
             <summary>
-            仓位不能为空
+            箱对应仓位不能为空
             </summary>
         </member>
         <member name="P:WMS.Web.Core.Dto.OutStock.SaveOutStockDetailsRequest.SerialNumbers">
diff --git a/src/WMS.Web.Domain/Entitys/OutStockTask.cs b/src/WMS.Web.Domain/Entitys/OutStockTask.cs
index 077585d5..51776e6f 100644
--- a/src/WMS.Web.Domain/Entitys/OutStockTask.cs
+++ b/src/WMS.Web.Domain/Entitys/OutStockTask.cs
@@ -47,7 +47,7 @@ namespace WMS.Web.Domain.Entitys
         /// 仓库ID
         ///</summary> 
         [Column("StockCode")]
-        public string StockCode { get; set; }
+        public string StockCode { get; set; } = "";
         /// <summary>
         /// 单据状态
         /// </summary>
diff --git a/src/WMS.Web.Domain/Services/OutStockTaskService.cs b/src/WMS.Web.Domain/Services/OutStockTaskService.cs
index d944f706..17ce3d31 100644
--- a/src/WMS.Web.Domain/Services/OutStockTaskService.cs
+++ b/src/WMS.Web.Domain/Services/OutStockTaskService.cs
@@ -107,7 +107,7 @@ namespace WMS.Web.Domain.Services
                 {
                     var sourcNos = outStockTask.Details.SelectMany(s => s.ErpDetails).Select(s => s.SourceBillNo).ToList();
                     //仓库不同 拆分成不同的任务单
-                    var erps = erp_list.Where(w => sourcNos.Contains(w.SourceBillNo) && outStockTask.StockCode.Equals(w.StockCode)).ToList();
+                    var erps = erp_list.Where(w => sourcNos.Contains(w.SourceBillNo) && w.StockCode.Equals(outStockTask.StockCode)).ToList();
                     foreach (var erp in erps)
                     {
                         //仓库不同 拆分成不同的
diff --git a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs
index 17fe4201..0b111a7e 100644
--- a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs
+++ b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs
@@ -419,7 +419,7 @@ namespace WMS.Web.Repositories
                     _transaction.Commit();
                 return true;
             }
-            catch
+            catch(Exception e)
             {
                 if (_transaction != null)
                     _transaction.Rollback();