From 7f6aa9bcb548b11c4db593022fc90d1fc7f12413 Mon Sep 17 00:00:00 2001
From: 18942506660 <18942506660@A18942506660>
Date: Tue, 14 Nov 2023 15:19:00 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=81ops=E5=A2=9E=E5=8A=A0=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/WMS.Web.Api/Controllers/TestController.cs | 4 ++--
 src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml    | 3 +++
 src/WMS.Web.Core/Dto/OpsBoxResponse.cs        | 7 ++++++-
 src/WMS.Web.Domain/Entitys/Box.cs             | 4 ++++
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/WMS.Web.Api/Controllers/TestController.cs b/src/WMS.Web.Api/Controllers/TestController.cs
index c73a9b75..d7fe70d5 100644
--- a/src/WMS.Web.Api/Controllers/TestController.cs
+++ b/src/WMS.Web.Api/Controllers/TestController.cs
@@ -40,8 +40,8 @@ namespace WMS.Web.Api.Controllers
         [Route("hj")]
         public async Task<string> TestHJ()
         {
-            //await _boxService.Sync();
-            var res = await this._erpService.BillQueryForDeliveryNoticeOutStock(null,DateTime.Now.AddDays(-300));
+            await _boxService.Sync();
+            //var res = await this._erpService.BillQueryForDeliveryNoticeOutStock(null,DateTime.Now.AddDays(-300));
             //var result= await this._erpService.BillQueryForPurchaseInStock();
             //var result = await this._erpService.BillQueryForOrg();
             var result = await this._erpService.BillQueryForMaterial();
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
index 2e8d04f8..684922ef 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
@@ -1789,6 +1789,9 @@
         <member name="M:WMS.Web.Domain.Infrastructure.ISerialNumbersRepositories.GetEntityListByBoxId(System.Int32)">
             根据箱Id查询集合
         </member>
+        <member name="M:WMS.Web.Domain.Infrastructure.ISerialNumbersRepositories.GetEntityListByBoxIds(System.Collections.Generic.List{System.Int32})">
+            根据箱Ids查询集合
+        </member>
         <member name="M:WMS.Web.Domain.Infrastructure.ISerialNumbersRepositories.EditEntityList(System.Collections.Generic.List{WMS.Web.Domain.Entitys.SerialNumbers},System.Boolean)">
             修改实体集合
         </member>
diff --git a/src/WMS.Web.Core/Dto/OpsBoxResponse.cs b/src/WMS.Web.Core/Dto/OpsBoxResponse.cs
index b05cd54e..3a0b6016 100644
--- a/src/WMS.Web.Core/Dto/OpsBoxResponse.cs
+++ b/src/WMS.Web.Core/Dto/OpsBoxResponse.cs
@@ -36,9 +36,14 @@ namespace WMS.Web.Core.Dto
         [JsonProperty("CompleteCartonTime")]
         public DateTime CompleteCartonTime { get; set; } = DateTime.Now;
         /// <summary>
-        /// 箱子创建用户
+        /// 完成装箱用户
         /// </summary>
         [JsonProperty("BoxUser")]
+        public string CompleteCartonUser { get; set; }
+        /// <summary>
+        /// 箱子创建用户
+        /// </summary>
+        [JsonProperty("Create_user")]
         public string CreateUser { get; set; }
         /// <summary>
         /// 创建时间（对应老OPS的创建时间）
diff --git a/src/WMS.Web.Domain/Entitys/Box.cs b/src/WMS.Web.Domain/Entitys/Box.cs
index 2fb91b5e..fb4d08d2 100644
--- a/src/WMS.Web.Domain/Entitys/Box.cs
+++ b/src/WMS.Web.Domain/Entitys/Box.cs
@@ -43,6 +43,10 @@ namespace WMS.Web.Domain.Entitys
         /// </summary>
         public DateTime CompleteCartonTime { get; set; } = DateTime.Now;
         /// <summary>
+        /// 完成装箱用户
+        /// </summary>
+        public string CompleteCartonUser { get; set; }
+        /// <summary>
         /// 箱子创建用户
         /// </summary>
         public string CreateUser { get; set; }