调整ops箱结构

src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml

@@ -2345,6 +2345,21 @@
             组织Id
             </summary>
         </member>
+        <member name="P:WMS.Web.Core.Dto.OpsBoxResponse.CompleteCartonTime">
+            <summary>
+            完成装箱时间
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.OpsBoxResponse.cartonCreateTime">
+            <summary>
+            箱子的创建时间
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.OpsBoxResponse.BoxUser">
+            <summary>
+            箱子创建用户
+            </summary>
+        </member>
         <member name="P:WMS.Web.Core.Dto.OpsBoxResponse.CreateTime">
             <summary>
             创建时间（对应老OPS的创建时间）
@@ -2355,6 +2370,21 @@
             明细
             </summary>
         </member>
+        <member name="P:WMS.Web.Core.Dto.SerialNumbersResponse.SerialNumber">
+            <summary>
+            序列号
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.SerialNumbersResponse.barCreateTime">
+            <summary>
+            条码生成时间
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.SerialNumbersResponse.barCereateUser">
+            <summary>
+            条码生成用户
+            </summary>
+        </member>
         <member name="P:WMS.Web.Core.Dto.OpsBoxDetailsResponse.MaterialId">
             <summary>
             物料ID

src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml

@@ -1196,6 +1196,14 @@
             老ops箱信息
             </summary>
         </member>
+        <member name="M:WMS.Web.Domain.Infrastructure.IBoxRepositories.AddRange(System.Collections.Generic.List{WMS.Web.Domain.Entitys.Box},System.Boolean)">
+            <summary>
+            批量添加
+            </summary>
+            <param name="entitys"></param>
+            <param name="isTransaction"></param>
+            <returns></returns>
+        </member>
         <member name="T:WMS.Web.Domain.Infrastructure.IInStockRepositories">
             <summary>
             wms入库单-仓储接口

src/WMS.Web.Core/Dto/OpsBoxResponse.cs

@@ -1,4 +1,5 @@
-using System;
+using Newtonsoft.Json;
+using System;
 using System.Collections.Generic;
 using System.Text;
 
@@ -12,41 +13,83 @@ namespace WMS.Web.Core.Dto
         /// <summary>
         /// 对应老OPS的箱ID
         /// </summary>
+        [JsonProperty("CartonId")]
         public int OpsBoxId { get; set; }
-
         /// <summary>
         /// 箱编号（老OPS生成的箱号）
         /// </summary>
+        [JsonProperty("CartonNo")]
         public string BoxBillNo { get; set; }
         /// <summary>
         /// 供应商Id
         /// </summary>
+        [JsonProperty("GysNo")]
         public int? SupplierId { get; set; }
         /// <summary>
         /// 组织Id
         /// </summary>
+        [JsonProperty("orgId")]
         public int? OrgId { get; set; }
         /// <summary>
+        /// 完成装箱时间
+        /// </summary>
+        [JsonProperty("CompleteCartonTime")]
+        public string CompleteCartonTime { get; set; }
+        /// <summary>
+        /// 箱子的创建时间
+        /// </summary>
+        [JsonProperty("cartonCreateTime")]
+        public string cartonCreateTime { get; set; }
+        /// <summary>
+        /// 箱子创建用户
+        /// </summary>
+        [JsonProperty("BoxUser")]
+        public string BoxUser { get; set; }
+        /// <summary>
         /// 创建时间（对应老OPS的创建时间）
         /// </summary>
+        [JsonProperty("CreateTime")]
         public DateTime CreateTime { get; set; } = DateTime.Now;
         /// <summary>
         /// 明细
         /// </summary>
+        [JsonProperty("BoxReturnDetails")]
         public List<OpsBoxDetailsResponse> Details = new List<OpsBoxDetailsResponse>();
     }
+    public class SerialNumbersResponse
+    {
+        /// <summary>
+        /// 序列号
+        /// </summary>
+        [JsonProperty("sn")]
+        public string SerialNumber { get; set; }
+        /// <summary>
+        /// 条码生成时间
+        /// </summary>
+        [JsonProperty("barCreateTime")]
+        public string barCreateTime { get; set; }
+        /// <summary>
+        /// 条码生成用户
+        /// </summary>
+        [JsonProperty("barCereateUser")]
+        public string barCereateUser { get; set; }
+        
+    }
     public class OpsBoxDetailsResponse {
         /// <summary>
         /// 物料ID
         /// </summary>
+        [JsonProperty("FMaterialId")]
         public int MaterialId { get; set; }
         /// <summary>
         /// 数量（装箱数量）
         /// </summary>
+        [JsonProperty("Qty")]
         public decimal Qty { get; set; }
         /// <summary>
         /// 序列号集
         /// </summary>
-        public List<string> SerialNumbers { get; set; } = new List<string>();
+        [JsonProperty("SerialNumbers")]
+        public List<SerialNumbersResponse> SerialNumbers { get; set; } = new List<SerialNumbersResponse>();
     }
 }

src/WMS.Web.Domain/Services/Public/OpsService.cs

@@ -34,6 +34,29 @@ namespace WMS.Web.Domain.Services.Public
 
         public async Task<List<OpsBoxResponse>> GetBox(OpsBoxRequest request)
         {
+            OpsBoxResponse respnose = new OpsBoxResponse();
+            List<OpsBoxDetailsResponse> details = new List<OpsBoxDetailsResponse>();
+            List<SerialNumbersResponse> ss = new List<SerialNumbersResponse>();
+            ss.Add(new SerialNumbersResponse() { 
+             SerialNumber="sss",
+              barCereateUser="sdf",
+               barCreateTime="20-20-20"
+            });
+            ss.Add(new SerialNumbersResponse()
+            {
+                SerialNumber = "sss2",
+                barCereateUser = "sdf2",
+                barCreateTime = "20-20-20"
+            });
+            details.Add(new OpsBoxDetailsResponse()
+            {
+                MaterialId = 1,
+                Qty = 1,
+                SerialNumbers = ss
+            });
+            respnose.Details = details;
+            var str = JsonConvert.SerializeObject(respnose);
+
             var token = await GetToken();
             Dictionary<string, string> dicHeaders = new Dictionary<string, string>();
             dicHeaders.Add("Authorization", "Bearer " + token);