修改了同步条码

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

@@ -5245,6 +5245,21 @@
             序列号生成用户
             </summary>
         </member>
+        <member name="P:WMS.Web.Core.Dto.OpsSerialNumbersResponse.IsTwo">
+            <summary>
+            是否套装
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.OpsSerialNumbersResponse.TwoSerialNumber">
+            <summary>
+            第二个序列号
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.OpsSerialNumbersResponse.IsNotCount">
+            <summary>
+            是否不参与记数
+            </summary>
+        </member>
         <member name="P:WMS.Web.Core.Dto.OpsBoxDetailsResponse.MaterialNumber">
             <summary>
             物料编码
@@ -6385,6 +6400,21 @@
             生成时间
             </summary>
         </member>
+        <member name="P:WMS.Web.Core.Dto.SerialNumbers.SerialNumbersWmsResponse.IsTwo">
+            <summary>
+            是否套装
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.SerialNumbers.SerialNumbersWmsResponse.TwoSerialNumber">
+            <summary>
+            第二个序列号
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.SerialNumbers.SerialNumbersWmsResponse.IsNotCount">
+            <summary>
+            是否不参与记数
+            </summary>
+        </member>
         <member name="T:WMS.Web.Core.Dto.SingleData.IdRequest">
             <summary>
             ID请求对象

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

@@ -2334,6 +2334,21 @@
              是否激活过(只有做过 盘点 采购和非采购上架 出库回退上架 才算激活)
             </summary> 
         </member>
+        <member name="P:WMS.Web.Domain.Entitys.SerialNumbers.TwoSerialNumber">
+            <summary>
+            产生第二个
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Domain.Entitys.SerialNumbers.IsTwo">
+            <summary>
+            是否套装
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Domain.Entitys.SerialNumbers.IsNotCount">
+            <summary>
+            是否不参与记数
+            </summary>
+        </member>
         <member name="M:WMS.Web.Domain.Entitys.SerialNumbers.Bind(System.Int32,System.DateTime)">
             <summary>
             操作(绑定箱信息)

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

@@ -74,6 +74,24 @@ namespace WMS.Web.Core.Dto
         [JsonProperty("barCereateUser")]
         public string BarCereateUser { get; set; }
 
+        /// <summary>
+        /// 是否套装
+        /// </summary>
+        [JsonProperty("isTwo")]
+        public int IsTwo { get; set; }
+        /// <summary>
+        /// 第二个序列号
+        /// </summary>
+        [JsonProperty("twoSerialNumber")]
+        public string TwoSerialNumber { get; set; }
+        /// <summary>
+        /// 是否不参与记数
+        /// </summary>
+        [JsonProperty("isNotCount")]
+        public string IsNotCount { get; set; }
+
+
+
     }
     public class OpsBoxDetailsResponse {
         /// <summary>

src/WMS.Web.Core/Dto/SerialNumbers/SerialNumbersWmsResponse.cs

@@ -27,5 +27,18 @@ namespace WMS.Web.Core.Dto.SerialNumbers
         /// 生成时间
         /// </summary>
         public DateTime CreateTime { get; set; } = DateTime.Now;
+        /// <summary>
+        /// 是否套装
+        /// </summary>
+        public int IsTwo { get; set; }
+        /// <summary>
+        /// 第二个序列号
+        /// </summary>
+        public string TwoSerialNumber { get; set; }
+        /// <summary>
+        /// 是否不参与记数
+        /// </summary>
+        public string IsNotCount { get; set; }
+
     }
 }

src/WMS.Web.Domain/Entitys/SerialNumbers.cs

