12 changed files with 32668 additions and 115 deletions
@ -1,58 +0,0 @@ |
|||
using System; |
|||
using System.ComponentModel.DataAnnotations; |
|||
using System.ComponentModel.DataAnnotations.Schema; |
|||
using Win_in.Sfs.Shared.Domain; |
|||
using Win_in.Sfs.Shared.Domain.Shared; |
|||
using Win_in.Sfs.Wms.Store.Application.Contracts; |
|||
|
|||
namespace Win_in.Sfs.Wms.Store.Requests.MaterialRequests; |
|||
|
|||
public class CoatingIssueRequestDetailDTO : SfsStoreDetailWithQtyDTOBase |
|||
|
|||
{ |
|||
/// <summary>
|
|||
/// 已发数量
|
|||
/// </summary>
|
|||
[Display(Name = "已发数量")] |
|||
public decimal IssuedQty { get; set; } |
|||
|
|||
/// <summary>
|
|||
/// 已收数量
|
|||
/// </summary>
|
|||
[Display(Name = "已收数量")] |
|||
public decimal ReceivedQty { get; set; } |
|||
|
|||
/// <summary>
|
|||
/// 明细状态
|
|||
/// </summary>
|
|||
[Display(Name = "明细状态")] |
|||
public EnumStatus Status { get; set; } |
|||
|
|||
/// <summary>
|
|||
/// 请求未发
|
|||
/// </summary>
|
|||
[Display(Name = "请求未发")] |
|||
[NotMapped] |
|||
public decimal ToBeIssuedQty => Qty - IssuedQty; |
|||
|
|||
/// <summary>
|
|||
/// 已发未收
|
|||
/// </summary>
|
|||
[Display(Name = "已发未收")] |
|||
[NotMapped] |
|||
public decimal ToBeReceivedQty => IssuedQty - ReceivedQty; |
|||
|
|||
/// <summary>
|
|||
/// 请求未收
|
|||
/// </summary>
|
|||
[Display(Name = "请求未收")] |
|||
[NotMapped] |
|||
public decimal NotFinishQty => Qty - ReceivedQty; |
|||
|
|||
/// <summary>
|
|||
/// 需求箱数量
|
|||
/// </summary>
|
|||
[Display(Name = "需求箱数量")] |
|||
public decimal BoxQty { get; set; } |
|||
|
|||
} |
@ -0,0 +1,100 @@ |
|||
using System; |
|||
using System.ComponentModel.DataAnnotations; |
|||
using System.ComponentModel.DataAnnotations.Schema; |
|||
using Win_in.Sfs.Shared.Domain; |
|||
using Win_in.Sfs.Shared.Domain.Shared; |
|||
using Win_in.Sfs.Wms.Store.Application.Contracts; |
|||
|
|||
namespace Win_in.Sfs.Wms.Store.Requests.MaterialRequests; |
|||
|
|||
public class CoatingIssueRequestDetailDTO : SfsStoreDetailWithQtyDTOBase |
|||
{ |
|||
#region 目标库位信息
|
|||
|
|||
/// <summary>
|
|||
/// 目标库位
|
|||
/// </summary>
|
|||
[Display(Name = "目标库位")] |
|||
[StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] |
|||
public string ToLocationCode { get; set; } |
|||
|
|||
/// <summary>
|
|||
/// 目标库区
|
|||
/// </summary>
|
|||
[Display(Name = "目标库区")] |
|||
public string ToLocationArea { get; set; } |
|||
|
|||
/// <summary>
|
|||
/// 目标库位组
|
|||
/// </summary>
|
|||
[Display(Name = "目标库位组")] |
|||
public string ToLocationGroup { get; set; } |
|||
|
|||
/// <summary>
|
|||
/// 目标ERP储位
|
|||
/// </summary>
|
|||
[Display(Name = "目标ERP储位")] |
|||
public string ToLocationErpCode { get; set; } |
|||
|
|||
/// <summary>
|
|||
/// 目标仓库
|
|||
/// </summary>
|
|||
[Display(Name = "目标仓库")] |
|||
public string ToWarehouseCode { get; set; } |
|||
|
|||
#endregion
|
|||
|
|||
/// <summary>
|
|||
/// 生产线
|
|||
/// </summary>
|
|||
public string ProdLine { get; set; } |
|||
|
|||
/// <summary>
|
|||
/// 已发数量
|
|||
/// </summary>
|
|||
public decimal IssuedQty { get; set; } |
|||
|
|||
/// <summary>
|
|||
/// 已收数量
|
|||
/// </summary>
|
|||
public decimal ReceivedQty { get; set; } |
|||
|
|||
/// <summary>
|
|||
/// 明细状态
|
|||
/// </summary>
|
|||
public EnumStatus Status { get; set; } |
|||
|
|||
/// <summary>
|
|||
/// 请求未发 还未发送的数量
|
|||
/// </summary>
|
|||
[NotMapped] |
|||
public decimal ToBeIssuedQty => Qty - IssuedQty; |
|||
|
|||
/// <summary>
|
|||
/// 已发未收
|
|||
/// </summary>
|
|||
[NotMapped] |
|||
public decimal ToBeReceivedQty => IssuedQty - ReceivedQty; |
|||
|
|||
/// <summary>
|
|||
/// 请求未收
|
|||
/// </summary>
|
|||
[NotMapped] |
|||
public decimal NotFinishQty => Qty - ReceivedQty; |
|||
|
|||
/// <summary>
|
|||
/// 位置码
|
|||
/// </summary>
|
|||
public string PositionCode { get; set; } |
|||
|
|||
/// <summary>
|
|||
/// 推荐类型
|
|||
/// </summary>
|
|||
public EnumRecommendType RecommendType { get; set; } |
|||
|
|||
/// <summary>
|
|||
/// 需求箱数量
|
|||
/// </summary>
|
|||
[Display(Name = "需求箱数量")] |
|||
public decimal BoxQty { get; set; } |
|||
} |
File diff suppressed because it is too large
@ -0,0 +1,319 @@ |
|||
using Microsoft.EntityFrameworkCore.Migrations; |
|||
|
|||
#nullable disable |
|||
|
|||
namespace Win_in.Sfs.Wms.Store.Migrations |
|||
{ |
|||
public partial class _20240514 : Migration |
|||
{ |
|||
protected override void Up(MigrationBuilder migrationBuilder) |
|||
{ |
|||
migrationBuilder.DropColumn( |
|||
name: "RequestType", |
|||
table: "Store_KittingIssueNote"); |
|||
|
|||
migrationBuilder.DropColumn( |
|||
name: "RequestType", |
|||
table: "Store_CoatingIssueNote"); |
|||
|
|||
migrationBuilder.DropColumn( |
|||
name: "RequestType", |
|||
table: "Store_AssembleIssueNote"); |
|||
|
|||
migrationBuilder.DropColumn( |
|||
name: "RequestType", |
|||
table: "Job_KittingIssueJob"); |
|||
|
|||
migrationBuilder.DropColumn( |
|||
name: "RequestType", |
|||
table: "Job_CoatingIssueJob"); |
|||
|
|||
migrationBuilder.DropColumn( |
|||
name: "RequestType", |
|||
table: "Job_AssembleIssueJob"); |
|||
|
|||
migrationBuilder.AddColumn<string>( |
|||
name: "MesBarCode", |
|||
table: "Store_ProductReceiptNoteDetail", |
|||
type: "nvarchar(64)", |
|||
maxLength: 64, |
|||
nullable: true); |
|||
|
|||
migrationBuilder.AddColumn<string>( |
|||
name: "MesQuality", |
|||
table: "Store_ProductReceiptNoteDetail", |
|||
type: "nvarchar(64)", |
|||
maxLength: 64, |
|||
nullable: true); |
|||
|
|||
migrationBuilder.AddColumn<int>( |
|||
name: "EnumIssueSendType", |
|||
table: "Store_KittingIssueNote", |
|||
type: "int", |
|||
nullable: false, |
|||
defaultValue: 0); |
|||
|
|||
migrationBuilder.AddColumn<int>( |
|||
name: "IssueRequestType", |
|||
table: "Store_KittingIssueNote", |
|||
type: "int", |
|||
nullable: false, |
|||
defaultValue: 0); |
|||
|
|||
migrationBuilder.AddColumn<string>( |
|||
name: "IdentityNo", |
|||
table: "Store_DeliverRequestDetail", |
|||
type: "nvarchar(64)", |
|||
maxLength: 64, |
|||
nullable: true); |
|||
|
|||
migrationBuilder.AddColumn<string>( |
|||
name: "MesDeliveryNo", |
|||
table: "Store_DeliverRequestDetail", |
|||
type: "nvarchar(64)", |
|||
maxLength: 64, |
|||
nullable: true); |
|||
|
|||
migrationBuilder.AddColumn<string>( |
|||
name: "MesDeliveryPlan", |
|||
table: "Store_DeliverRequestDetail", |
|||
type: "nvarchar(64)", |
|||
maxLength: 64, |
|||
nullable: true); |
|||
|
|||
migrationBuilder.AddColumn<string>( |
|||
name: "IdentityNo", |
|||
table: "Store_DeliverNoteDetail", |
|||
type: "nvarchar(64)", |
|||
maxLength: 64, |
|||
nullable: true); |
|||
|
|||
migrationBuilder.AddColumn<string>( |
|||
name: "MesDeliveryNo", |
|||
table: "Store_DeliverNoteDetail", |
|||
type: "nvarchar(64)", |
|||
maxLength: 64, |
|||
nullable: true); |
|||
|
|||
migrationBuilder.AddColumn<string>( |
|||
name: "MesDeliveryPlan", |
|||
table: "Store_DeliverNoteDetail", |
|||
type: "nvarchar(64)", |
|||
maxLength: 64, |
|||
nullable: true); |
|||
|
|||
migrationBuilder.AddColumn<int>( |
|||
name: "IssueRequestType", |
|||
table: "Store_CoatingIssueNote", |
|||
type: "int", |
|||
nullable: false, |
|||
defaultValue: 0); |
|||
|
|||
migrationBuilder.AddColumn<string>( |
|||
name: "ItemCode", |
|||
table: "Store_Chassis", |
|||
type: "nvarchar(max)", |
|||
nullable: true); |
|||
|
|||
migrationBuilder.AddColumn<string>( |
|||
name: "ItemDesc1", |
|||
table: "Store_Chassis", |
|||
type: "nvarchar(max)", |
|||
nullable: true); |
|||
|
|||
migrationBuilder.AddColumn<string>( |
|||
name: "ItemDesc2", |
|||
table: "Store_Chassis", |
|||
type: "nvarchar(max)", |
|||
nullable: true); |
|||
|
|||
migrationBuilder.AddColumn<string>( |
|||
name: "ItemName", |
|||
table: "Store_Chassis", |
|||
type: "nvarchar(max)", |
|||
nullable: true); |
|||
|
|||
migrationBuilder.AddColumn<int>( |
|||
name: "EnumIssueSendType", |
|||
table: "Store_AssembleIssueNote", |
|||
type: "int", |
|||
nullable: false, |
|||
defaultValue: 0); |
|||
|
|||
migrationBuilder.AddColumn<int>( |
|||
name: "IssueRequestType", |
|||
table: "Store_AssembleIssueNote", |
|||
type: "int", |
|||
nullable: false, |
|||
defaultValue: 0); |
|||
|
|||
migrationBuilder.AddColumn<int>( |
|||
name: "EnumIssueSendType", |
|||
table: "Job_KittingIssueJob", |
|||
type: "int", |
|||
nullable: false, |
|||
defaultValue: 0); |
|||
|
|||
migrationBuilder.AddColumn<int>( |
|||
name: "IssueRequestType", |
|||
table: "Job_KittingIssueJob", |
|||
type: "int", |
|||
nullable: false, |
|||
defaultValue: 0); |
|||
|
|||
migrationBuilder.AddColumn<int>( |
|||
name: "IssueRequestType", |
|||
table: "Job_CoatingIssueJob", |
|||
type: "int", |
|||
nullable: false, |
|||
defaultValue: 0); |
|||
|
|||
migrationBuilder.AddColumn<int>( |
|||
name: "EnumIssueSendType", |
|||
table: "Job_AssembleIssueJob", |
|||
type: "int", |
|||
nullable: false, |
|||
defaultValue: 0); |
|||
|
|||
migrationBuilder.AddColumn<int>( |
|||
name: "IssueRequestType", |
|||
table: "Job_AssembleIssueJob", |
|||
type: "int", |
|||
nullable: false, |
|||
defaultValue: 0); |
|||
} |
|||
|
|||
protected override void Down(MigrationBuilder migrationBuilder) |
|||
{ |
|||
migrationBuilder.DropColumn( |
|||
name: "MesBarCode", |
|||
table: "Store_ProductReceiptNoteDetail"); |
|||
|
|||
migrationBuilder.DropColumn( |
|||
name: "MesQuality", |
|||
table: "Store_ProductReceiptNoteDetail"); |
|||
|
|||
migrationBuilder.DropColumn( |
|||
name: "EnumIssueSendType", |
|||
table: "Store_KittingIssueNote"); |
|||
|
|||
migrationBuilder.DropColumn( |
|||
name: "IssueRequestType", |
|||
table: "Store_KittingIssueNote"); |
|||
|
|||
migrationBuilder.DropColumn( |
|||
name: "IdentityNo", |
|||
table: "Store_DeliverRequestDetail"); |
|||
|
|||
migrationBuilder.DropColumn( |
|||
name: "MesDeliveryNo", |
|||
table: "Store_DeliverRequestDetail"); |
|||
|
|||
migrationBuilder.DropColumn( |
|||
name: "MesDeliveryPlan", |
|||
table: "Store_DeliverRequestDetail"); |
|||
|
|||
migrationBuilder.DropColumn( |
|||
name: "IdentityNo", |
|||
table: "Store_DeliverNoteDetail"); |
|||
|
|||
migrationBuilder.DropColumn( |
|||
name: "MesDeliveryNo", |
|||
table: "Store_DeliverNoteDetail"); |
|||
|
|||
migrationBuilder.DropColumn( |
|||
name: "MesDeliveryPlan", |
|||
table: "Store_DeliverNoteDetail"); |
|||
|
|||
migrationBuilder.DropColumn( |
|||
name: "IssueRequestType", |
|||
table: "Store_CoatingIssueNote"); |
|||
|
|||
migrationBuilder.DropColumn( |
|||
name: "ItemCode", |
|||
table: "Store_Chassis"); |
|||
|
|||
migrationBuilder.DropColumn( |
|||
name: "ItemDesc1", |
|||
table: "Store_Chassis"); |
|||
|
|||
migrationBuilder.DropColumn( |
|||
name: "ItemDesc2", |
|||
table: "Store_Chassis"); |
|||
|
|||
migrationBuilder.DropColumn( |
|||
name: "ItemName", |
|||
table: "Store_Chassis"); |
|||
|
|||
migrationBuilder.DropColumn( |
|||
name: "EnumIssueSendType", |
|||
table: "Store_AssembleIssueNote"); |
|||
|
|||
migrationBuilder.DropColumn( |
|||
name: "IssueRequestType", |
|||
table: "Store_AssembleIssueNote"); |
|||
|
|||
migrationBuilder.DropColumn( |
|||
name: "EnumIssueSendType", |
|||
table: "Job_KittingIssueJob"); |
|||
|
|||
migrationBuilder.DropColumn( |
|||
name: "IssueRequestType", |
|||
table: "Job_KittingIssueJob"); |
|||
|
|||
migrationBuilder.DropColumn( |
|||
name: "IssueRequestType", |
|||
table: "Job_CoatingIssueJob"); |
|||
|
|||
migrationBuilder.DropColumn( |
|||
name: "EnumIssueSendType", |
|||
table: "Job_AssembleIssueJob"); |
|||
|
|||
migrationBuilder.DropColumn( |
|||
name: "IssueRequestType", |
|||
table: "Job_AssembleIssueJob"); |
|||
|
|||
migrationBuilder.AddColumn<string>( |
|||
name: "RequestType", |
|||
table: "Store_KittingIssueNote", |
|||
type: "nvarchar(64)", |
|||
maxLength: 64, |
|||
nullable: true); |
|||
|
|||
migrationBuilder.AddColumn<string>( |
|||
name: "RequestType", |
|||
table: "Store_CoatingIssueNote", |
|||
type: "nvarchar(64)", |
|||
maxLength: 64, |
|||
nullable: true); |
|||
|
|||
migrationBuilder.AddColumn<string>( |
|||
name: "RequestType", |
|||
table: "Store_AssembleIssueNote", |
|||
type: "nvarchar(64)", |
|||
maxLength: 64, |
|||
nullable: true); |
|||
|
|||
migrationBuilder.AddColumn<string>( |
|||
name: "RequestType", |
|||
table: "Job_KittingIssueJob", |
|||
type: "nvarchar(64)", |
|||
maxLength: 64, |
|||
nullable: true); |
|||
|
|||
migrationBuilder.AddColumn<string>( |
|||
name: "RequestType", |
|||
table: "Job_CoatingIssueJob", |
|||
type: "nvarchar(64)", |
|||
maxLength: 64, |
|||
nullable: true); |
|||
|
|||
migrationBuilder.AddColumn<string>( |
|||
name: "RequestType", |
|||
table: "Job_AssembleIssueJob", |
|||
type: "nvarchar(64)", |
|||
maxLength: 64, |
|||
nullable: true); |
|||
} |
|||
} |
|||
} |
Loading…
Reference in new issue