Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
This commit is contained in:
DEVICE8\12494
115
BasicData/Tnb.BasicData.Entitys/Dto/BasMbom/MbomSaveDataInput.cs
Normal file
115
BasicData/Tnb.BasicData.Entitys/Dto/BasMbom/MbomSaveDataInput.cs
Normal file
@@ -0,0 +1,115 @@
|
||||
using Tnb.BasicData.Entities;
|
||||
|
||||
namespace Tnb.BasicData.Entities.Dto
|
||||
{
|
||||
public class MbomSaveDataInput
|
||||
{
|
||||
/// <summary>
|
||||
/// 生产bomid
|
||||
/// </summary>
|
||||
public string id { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 物料id
|
||||
/// </summary>
|
||||
public string material_id { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 数量
|
||||
/// </summary>
|
||||
public int num { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 单位id
|
||||
/// </summary>
|
||||
public string unit_id { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 版本号
|
||||
/// </summary>
|
||||
public string version { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 有效开始时间
|
||||
/// </summary>
|
||||
public DateTime? start_time { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 有效结束时间
|
||||
/// </summary>
|
||||
public DateTime? end_time { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 物料清单id
|
||||
/// </summary>
|
||||
public string ebom_id { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 工艺路线id
|
||||
/// </summary>
|
||||
public string route_id { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 物料均再首道工序投产
|
||||
/// </summary>
|
||||
public int is_first { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 备注
|
||||
/// </summary>
|
||||
public string remark { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 工序
|
||||
/// </summary>
|
||||
public List<MbomProcessDto> processes { get; set; }
|
||||
}
|
||||
|
||||
public class MbomProcessDto
|
||||
{
|
||||
/// <summary>
|
||||
/// Desc:生产bomid
|
||||
/// Default:
|
||||
/// Nullable:False
|
||||
/// </summary>
|
||||
public string mbom_id { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Desc:工序id
|
||||
/// Default:
|
||||
/// Nullable:False
|
||||
/// </summary>
|
||||
public string process_id { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Desc:准备时间
|
||||
/// Default:
|
||||
/// Nullable:False
|
||||
/// </summary>
|
||||
public decimal preparation_time { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Desc:工位
|
||||
/// Default:NULL::character varying
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
public string station { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Desc:副产出管控 0 不启用 1 启用
|
||||
/// Default:
|
||||
/// Nullable:False
|
||||
/// </summary>
|
||||
public int byproduct_status { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 投入物料
|
||||
/// </summary>
|
||||
public List<BasMbomInput> inputs { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 产出物料
|
||||
/// </summary>
|
||||
public List<BasMbomOutput> outputs { get; set; }
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,6 @@
|
||||
using SqlSugar;
|
||||
using Tnb.Common.Contracts;
|
||||
|
||||
namespace Tnb.BasicData.Entities
|
||||
{
|
||||
///<summary>
|
||||
@@ -8,275 +9,260 @@ namespace Tnb.BasicData.Entities
|
||||
[SugarTable("bas_material")]
|
||||
public class BasMaterial : BaseEntity<string>
|
||||
{
|
||||
public BasMaterial(){
|
||||
public BasMaterial()
|
||||
{
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Desc:批次管理
|
||||
/// Default:
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
public int? is_batch_enabled { get; set; }
|
||||
|
||||
}
|
||||
/// <summary>
|
||||
/// Desc:物料代码
|
||||
/// Default:
|
||||
/// Nullable:False
|
||||
/// </summary>
|
||||
public string code {get;set;}
|
||||
/// <summary>
|
||||
/// Desc:标签管理
|
||||
/// Default:
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
public int? is_label_enabled { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Desc:物料名称
|
||||
/// Default:
|
||||
/// Nullable:False
|
||||
/// </summary>
|
||||
public string name {get;set;}
|
||||
/// <summary>
|
||||
/// Desc:附件
|
||||
/// Default:NULL::character varying
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
public string attachment { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Desc:物料分类ID
|
||||
/// Default:
|
||||
/// Nullable:False
|
||||
/// </summary>
|
||||
public string category_id {get;set;}
|
||||
/// <summary>
|
||||
/// Desc:物料代码
|
||||
/// Default:
|
||||
/// Nullable:False
|
||||
/// </summary>
|
||||
public string code { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Desc:单位ID
|
||||
/// Default:
|
||||
/// Nullable:False
|
||||
/// </summary>
|
||||
public string unit_id {get;set;}
|
||||
/// <summary>
|
||||
/// Desc:物料名称
|
||||
/// Default:
|
||||
/// Nullable:False
|
||||
/// </summary>
|
||||
public string name { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Desc:辅助单位id
|
||||
/// Default:
|
||||
/// Nullable:False
|
||||
/// </summary>
|
||||
public string pickunit_id {get;set;}
|
||||
/// <summary>
|
||||
/// Desc:物料分类ID
|
||||
/// Default:
|
||||
/// Nullable:False
|
||||
/// </summary>
|
||||
public string category_id { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Desc:单价
|
||||
/// Default:
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnName="cost")]
|
||||
public decimal? cost {get;set;}
|
||||
/// <summary>
|
||||
/// Desc:单位ID
|
||||
/// Default:
|
||||
/// Nullable:False
|
||||
/// </summary>
|
||||
public string unit_id { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Desc:毛重
|
||||
/// Default:
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnName="grossweight")]
|
||||
public decimal? grossweight {get;set;}
|
||||
/// <summary>
|
||||
/// Desc:单价
|
||||
/// Default:
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
public decimal? cost { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Desc:净重
|
||||
/// Default:
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnName="netweight")]
|
||||
public decimal? netweight {get;set;}
|
||||
/// <summary>
|
||||
/// Desc:毛重
|
||||
/// Default:
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
public decimal? grossweight { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Desc:长
|
||||
/// Default:
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnName="length")]
|
||||
public decimal? length {get;set;}
|
||||
/// <summary>
|
||||
/// Desc:净重
|
||||
/// Default:
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
public decimal? netweight { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Desc:宽
|
||||
/// Default:
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnName="width")]
|
||||
public decimal? width {get;set;}
|
||||
/// <summary>
|
||||
/// Desc:长
|
||||
/// Default:
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
public decimal? length { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Desc:高
|
||||
/// Default:
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnName="high")]
|
||||
public decimal? high {get;set;}
|
||||
/// <summary>
|
||||
/// Desc:宽
|
||||
/// Default:
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
public decimal? width { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Desc:体积
|
||||
/// Default:
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnName="volumn")]
|
||||
public decimal? volumn {get;set;}
|
||||
/// <summary>
|
||||
/// Desc:高
|
||||
/// Default:
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
public decimal? high { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Desc:是否免检
|
||||
/// Default:
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnName="isexemption")]
|
||||
public int? isexemption {get;set;}
|
||||
/// <summary>
|
||||
/// Desc:体积
|
||||
/// Default:
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
public decimal? volumn { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Desc:安全库存
|
||||
/// Default:
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnName="safeqty")]
|
||||
public decimal? safeqty {get;set;}
|
||||
/// <summary>
|
||||
/// Desc:是否免检
|
||||
/// Default:
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
public int? isexemption { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Desc:保质期
|
||||
/// Default:
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnName="qualityperiod")]
|
||||
public int? qualityperiod {get;set;}
|
||||
/// <summary>
|
||||
/// Desc:安全库存
|
||||
/// Default:
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
public decimal? safeqty { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Desc:最小包装
|
||||
/// Default:
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnName="minpacking")]
|
||||
public decimal? minpacking {get;set;}
|
||||
/// <summary>
|
||||
/// Desc:保质期
|
||||
/// Default:
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
public int? qualityperiod { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Desc:先进先出间隔天数，批次间隔天数
|
||||
/// Default:
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnName="fifo_interval_days")]
|
||||
public int? fifo_interval_days {get;set;}
|
||||
/// <summary>
|
||||
/// Desc:最小包装
|
||||
/// Default:
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
public decimal? minpacking { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Desc:创建时间
|
||||
/// Default:
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnName="create_time")]
|
||||
public DateTime? create_time {get;set;}
|
||||
/// <summary>
|
||||
/// Desc:先进先出间隔天数，批次间隔天数
|
||||
/// Default:
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
public int? fifo_interval_days { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Desc:最后修改时间
|
||||
/// Default:
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnName="modify_time")]
|
||||
public DateTime? modify_time {get;set;}
|
||||
/// <summary>
|
||||
/// Desc:创建时间
|
||||
/// Default:
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
public DateTime? create_time { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Desc:扩展字段
|
||||
/// Default:
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnName="extras")]
|
||||
public string extras {get;set;}
|
||||
/// <summary>
|
||||
/// Desc:最后修改时间
|
||||
/// Default:
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
public DateTime? modify_time { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Desc:所属组织ID
|
||||
/// Default:NULL::character varying
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnName="org_id")]
|
||||
public string org_id {get;set;}
|
||||
/// <summary>
|
||||
/// Desc:扩展字段
|
||||
/// Default:
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
public string extras { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Desc:是否过期允许出库
|
||||
/// Default:NULL::character varying
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnName="expireout")]
|
||||
public string expireout {get;set;}
|
||||
/// <summary>
|
||||
/// Desc:所属组织ID
|
||||
/// Default:NULL::character varying
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
public string org_id { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Desc:是否先进先出管控
|
||||
/// Default:NULL::character varying
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnName="fifo")]
|
||||
public string fifo {get;set;}
|
||||
/// <summary>
|
||||
/// Desc:是否过期允许出库
|
||||
/// Default:NULL::character varying
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
public string expireout { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Desc:物料规格型号
|
||||
/// Default:NULL::character varying
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnName="material_standard")]
|
||||
public string material_standard {get;set;}
|
||||
/// <summary>
|
||||
/// Desc:是否先进先出管控
|
||||
/// Default:NULL::character varying
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
public string fifo { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Desc:海关编码
|
||||
/// Default:NULL::character varying
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnName="fhscode")]
|
||||
public string fhscode {get;set;}
|
||||
/// <summary>
|
||||
/// Desc:物料规格型号
|
||||
/// Default:NULL::character varying
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
public string material_standard { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Desc:附属性
|
||||
/// Default:NULL::character varying
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnName="attribute")]
|
||||
public string attribute {get;set;}
|
||||
/// <summary>
|
||||
/// Desc:海关编码
|
||||
/// Default:NULL::character varying
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
public string fhscode { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Desc:管控类型： 批管控：Lot 单管控：KeyParts 非管控：NoControl
|
||||
/// Default:NULL::character varying
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnName="controltype")]
|
||||
public string controltype {get;set;}
|
||||
/// <summary>
|
||||
/// Desc:附属性
|
||||
/// Default:NULL::character varying
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
public string attribute { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Desc:备注
|
||||
/// Default:NULL::character varying
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnName="remark")]
|
||||
public string remark {get;set;}
|
||||
/// <summary>
|
||||
/// Desc:管控类型： 批管控：Lot 单管控：KeyParts 非管控：NoControl
|
||||
/// Default:NULL::character varying
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
public string controltype { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Desc:创建人员ID
|
||||
/// Default:NULL::character varying
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnName="create_id")]
|
||||
public string create_id {get;set;}
|
||||
/// <summary>
|
||||
/// Desc:备注
|
||||
/// Default:NULL::character varying
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
public string remark { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Desc:最后修改人员ID
|
||||
/// Default:NULL::character varying
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnName="modify_id")]
|
||||
public string modify_id {get;set;}
|
||||
/// <summary>
|
||||
/// Desc:创建人员ID
|
||||
/// Default:NULL::character varying
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
public string create_id { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Desc:状态
|
||||
/// Default:NULL::character varying
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnName="state")]
|
||||
public string state {get;set;}
|
||||
/// <summary>
|
||||
/// Desc:最后修改人员ID
|
||||
/// Default:NULL::character varying
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
public string modify_id { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Desc:物料属性
|
||||
/// Default:NULL::character varying
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnName="material_property")]
|
||||
public string material_property {get;set;}
|
||||
/// <summary>
|
||||
/// Desc:状态
|
||||
/// Default:NULL::character varying
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
public string state { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Desc:标签
|
||||
/// Default:NULL::character varying
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnName="label")]
|
||||
public string label {get;set;}
|
||||
/// <summary>
|
||||
/// Desc:物料属性
|
||||
/// Default:NULL::character varying
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
public string material_property { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Desc:描述
|
||||
/// Default:NULL::character varying
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
public string descrip {get;set;}
|
||||
/// <summary>
|
||||
/// Desc:标签
|
||||
/// Default:NULL::character varying
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
public string label { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Desc:描述
|
||||
/// Default:NULL::character varying
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
public string descrip { get; set; }
|
||||
}
|
||||
}
|
||||
@@ -109,7 +109,7 @@ namespace Tnb.BasicData.Entities
|
||||
/// Default:NULL::character varying
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
public string is_first {get;set;}
|
||||
public int is_first {get;set;}
|
||||
|
||||
/// <summary>
|
||||
/// Desc:创建用户
|
||||
|
||||
@@ -47,5 +47,12 @@ namespace Tnb.BasicData.Entities
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
public string station { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Desc:副产出管控 0 不启用 1 启用
|
||||
/// Default:
|
||||
/// Nullable:False
|
||||
/// </summary>
|
||||
public int byproduct_status { get; set; }
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user