@@ -17,7 +17,7 @@ namespace WMS.Web.Domain.Entitys
     public class SerialNumbers : EntityBase
     {
         public SerialNumbers() { }
-        public SerialNumbers(string serialNumber, string materialNumber, int boxId, int opsBoxId, string creator, DateTime? createTime, DateTime? completeCartonTime)
+        public SerialNumbers(string serialNumber, string materialNumber, int boxId, int opsBoxId, string creator, DateTime? createTime, DateTime? completeCartonTime,int isTwo,string twoSerialNumber,string isNotCount)
         {
             this.SerialNumber = serialNumber;
             this.MaterialNumber = materialNumber;
@@ -26,6 +26,9 @@ namespace WMS.Web.Domain.Entitys
             this.Creator = creator;
             this.CreateTime = createTime == null ? DateTime.Now : (DateTime)createTime;
             this.CompleteCartonTime = completeCartonTime;
+            this.IsTwo = isTwo;
+            this.TwoSerialNumber = twoSerialNumber;
+            this.IsNotCount = isNotCount;
         }
         /// <summary>
         /// 主键 订单编号
@@ -102,11 +105,24 @@ namespace WMS.Web.Domain.Entitys
         ///</summary> 
         [Column("IsActivate")]
         public bool? IsActivate { get; set; } = false;
-        ///// <summary>
+        /// <summary>
-        ///// 产生第二个
+        /// 产生第二个
-        ///// </summary>
+        /// </summary>
-        //[Column("TwoSerialNumber")]
+        [Column("TwoSerialNumber")]
-        //public string? TwoSerialNumber { get; set; } = string.Empty;
+        public string TwoSerialNumber { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 是否套装
+        /// </summary>
+        [Column("isTwo")]
+        public int? IsTwo { get; set; }
+
+        /// <summary>
+        /// 是否不参与记数
+        /// </summary>
+        [Column("isNotCount")]
+        public string IsNotCount { get; set; }= string.Empty;
+
 
         /// <summary>
         /// 操作(绑定箱信息)

src/WMS.Web.Domain/Services/BoxService.cs

@@ -111,7 +111,7 @@ namespace WMS.Web.Domain.Services
                         //SerialNumbers s = new SerialNumbers(serialList[i].SerialNumber, detail.MaterialNumber, b.Id, b.OpsBoxId, opsSerial.BarCereateUser, opsSerial.BarCreateTime, b.CompleteCartonTime);
                         //sList.Add(s);
 
-                    SerialNumbers s = new SerialNumbers(sn.SerialNumber, detail.MaterialNumber, b.Id, b.OpsBoxId, opsSerial.BarCereateUser, opsSerial.BarCreateTime, b.CompleteCartonTime);
+                    SerialNumbers s = new SerialNumbers(sn.SerialNumber, detail.MaterialNumber, b.Id, b.OpsBoxId, opsSerial.BarCereateUser, opsSerial.BarCreateTime, b.CompleteCartonTime,sn.IsTwo, sn.TwoSerialNumber, sn.IsNotCount);
                     sList.Add(s);
                     //序列号记录(序列号生成)
                     SerialNumberOperate so = new SerialNumberOperate(sn.SerialNumber, SerialNumberOperateType.Generate, detail.MaterialNumber, opsSerial.BarCereateUser, "", b.SupplierId, b.OrgId, null, opsSerial.BarCreateTime);

src/WMS.Web.Domain/Services/SerialNumberService.cs

@@ -489,7 +489,7 @@ namespace WMS.Web.Domain.Services
                 if (s_entity == null)
                 {
                     //序列号
-                    SerialNumbers s_new = new SerialNumbers(s, takeStockDetail.MaterialNumber, takeStockDetail.Id, 0, "", DateTime.Now, DateTime.Now);
+                    SerialNumbers s_new = new SerialNumbers(s, takeStockDetail.MaterialNumber, takeStockDetail.Id, 0, "", DateTime.Now, DateTime.Now, 1, s, "0");
                     sList.Add(s_new);
                 }
                 else
@@ -594,7 +594,7 @@ namespace WMS.Web.Domain.Services
             _logger.LogInformation($"拉取供应链系统条码结果:->{JsonConvert.SerializeObject(res)}");
             //插入序列码信息
             SerialNumbers entity = new SerialNumbers(res.Data.SerialNumber, res.Data.MaterialNumber
-                , 0, 0, res.Data.Creator, res.Data.CreateTime, null);
+                , 0, 0, res.Data.Creator, res.Data.CreateTime, null,res.Data.IsTwo, res.Data.TwoSerialNumber,res.Data.IsNotCount);
             var isSuccess = await _serialNumbersRepositories.AddRange(new List<SerialNumbers>() { entity });
             if (!isSuccess) return Result<MaterialResponse>.ReFailure(ResultCodes.DateWriteError);