diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml index 7f9634d6..98edc117 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml @@ -417,6 +417,11 @@ 数量 + + + 序列号集 + + erp入库任务表 @@ -1883,6 +1888,9 @@ 入库 + + 出入库回退 + 序列号操作记录 @@ -3602,6 +3610,15 @@ + + + 出入库回退 + + + + + + 盘点单服务 @@ -4047,6 +4064,16 @@ 组装拆卸入库 + + + 入库回退下架 + + + + + 出库回退上架 + + 非采购上架方式 diff --git a/src/WMS.Web.Domain/Entitys/BackRecordDetails.cs b/src/WMS.Web.Domain/Entitys/BackRecordDetails.cs index 558299ae..aeea13fa 100644 --- a/src/WMS.Web.Domain/Entitys/BackRecordDetails.cs +++ b/src/WMS.Web.Domain/Entitys/BackRecordDetails.cs @@ -40,6 +40,6 @@ namespace WMS.Web.Domain.Entitys /// /// 序列号集 /// - public string SerialNumbers { get; set; } + public List SerialNumbers { get; set; } = new List(); } } diff --git a/src/WMS.Web.Domain/Entitys/InStockDetails.cs b/src/WMS.Web.Domain/Entitys/InStockDetails.cs index 70a6181f..a6243364 100644 --- a/src/WMS.Web.Domain/Entitys/InStockDetails.cs +++ b/src/WMS.Web.Domain/Entitys/InStockDetails.cs @@ -53,5 +53,10 @@ namespace WMS.Web.Domain.Entitys /// 数量 /// public decimal Qty { get; set; } + + /// + /// 序列号集 + /// + public List SerialNumbers { get; set; } = new List(); } } diff --git a/src/WMS.Web.Repositories/BackRecordRepositories.cs b/src/WMS.Web.Repositories/BackRecordRepositories.cs index f6638d88..8580fb71 100644 --- a/src/WMS.Web.Repositories/BackRecordRepositories.cs +++ b/src/WMS.Web.Repositories/BackRecordRepositories.cs @@ -1,6 +1,7 @@ using AutoMapper; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Storage; +using Newtonsoft.Json; using System; using System.Collections.Generic; using System.Linq; @@ -85,7 +86,7 @@ namespace WMS.Web.Repositories Specifications = "", Qty = s.detail.Qty, SubStock = "", - SerialNumbers = s.detail.SerialNumbers + SerialNumbers = JsonConvert.SerializeObject(s.detail.SerialNumbers), }).OrderByDescending(x => x.Id).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync(); response.Data = list; diff --git a/src/WMS.Web.Repositories/Configuration/RepositoryDbContext.cs b/src/WMS.Web.Repositories/Configuration/RepositoryDbContext.cs index c33b99fa..aa94991a 100644 --- a/src/WMS.Web.Repositories/Configuration/RepositoryDbContext.cs +++ b/src/WMS.Web.Repositories/Configuration/RepositoryDbContext.cs @@ -143,6 +143,9 @@ namespace WMS.Web.Repositories.Configuration { ent.ToTable("t_wms_instock_details"); ent.HasKey(x => x.Id); + ent.Property(f => f.SerialNumbers).HasConversion( + v => JsonConvert.SerializeObject(v), + v => JsonConvert.DeserializeObject>(v)); }); # endregion @@ -187,6 +190,9 @@ namespace WMS.Web.Repositories.Configuration { ent.ToTable("t_wms_back_record_details"); ent.HasKey(x => x.Id); + ent.Property(f => f.SerialNumbers).HasConversion( + v => JsonConvert.SerializeObject(v), + v => JsonConvert.DeserializeObject>(v)); }); #endregion