修复bug
This commit is contained in:
@@ -1092,6 +1092,41 @@
|
|||||||
生成单据号
|
生成单据号
|
||||||
</summary>
|
</summary>
|
||||||
</member>
|
</member>
|
||||||
|
<member name="T:WMS.Web.Domain.Entitys.OutStockBoxsDetails">
|
||||||
|
<summary>
|
||||||
|
对应金蝶的明细
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:WMS.Web.Domain.Entitys.OutStockBoxsDetails.Id">
|
||||||
|
<summary>
|
||||||
|
主键 订单编号
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:WMS.Web.Domain.Entitys.OutStockBoxsDetails.DetailId">
|
||||||
|
<summary>
|
||||||
|
任务单明细Id
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:WMS.Web.Domain.Entitys.OutStockBoxsDetails.BoxId">
|
||||||
|
<summary>
|
||||||
|
任务单明细Id
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:WMS.Web.Domain.Entitys.OutStockBoxsDetails.SerialNumbers">
|
||||||
|
<summary>
|
||||||
|
序列号
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:WMS.Web.Domain.Entitys.OutStockBoxsDetails.SubStockId">
|
||||||
|
<summary>
|
||||||
|
仓位
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:WMS.Web.Domain.Entitys.OutStockBoxsDetails.Qty">
|
||||||
|
<summary>
|
||||||
|
出库数量
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
<member name="T:WMS.Web.Domain.Entitys.OutStockDetails">
|
<member name="T:WMS.Web.Domain.Entitys.OutStockDetails">
|
||||||
<summary>
|
<summary>
|
||||||
wms出库单明细
|
wms出库单明细
|
||||||
@@ -1127,6 +1162,11 @@
|
|||||||
对应erp明细 同一个物料 存在于不同的来源单中(合并后出现多条)
|
对应erp明细 同一个物料 存在于不同的来源单中(合并后出现多条)
|
||||||
</summary>
|
</summary>
|
||||||
</member>
|
</member>
|
||||||
|
<member name="P:WMS.Web.Domain.Entitys.OutStockDetails.BoxsDetails">
|
||||||
|
<summary>
|
||||||
|
出库时对应箱信息
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
<member name="T:WMS.Web.Domain.Entitys.OutStockErpDetails">
|
<member name="T:WMS.Web.Domain.Entitys.OutStockErpDetails">
|
||||||
<summary>
|
<summary>
|
||||||
对应金蝶的明细
|
对应金蝶的明细
|
||||||
@@ -2165,14 +2205,6 @@
|
|||||||
<param name="isTransaction"></param>
|
<param name="isTransaction"></param>
|
||||||
<returns></returns>
|
<returns></returns>
|
||||||
</member>
|
</member>
|
||||||
<member name="M:WMS.Web.Domain.IService.IBoxInventoryService.GenerateMoveBox(System.Collections.Generic.List{WMS.Web.Core.Dto.Inventory.BoxInventoryMoveGenerateDto},System.Boolean)">
|
|
||||||
<summary>
|
|
||||||
移箱-箱库存的变更
|
|
||||||
</summary>
|
|
||||||
<param name="dtoDatas"></param>
|
|
||||||
<param name="isTransaction"></param>
|
|
||||||
<returns></returns>
|
|
||||||
</member>
|
|
||||||
<member name="M:WMS.Web.Domain.IService.IBoxInventoryService.GenerateBackBox(System.Collections.Generic.List{WMS.Web.Core.Dto.Inventory.BoxInventoryBackGenerateDto},System.Boolean)">
|
<member name="M:WMS.Web.Domain.IService.IBoxInventoryService.GenerateBackBox(System.Collections.Generic.List{WMS.Web.Core.Dto.Inventory.BoxInventoryBackGenerateDto},System.Boolean)">
|
||||||
<summary>
|
<summary>
|
||||||
入库回退上下架-箱库存的变更
|
入库回退上下架-箱库存的变更
|
||||||
|
|||||||
48
src/WMS.Web.Domain/Entitys/OutStockBoxsDetails.cs
Normal file
48
src/WMS.Web.Domain/Entitys/OutStockBoxsDetails.cs
Normal file
@@ -0,0 +1,48 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.ComponentModel.DataAnnotations.Schema;
|
||||||
|
using System.Text;
|
||||||
|
using WMS.Web.Core;
|
||||||
|
|
||||||
|
namespace WMS.Web.Domain.Entitys
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 对应金蝶的明细
|
||||||
|
/// </summary>
|
||||||
|
[Serializable]
|
||||||
|
[Table("t_wms_outstock_boxs_details")]
|
||||||
|
public class OutStockBoxsDetails : EntityBase
|
||||||
|
{
|
||||||
|
public OutStockBoxsDetails() { }
|
||||||
|
/// <summary>
|
||||||
|
/// 主键 订单编号
|
||||||
|
/// </summary>
|
||||||
|
[Column("Id")]
|
||||||
|
public override int Id { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// 任务单明细Id
|
||||||
|
/// </summary>
|
||||||
|
[Column("DetailId")]
|
||||||
|
public int DetailId { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// 任务单明细Id
|
||||||
|
/// </summary>
|
||||||
|
[Column("BoxId")]
|
||||||
|
public int BoxId { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// 序列号
|
||||||
|
/// </summary>
|
||||||
|
[Column("SerialNumbers")]
|
||||||
|
public List<string> SerialNumbers { get; set; } = new List<string>();
|
||||||
|
/// <summary>
|
||||||
|
/// 仓位
|
||||||
|
///</summary>
|
||||||
|
[Column("SubStockId")]
|
||||||
|
public int SubStockId { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// 出库数量
|
||||||
|
///</summary>
|
||||||
|
[Column("Qty")]
|
||||||
|
public decimal Qty { get; set; }
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -51,5 +51,9 @@ namespace WMS.Web.Domain.Entitys
|
|||||||
/// 对应erp明细 同一个物料 存在于不同的来源单中(合并后出现多条)
|
/// 对应erp明细 同一个物料 存在于不同的来源单中(合并后出现多条)
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public List<OutStockErpDetails> ErpDetails { get; set; } = new List<OutStockErpDetails>();
|
public List<OutStockErpDetails> ErpDetails { get; set; } = new List<OutStockErpDetails>();
|
||||||
|
/// <summary>
|
||||||
|
/// 出库时对应箱信息
|
||||||
|
/// </summary>
|
||||||
|
public List<OutStockBoxsDetails> BoxsDetails { get; set; } = new List<OutStockBoxsDetails>();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -32,7 +32,8 @@ namespace WMS.Web.Domain.Mappers
|
|||||||
.ForMember(x => x.Id, ops => ops.Ignore())
|
.ForMember(x => x.Id, ops => ops.Ignore())
|
||||||
.ForMember(x => x.DetailId, ops => ops.Ignore())
|
.ForMember(x => x.DetailId, ops => ops.Ignore())
|
||||||
.ForMember(x => x.Qty, ops => ops.Ignore());
|
.ForMember(x => x.Qty, ops => ops.Ignore());
|
||||||
|
CreateMap<SaveOutStockDetailsRequest, OutStockBoxsDetails>();
|
||||||
|
|
||||||
|
|
||||||
CreateMap<OutStockTask, GetOutStockTaskByNoResponse>();
|
CreateMap<OutStockTask, GetOutStockTaskByNoResponse>();
|
||||||
CreateMap<OutStockTaskDetails, GetOutStockTaskByNoDetailsResponse>();
|
CreateMap<OutStockTaskDetails, GetOutStockTaskByNoDetailsResponse>();
|
||||||
|
|||||||
@@ -95,6 +95,9 @@ namespace WMS.Web.Domain.Services
|
|||||||
oErpDetail.Qty = c.qty;
|
oErpDetail.Qty = c.qty;
|
||||||
outd.ErpDetails.Add(oErpDetail);
|
outd.ErpDetails.Add(oErpDetail);
|
||||||
}
|
}
|
||||||
|
var boxs = dto.Details.Where(w => w.MaterialId == mid).ToList();
|
||||||
|
outd.BoxsDetails = _mapper.Map<List<OutStockBoxsDetails>>(boxs);
|
||||||
|
|
||||||
outd.Qty = qty;
|
outd.Qty = qty;
|
||||||
outd.SerialNumbers.AddRange(dtoDetails.SelectMany(s => s.SerialNumbers));
|
outd.SerialNumbers.AddRange(dtoDetails.SelectMany(s => s.SerialNumbers));
|
||||||
entity.Details.Add(outd);
|
entity.Details.Add(outd);
|
||||||
|
|||||||
@@ -103,6 +103,11 @@ namespace WMS.Web.Repositories.Configuration
|
|||||||
.WithOne()
|
.WithOne()
|
||||||
.HasForeignKey(p => p.DetailId)
|
.HasForeignKey(p => p.DetailId)
|
||||||
.OnDelete(DeleteBehavior.Cascade);
|
.OnDelete(DeleteBehavior.Cascade);
|
||||||
|
|
||||||
|
ent.HasMany(p => p.BoxsDetails)
|
||||||
|
.WithOne()
|
||||||
|
.HasForeignKey(p => p.DetailId)
|
||||||
|
.OnDelete(DeleteBehavior.Cascade);
|
||||||
});
|
});
|
||||||
|
|
||||||
builder.Entity<OutStockErpDetails>(ent =>
|
builder.Entity<OutStockErpDetails>(ent =>
|
||||||
@@ -110,6 +115,16 @@ namespace WMS.Web.Repositories.Configuration
|
|||||||
ent.ToTable("t_wms_outstock_erp_details");
|
ent.ToTable("t_wms_outstock_erp_details");
|
||||||
ent.HasKey(x => x.Id);
|
ent.HasKey(x => x.Id);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
builder.Entity<OutStockBoxsDetails>(ent =>
|
||||||
|
{
|
||||||
|
ent.ToTable("t_wms_outstock_boxs_details");
|
||||||
|
ent.HasKey(x => x.Id);
|
||||||
|
|
||||||
|
ent.Property(f => f.SerialNumbers).HasConversion(
|
||||||
|
v => JsonConvert.SerializeObject(v),
|
||||||
|
v => JsonConvert.DeserializeObject<List<string>>(v));
|
||||||
|
});
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#region 出库任务单
|
#region 出库任务单
|
||||||
|
|||||||
Reference in New Issue
Block a user