diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml index 5fd668ef..0cc19629 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml @@ -5295,6 +5295,11 @@ 是否不参与记数 + + + 数字序列号 + + 物料编码 @@ -6460,6 +6465,11 @@ 是否不参与记数 + + + 数字序列号 + + ID请求对象 diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml index c5745afa..6a6b8409 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml @@ -2364,6 +2364,11 @@ 是否不参与记数 + + + 数字序列号 + + 操作(绑定箱信息) diff --git a/src/WMS.Web.Core/Dto/OpsBoxResponse.cs b/src/WMS.Web.Core/Dto/OpsBoxResponse.cs index b8f0b7cc..5e75e093 100644 --- a/src/WMS.Web.Core/Dto/OpsBoxResponse.cs +++ b/src/WMS.Web.Core/Dto/OpsBoxResponse.cs @@ -90,6 +90,13 @@ namespace WMS.Web.Core.Dto [JsonProperty("isNotCount")] public string IsNotCount { get; set; } + /// + /// 数字序列号 + /// + [JsonProperty("NumberCode")] + public string NumberCode { get; set; } + + } diff --git a/src/WMS.Web.Core/Dto/SerialNumbers/SerialNumbersWmsResponse.cs b/src/WMS.Web.Core/Dto/SerialNumbers/SerialNumbersWmsResponse.cs index 369d6719..b42764a1 100644 --- a/src/WMS.Web.Core/Dto/SerialNumbers/SerialNumbersWmsResponse.cs +++ b/src/WMS.Web.Core/Dto/SerialNumbers/SerialNumbersWmsResponse.cs @@ -45,6 +45,10 @@ namespace WMS.Web.Core.Dto.SerialNumbers /// 是否不参与记数 /// public string IsNotCount { get; set; } + /// + /// 数字序列号 + /// + public string NumberCode { get; set; } } } diff --git a/src/WMS.Web.Domain/Entitys/SerialNumbers.cs b/src/WMS.Web.Domain/Entitys/SerialNumbers.cs index c5eede70..78e929a2 100644 --- a/src/WMS.Web.Domain/Entitys/SerialNumbers.cs +++ b/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,int isTwo,string twoSerialNumber,string isNotCount) + public SerialNumbers(string serialNumber, string materialNumber, int boxId, int opsBoxId, string creator, DateTime? createTime, DateTime? completeCartonTime,int isTwo,string twoSerialNumber,string isNotCount,string numberCode) { this.SerialNumber = serialNumber; this.MaterialNumber = materialNumber; @@ -29,6 +29,7 @@ namespace WMS.Web.Domain.Entitys this.IsTwo = isTwo; this.TwoSerialNumber = twoSerialNumber; this.IsNotCount = isNotCount; + this.NumberCode = numberCode; } /// /// 主键 订单编号 @@ -123,6 +124,11 @@ namespace WMS.Web.Domain.Entitys [Column("isNotCount")] public string IsNotCount { get; set; }= string.Empty; + /// + /// 数字序列号 + /// + [Column("NumberCode")] + public string NumberCode { get; set; } = string.Empty; /// /// 操作(绑定箱信息) diff --git a/src/WMS.Web.Domain/Services/BoxService.cs b/src/WMS.Web.Domain/Services/BoxService.cs index 60a01c96..f2c0dcb4 100644 --- a/src/WMS.Web.Domain/Services/BoxService.cs +++ b/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,sn.IsTwo, sn.TwoSerialNumber, sn.IsNotCount); + SerialNumbers s = new SerialNumbers(sn.SerialNumber, detail.MaterialNumber, b.Id, b.OpsBoxId, opsSerial.BarCereateUser, opsSerial.BarCreateTime, b.CompleteCartonTime,sn.IsTwo, sn.TwoSerialNumber, sn.IsNotCount,sn.NumberCode); sList.Add(s); //序列号记录(序列号生成) SerialNumberOperate so = new SerialNumberOperate(sn.SerialNumber, SerialNumberOperateType.Generate, detail.MaterialNumber, opsSerial.BarCereateUser, "", b.SupplierId, b.OrgId, null, opsSerial.BarCreateTime); diff --git a/src/WMS.Web.Domain/Services/SerialNumberService.cs b/src/WMS.Web.Domain/Services/SerialNumberService.cs index 9b8f729c..a893beef 100644 --- a/src/WMS.Web.Domain/Services/SerialNumberService.cs +++ b/src/WMS.Web.Domain/Services/SerialNumberService.cs @@ -538,7 +538,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, 1, s, "0"); + SerialNumbers s_new = new SerialNumbers(s, takeStockDetail.MaterialNumber, takeStockDetail.Id, 0, "", DateTime.Now, DateTime.Now, 1, s, "0",""); sList.Add(s_new); } else @@ -669,7 +669,7 @@ namespace WMS.Web.Domain.Services isNotCount = "0"; } SerialNumbers entity = new SerialNumbers(NumberCode[j], res.Data.MaterialNumber - , 0, 0, res.Data.Creator, res.Data.CreateTime, null, res.Data.IsTwo, res.Data.TwoNumberCode, isNotCount); + , 0, 0, res.Data.Creator, res.Data.CreateTime, null, res.Data.IsTwo, res.Data.TwoNumberCode, isNotCount,res.Data.NumberCode); var isSuccess = await _serialNumbersRepositories.AddRange(new List() { entity }); if (!isSuccess) return Result.ReFailure(ResultCodes.DateWriteError); } @@ -689,7 +689,7 @@ namespace WMS.Web.Domain.Services isNotCount = "0"; } SerialNumbers entity = new SerialNumbers(serial[j], res.Data.MaterialNumber - , 0, 0, res.Data.Creator, res.Data.CreateTime, null, res.Data.IsTwo, res.Data.TwoSerialNumber, isNotCount); + , 0, 0, res.Data.Creator, res.Data.CreateTime, null, res.Data.IsTwo, res.Data.TwoSerialNumber, isNotCount,res.Data.NumberCode); var isSuccess = await _serialNumbersRepositories.AddRange(new List() { entity }); if (!isSuccess) return Result.ReFailure(ResultCodes.DateWriteError); } @@ -715,7 +715,7 @@ namespace WMS.Web.Domain.Services SerialNumbers entity = new SerialNumbers(res.Data.SerialNumber, res.Data.MaterialNumber - , 0, 0, res.Data.Creator, res.Data.CreateTime, null, res.Data.IsTwo, res.Data.TwoSerialNumber, res.Data.IsNotCount); + , 0, 0, res.Data.Creator, res.Data.CreateTime, null, res.Data.IsTwo, res.Data.TwoSerialNumber, res.Data.IsNotCount,res.Data.NumberCode); var isSuccess = await _serialNumbersRepositories.AddRange(new List() { entity }); if (!isSuccess) return Result.ReFailure(ResultCodes.DateWriteError); diff --git a/src/WMS.Web.Repositories/SerialNumbersRepositories.cs b/src/WMS.Web.Repositories/SerialNumbersRepositories.cs index bb85812f..59ac4898 100644 --- a/src/WMS.Web.Repositories/SerialNumbersRepositories.cs +++ b/src/WMS.Web.Repositories/SerialNumbersRepositories.cs @@ -319,8 +319,16 @@ namespace WMS.Web.Repositories response.IsTwo = entity.serial.IsTwo; if (entity.serial.IsTwo > 1) { + if (entity.serial.TwoSerialNumber != null) { + // bool isNumber = false; + //if(entity.serial.TwoSerialNumber.IndexOf(serialNumber) >= 0) + // { + // // isNumber = true;//说明用的是数字序列号 + // // response.TwoSerialNumber = entity.serial.TwoSerialNumber.Replace(entity.serial., "").Replace(",", ""); + //} + response.TwoSerialNumber = entity.serial.TwoSerialNumber.Replace(entity.serial.SerialNumber, "").Replace(",", ""); response.IsNotCount = entity.serial.IsNotCount; }