wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev

Browse Source
This commit is contained in:
yang.lee
2023-12-11 13:53:04 +08:00
parent 0dd220ee4f 67206206e4
commit d61989417f
12 changed files with 1150 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

370
BasicData/Tnb.BasicData.Entities/Dto/BasMaterial/ErpBasMaterialInput.cs Normal file
View File

@@ -0,0 +1,370 @@
namespace Tnb.BasicData.Entities.Dto
{
public class ErpBasMaterialInput
{
public ErpBasMaterial bas_material { get; set; }
public List<ErpBasMaterialUnit> bas_material_units { get; set; } = new List<ErpBasMaterialUnit>();
// public List<ErpBasMaterialIntoFactorySpecifications> bas_material_into_factory_specificationses { get; set; } = new List<ErpBasMaterialIntoFactorySpecifications>();
//
// public List<ErpBasSubstitutionMaterial> bas_substitution_materials { get; set; } = new List<ErpBasSubstitutionMaterial>();
//
// public List<ErpBasMaterialSendWarehouse> bas_material_send_warehouses { get; set; } = new List<ErpBasMaterialSendWarehouse>();
//
// public List<ErpBasMaterialInboundWh> bas_material_inbound_whs { get; set; } = new List<ErpBasMaterialInboundWh>();
}
public class ErpBasMaterial
{
/// <summary>
/// 物料代码
/// </summary>
public string code { get; set; } = string.Empty;
/// <summary>
/// 物料名称
/// </summary>
public string name { get; set; } = string.Empty;
/// <summary>
/// 物料分类ID
/// </summary>
public string category_id { get; set; } = string.Empty;
/// <summary>
/// 单位ID
/// </summary>
public string unit_id { get; set; } = string.Empty;
// /// <summary>
// /// 单价
// /// </summary>
// public decimal? cost { get; set; }
//
// /// <summary>
// /// 毛重
// /// </summary>
// public decimal? grossweight { get; set; }
//
// /// <summary>
// /// 净重
// /// </summary>
// public decimal? netweight { get; set; }
//
// /// <summary>
// /// 长
// /// </summary>
// public decimal? length { get; set; }
//
// /// <summary>
// /// 宽
// /// </summary>
// public decimal? width { get; set; }
//
// /// <summary>
// /// 高
// /// </summary>
// public decimal? high { get; set; }
//
// /// <summary>
// /// 体积
// /// </summary>
// public decimal? volumn { get; set; }
//
// /// <summary>
// /// 是否免检
// /// </summary>
// public int? isexemption { get; set; }
/// <summary>
/// 安全库存
/// </summary>
public decimal? safeqty { get; set; }
/// <summary>
/// 保质期
/// </summary>
public int? qualityperiod { get; set; }
// /// <summary>
// /// 是否过期允许出库
// /// </summary>
// public string? expireout { get; set; }
/// <summary>
/// 最小包装
/// </summary>
public decimal? minpacking { get; set; }
/// <summary>
/// 是否先进先出管控
/// </summary>
public string? fifo { get; set; }
// /// <summary>
// /// 先进先出间隔天数，批次间隔天数
// /// </summary>
// public int? fifo_interval_days { get; set; }
/// <summary>
/// 物料规格型号
/// </summary>
public string? material_standard { get; set; }
// /// <summary>
// /// 海关编码
// /// </summary>
// public string? fhscode { get; set; }
// /// <summary>
// /// 附属性
// /// </summary>
// public string? attribute { get; set; }
// /// <summary>
// /// 管控类型： 批管控：Lot 单管控：KeyParts 非管控：NoControl
// /// </summary>
// public string? controltype { get; set; }
/// <summary>
/// 备注
/// </summary>
public string? remark { get; set; }
// /// <summary>
// /// 创建用户
// /// </summary>
// public string? create_id { get; set; }
/// <summary>
/// 创建用户
/// </summary>
public string? create_count { get; set; }
/// <summary>
/// 创建时间
/// </summary>
public DateTime? create_time { get; set; }
// /// <summary>
// /// 修改用户
// /// </summary>
// public string? modify_id { get; set; }
/// <summary>
/// 修改用户
/// </summary>
public string? modify_count { get; set; }
/// <summary>
/// 修改时间
/// </summary>
public DateTime? modify_time { get; set; }
// /// <summary>
// /// 扩展字段
// /// </summary>
// public string? extras { get; set; }
/// <summary>
/// 状态
/// </summary>
public string? state { get; set; }
/// <summary>
/// 物料属性
/// </summary>
public string? material_property { get; set; }
/// <summary>
/// 标签
/// </summary>
public string? label { get; set; }
/// <summary>
/// 描述
/// </summary>
public string? descrip { get; set; }
/// <summary>
/// 批次管理
/// </summary>
public int? is_batch_enabled { get; set; }
/// <summary>
/// 标签管理
/// </summary>
public int? is_label_enabled { get; set; }
// /// <summary>
// /// 附件
// /// </summary>
// public string? attachment { get; set; }
/// <summary>
/// 先进先出 0否 1是
/// </summary>
public int? first_in_out { get; set; }
/// <summary>
/// 存储有效期(天)
/// </summary>
public int? storage_valid_day { get; set; }
/// <summary>
/// 预警提前期(天)
/// </summary>
public int? early_warn_day { get; set; }
/// <summary>
/// 安全库存
/// </summary>
public int? safe_stock { get; set; }
/// <summary>
/// 安全库存包含状态
/// </summary>
public string? safe_stock_stauts { get; set; }
/// <summary>
/// 发料仓库id
/// </summary>
public string? send_warehouse_id { get; set; }
/// <summary>
/// 入厂单位id
/// </summary>
public string? into_factory_unit_id { get; set; }
/// <summary>
/// 投料单位
/// </summary>
public string? material_in_unit_id { get; set; }
/// <summary>
/// 产出单位
/// </summary>
public string? material_out_unit_id { get; set; }
/// <summary>
/// 请料方式 1按计划排程请料 2自行管控
/// </summary>
public string? material_request_method { get; set; }
/// <summary>
/// 是否包含入库数
/// </summary>
public int? is_contain_into_num { get; set; }
/// <summary>
/// 是否创建子工单
/// </summary>
public string? is_create_sub_work_order { get; set; }
/// <summary>
/// 保质期
/// </summary>
public int? quality_guarantee_period { get; set; }
/// <summary>
/// DI编码
/// </summary>
public string? di { get; set; }
}
public class ErpBasMaterialUnit
{
/// <summary>
/// 主单位数量
/// </summary>
public string? number_of_primary_unit { get; set; }
/// <summary>
/// 辅助单位数量
/// </summary>
public string? number_of_auxiliary_unit { get; set; }
/// <summary>
/// 辅助单位
/// </summary>
public string auxiliary_unit_id { get; set; } = string.Empty;
}
public class ErpBasMaterialIntoFactorySpecifications
{
/// <summary>
/// 单位id
/// </summary>
public string unit_id { get; set; } = string.Empty;
/// <summary>
/// 数量
/// </summary>
public decimal num { get; set; }
}
public class ErpBasSubstitutionMaterial
{
/// <summary>
/// 替代料编号
/// </summary>
public string sub_material_code { get; set; } = string.Empty;
/// <summary>
/// 替代比例，如1（一个物料可以用一个替代料代替）
/// </summary>
public decimal proportion { get; set; }
}
public class ErpBasMaterialSendWarehouse
{
/// <summary>
/// 仓库编号
/// </summary>
public string? wh_code { get; set; }
/// <summary>
/// 最大库存
/// </summary>
public int? max_stock { get; set; }
/// <summary>
/// 最小库存
/// </summary>
public int? min_stock { get; set; }
/// <summary>
/// 安全库存
/// </summary>
public int? safe_stock { get; set; }
}
public class ErpBasMaterialInboundWh
{
/// <summary>
/// 仓库编号
/// </summary>
public string? wh_code { get; set; }
/// <summary>
/// 最大库存
/// </summary>
public int? max_stock { get; set; }
/// <summary>
/// 最小库存
/// </summary>
public int? min_stock { get; set; }
/// <summary>
/// 安全库存
/// </summary>
public int? safe_stock { get; set; }
}
}

5
BasicData/Tnb.BasicData.Entities/Entity/BasMaterial.cs
View File

@@ -263,5 +263,10 @@ public partial class BasMaterial : BaseEntity<string>
/// DI编码
/// </summary>
public string? di { get; set; }
/// <summary>
/// 删除标志
/// </summary>
public int? deleted { get; set; }
}

2
BasicData/Tnb.BasicData.Entities/Entity/BasMaterialIntoFactorySpecifications.cs
View File

@@ -5,7 +5,7 @@ using SqlSugar;
namespace Tnb.BasicData.Entities;
/// <summary>
/// 物料入场规格
/// 物料入厂规格
/// </summary>
[SugarTable("bas_material_into_factory_specifications")]
public partial class BasMaterialIntoFactorySpecifications : BaseEntity<string>