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:
DEVICE8\12494
2023-04-27 18:40:42 +08:00
parent 264f03bb15 e22fd748a9
commit 0a2bb034cf
5 changed files with 544 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

115
BasicData/Tnb.BasicData.Entitys/Dto/BasMbom/MbomSaveDataInput.cs Normal file
View 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; }
}
}

454
BasicData/Tnb.BasicData.Entitys/Entity/BasMaterial.cs
View File

@@ -1,5 +1,6 @@
using SqlSugar; using SqlSugar;
using Tnb.Common.Contracts; using Tnb.Common.Contracts;
namespace Tnb.BasicData.Entities namespace Tnb.BasicData.Entities
{ {
///<summary> ///<summary>
@@ -8,275 +9,260 @@ namespace Tnb.BasicData.Entities
[SugarTable("bas_material")] [SugarTable("bas_material")]
public class BasMaterial : BaseEntity<string> public class BasMaterial : BaseEntity<string>
{ {
public BasMaterial(){ public BasMaterial()
{
}
/// <summary>
/// Desc:批次管理
/// Default:
/// Nullable:True
/// </summary>
public int? is_batch_enabled { get; set; }
} /// <summary>
/// <summary> /// Desc:标签管理
/// Desc:物料代码 /// Default:
/// Default: /// Nullable:True
/// Nullable:False /// </summary>
/// </summary> public int? is_label_enabled { get; set; }
public string code {get;set;}
/// <summary> /// <summary>
/// Desc:物料名称 /// Desc:附件
/// Default: /// Default:NULL::character varying
/// Nullable:False /// Nullable:True
/// </summary> /// </summary>
public string name {get;set;} public string attachment { get; set; }
/// <summary> /// <summary>
/// Desc:物料分类ID /// Desc:物料代码
/// Default: /// Default:
/// Nullable:False /// Nullable:False
/// </summary> /// </summary>
public string category_id {get;set;} public string code { get; set; }
/// <summary> /// <summary>
/// Desc:单位ID /// Desc:物料名称
/// Default: /// Default:
/// Nullable:False /// Nullable:False
/// </summary> /// </summary>
public string unit_id {get;set;} public string name { get; set; }
/// <summary> /// <summary>
/// Desc:辅助单位id /// Desc:物料分类ID
/// Default: /// Default:
/// Nullable:False /// Nullable:False
/// </summary> /// </summary>
public string pickunit_id {get;set;} public string category_id { get; set; }
/// <summary> /// <summary>
/// Desc:单价 /// Desc:单位ID
/// Default: /// Default:
/// Nullable:True /// Nullable:False
/// </summary> /// </summary>
[SugarColumn(ColumnName="cost")] public string unit_id { get; set; }
public decimal? cost {get;set;}
/// <summary> /// <summary>
/// Desc:毛重 /// Desc:单价
/// Default: /// Default:
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
[SugarColumn(ColumnName="grossweight")] public decimal? cost { get; set; }
public decimal? grossweight {get;set;}
/// <summary> /// <summary>
/// Desc:净重 /// Desc:毛重
/// Default: /// Default:
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
[SugarColumn(ColumnName="netweight")] public decimal? grossweight { get; set; }
public decimal? netweight {get;set;}
/// <summary> /// <summary>
/// Desc:长 /// Desc:净重
/// Default: /// Default:
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
[SugarColumn(ColumnName="length")] public decimal? netweight { get; set; }
public decimal? length {get;set;}
/// <summary> /// <summary>
/// Desc:宽 /// Desc:长
/// Default: /// Default:
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
[SugarColumn(ColumnName="width")] public decimal? length { get; set; }
public decimal? width {get;set;}
/// <summary> /// <summary>
/// Desc:高 /// Desc:宽
/// Default: /// Default:
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
[SugarColumn(ColumnName="high")] public decimal? width { get; set; }
public decimal? high {get;set;}
/// <summary> /// <summary>
/// Desc:体积 /// Desc:高
/// Default: /// Default:
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
[SugarColumn(ColumnName="volumn")] public decimal? high { get; set; }
public decimal? volumn {get;set;}
/// <summary> /// <summary>
/// Desc:是否免检 /// Desc:体积
/// Default: /// Default:
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
[SugarColumn(ColumnName="isexemption")] public decimal? volumn { get; set; }
public int? isexemption {get;set;}
/// <summary> /// <summary>
/// Desc:安全库存 /// Desc:是否免检
/// Default: /// Default:
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
[SugarColumn(ColumnName="safeqty")] public int? isexemption { get; set; }
public decimal? safeqty {get;set;}
/// <summary> /// <summary>
/// Desc:保质期 /// Desc:安全库存
/// Default: /// Default:
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
[SugarColumn(ColumnName="qualityperiod")] public decimal? safeqty { get; set; }
public int? qualityperiod {get;set;}
/// <summary> /// <summary>
/// Desc:最小包装 /// Desc:保质期
/// Default: /// Default:
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
[SugarColumn(ColumnName="minpacking")] public int? qualityperiod { get; set; }
public decimal? minpacking {get;set;}
/// <summary> /// <summary>
/// Desc:先进先出间隔天数，批次间隔天数 /// Desc:最小包装
/// Default: /// Default:
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
[SugarColumn(ColumnName="fifo_interval_days")] public decimal? minpacking { get; set; }
public int? fifo_interval_days {get;set;}
/// <summary> /// <summary>
/// Desc:创建时间 /// Desc:先进先出间隔天数，批次间隔天数
/// Default: /// Default:
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
[SugarColumn(ColumnName="create_time")] public int? fifo_interval_days { get; set; }
public DateTime? create_time {get;set;}
/// <summary> /// <summary>
/// Desc:最后修改时间 /// Desc:创建时间
/// Default: /// Default:
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
[SugarColumn(ColumnName="modify_time")] public DateTime? create_time { get; set; }
public DateTime? modify_time {get;set;}
/// <summary> /// <summary>
/// Desc:扩展字段 /// Desc:最后修改时间
/// Default: /// Default:
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
[SugarColumn(ColumnName="extras")] public DateTime? modify_time { get; set; }
public string extras {get;set;}
/// <summary> /// <summary>
/// Desc:所属组织ID /// Desc:扩展字段
/// Default:NULL::character varying /// Default:
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
[SugarColumn(ColumnName="org_id")] public string extras { get; set; }
public string org_id {get;set;}
/// <summary> /// <summary>
/// Desc:是否过期允许出库 /// Desc:所属组织ID
/// Default:NULL::character varying /// Default:NULL::character varying
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
[SugarColumn(ColumnName="expireout")] public string org_id { get; set; }
public string expireout {get;set;}
/// <summary> /// <summary>
/// Desc:是否先进先出管控 /// Desc:是否过期允许出库
/// Default:NULL::character varying /// Default:NULL::character varying
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
[SugarColumn(ColumnName="fifo")] public string expireout { get; set; }
public string fifo {get;set;}
/// <summary> /// <summary>
/// Desc:物料规格型号 /// Desc:是否先进先出管控
/// Default:NULL::character varying /// Default:NULL::character varying
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
[SugarColumn(ColumnName="material_standard")] public string fifo { get; set; }
public string material_standard {get;set;}
/// <summary> /// <summary>
/// Desc:海关编码 /// Desc:物料规格型号
/// Default:NULL::character varying /// Default:NULL::character varying
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
[SugarColumn(ColumnName="fhscode")] public string material_standard { get; set; }
public string fhscode {get;set;}
/// <summary> /// <summary>
/// Desc:附属性 /// Desc:海关编码
/// Default:NULL::character varying /// Default:NULL::character varying
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
[SugarColumn(ColumnName="attribute")] public string fhscode { get; set; }
public string attribute {get;set;}
/// <summary> /// <summary>
/// Desc:管控类型： 批管控：Lot 单管控：KeyParts 非管控：NoControl /// Desc:附属性
/// Default:NULL::character varying /// Default:NULL::character varying
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
[SugarColumn(ColumnName="controltype")] public string attribute { get; set; }
public string controltype {get;set;}
/// <summary> /// <summary>
/// Desc:备注 /// Desc:管控类型： 批管控：Lot 单管控：KeyParts 非管控：NoControl
/// Default:NULL::character varying /// Default:NULL::character varying
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
[SugarColumn(ColumnName="remark")] public string controltype { get; set; }
public string remark {get;set;}
/// <summary> /// <summary>
/// Desc:创建人员ID /// Desc:备注
/// Default:NULL::character varying /// Default:NULL::character varying
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
[SugarColumn(ColumnName="create_id")] public string remark { get; set; }
public string create_id {get;set;}
/// <summary> /// <summary>
/// Desc:最后修改人员ID /// Desc:创建人员ID
/// Default:NULL::character varying /// Default:NULL::character varying
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
[SugarColumn(ColumnName="modify_id")] public string create_id { get; set; }
public string modify_id {get;set;}
/// <summary> /// <summary>
/// Desc:状态 /// Desc:最后修改人员ID
/// Default:NULL::character varying /// Default:NULL::character varying
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
[SugarColumn(ColumnName="state")] public string modify_id { get; set; }
public string state {get;set;}
/// <summary> /// <summary>
/// Desc:物料属性 /// Desc:状态
/// Default:NULL::character varying /// Default:NULL::character varying
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
[SugarColumn(ColumnName="material_property")] public string state { get; set; }
public string material_property {get;set;}
/// <summary> /// <summary>
/// Desc:标签 /// Desc:物料属性
/// Default:NULL::character varying /// Default:NULL::character varying
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
[SugarColumn(ColumnName="label")] public string material_property { get; set; }
public string label {get;set;}
/// <summary> /// <summary>
/// Desc:描述 /// Desc:标签
/// Default:NULL::character varying /// Default:NULL::character varying
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
public string descrip {get;set;} public string label { get; set; }
/// <summary>
/// Desc:描述
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string descrip { get; set; }
} }
} }

2
BasicData/Tnb.BasicData.Entitys/Entity/BasMbom.cs
View File

@@ -109,7 +109,7 @@ namespace Tnb.BasicData.Entities
/// Default:NULL::character varying /// Default:NULL::character varying
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
public string is_first {get;set;} public int is_first {get;set;}
/// <summary> /// <summary>
/// Desc:创建用户 /// Desc:创建用户

7
BasicData/Tnb.BasicData.Entitys/Entity/BasMbomProcess.cs
View File

@@ -47,5 +47,12 @@ namespace Tnb.BasicData.Entities
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
public string station { get; set; } public string station { get; set; }
/// <summary>
/// Desc:副产出管控 0 不启用 1 启用
/// Default:
/// Nullable:False
/// </summary>
public int byproduct_status { get; set; }
} }
} }

203
BasicData/Tnb.BasicData/BasMbomService.cs
View File

@@ -1,4 +1,5 @@
using JNPF.Common.Core.Manager; using JNPF.Common.Core.Manager;
using JNPF.Common.Security;
using JNPF.DependencyInjection; using JNPF.DependencyInjection;
using JNPF.DynamicApiController; using JNPF.DynamicApiController;
using JNPF.Systems.Interfaces.System; using JNPF.Systems.Interfaces.System;
@@ -6,6 +7,7 @@ using Microsoft.AspNetCore.Mvc;
using SqlSugar; using SqlSugar;
using Tnb.BasicData.Entities; using Tnb.BasicData.Entities;
using Tnb.BasicData.Interfaces; using Tnb.BasicData.Interfaces;
using Tnb.BasicData.Entities.Dto;
namespace Tnb.BasicData namespace Tnb.BasicData
{ {
@@ -19,14 +21,211 @@ namespace Tnb.BasicData
private readonly ISqlSugarRepository<BasMbom> _repository; private readonly ISqlSugarRepository<BasMbom> _repository;
private readonly DataBaseManager _dbManager; private readonly DataBaseManager _dbManager;
private readonly IDictionaryDataService _dictionaryDataService; private readonly IDictionaryDataService _dictionaryDataService;
private readonly IUserManager _userManager;
public BasMbomService( public BasMbomService(
ISqlSugarRepository<BasMbom> repository,DataBaseManager dbManager,IDictionaryDataService dictionaryDataService) ISqlSugarRepository<BasMbom> repository,
DataBaseManager dbManager,
IUserManager userManager,
IDictionaryDataService dictionaryDataService)
{ {
_repository = repository; _repository = repository;
_dbManager = dbManager; _dbManager = dbManager;
_userManager = userManager;
_dictionaryDataService = dictionaryDataService; _dictionaryDataService = dictionaryDataService;
} }
/// <summary>
/// 保存生产bom
/// </summary>
/// <param name="mbomSaveDataInput"></param>
/// <returns></returns>
[HttpPost]
public async Task<string> SaveData(MbomSaveDataInput mbomSaveDataInput)
{
DbResult<bool> result = await _repository.AsSugarClient().Ado.UseTranAsync(async () =>
{
//新增
if (string.IsNullOrEmpty(mbomSaveDataInput.id))
{
string mbomId = SnowflakeIdHelper.NextId();
string orgId = _userManager.GetUserInfo().Result.organizeId;
BasMbom mbom = new BasMbom()
{
id = mbomId,
org_id = orgId,
material_id= mbomSaveDataInput.material_id,
num = mbomSaveDataInput.num,
unit_id = mbomSaveDataInput.unit_id,
version = mbomSaveDataInput.version,
start_time = mbomSaveDataInput.start_time,
end_time = mbomSaveDataInput.end_time,
ebom_id = mbomSaveDataInput.ebom_id,
route_id = mbomSaveDataInput.route_id,
is_first = mbomSaveDataInput.is_first,
remark = mbomSaveDataInput.remark,
create_id = _userManager.UserId,
create_time = DateTime.Now,
};
await _repository.InsertAsync(mbom);
List<BasMbomProcess> processes = new List<BasMbomProcess>();
List<BasMbomInput> inputs = new List<BasMbomInput>();
List<BasMbomOutput> outputs = new List<BasMbomOutput>();
foreach (var process in mbomSaveDataInput.processes)
{
string mbomProcessId = SnowflakeIdHelper.NextId();
processes.Add(new BasMbomProcess()
{
id = mbomProcessId,
org_id = orgId,
mbom_id= mbomId,
process_id = process.process_id,
preparation_time = process.preparation_time,
station = process.station,
byproduct_status = process.byproduct_status,
});
foreach (var input in process.inputs)
{
string inputId = SnowflakeIdHelper.NextId();
inputs.Add(new BasMbomInput()
{
id = inputId,
mbom_id = mbomId,
mbom_process_id = mbomProcessId,
process_id = process.process_id,
material_id = input.material_id,
num = input.num,
org_id = orgId,
});
}
foreach (var output in process.outputs)
{
string outputId = SnowflakeIdHelper.NextId();
outputs.Add(new BasMbomOutput()
{
id = outputId,
mbom_id = mbomId,
mbom_process_id = mbomProcessId,
process_id = process.process_id,
material_id = output.material_id,
num = output.num,
org_id = orgId,
});
}
}
if (processes.Count > 0)
{
await _repository.AsSugarClient().Insertable<BasMbomProcess>(processes).ExecuteCommandAsync();
}
if (inputs.Count > 0)
{
await _repository.AsSugarClient().Insertable<BasMbomInput>(inputs).ExecuteCommandAsync();
}
if (outputs.Count > 0)
{
await _repository.AsSugarClient().Insertable<BasMbomOutput>(outputs).ExecuteCommandAsync();
}
}
else//修改
{
string orgId = _userManager.GetUserInfo().Result.organizeId;
await _repository.UpdateAsync(x=>new BasMbom()
{
// org_id = orgId,
material_id= mbomSaveDataInput.material_id,
num = mbomSaveDataInput.num,
unit_id = mbomSaveDataInput.unit_id,
version = mbomSaveDataInput.version,
start_time = mbomSaveDataInput.start_time,
end_time = mbomSaveDataInput.end_time,
ebom_id = mbomSaveDataInput.ebom_id,
route_id = mbomSaveDataInput.route_id,
is_first = mbomSaveDataInput.is_first,
remark = mbomSaveDataInput.remark,
modify_id = _userManager.UserId,
modify_time = DateTime.Now,
},x=>x.id==mbomSaveDataInput.id);
List<BasMbomProcess> processes = new List<BasMbomProcess>();
List<BasMbomInput> inputs = new List<BasMbomInput>();
List<BasMbomOutput> outputs = new List<BasMbomOutput>();
foreach (var process in mbomSaveDataInput.processes)
{
string mbomProcessId = SnowflakeIdHelper.NextId();
processes.Add(new BasMbomProcess()
{
id = mbomProcessId,
org_id = orgId,
mbom_id= mbomSaveDataInput.id,
process_id = process.process_id,
preparation_time = process.preparation_time,
station = process.station,
byproduct_status = process.byproduct_status,
});
foreach (var input in process.inputs)
{
string inputId = SnowflakeIdHelper.NextId();
inputs.Add(new BasMbomInput()
{
id = inputId,
mbom_id = mbomSaveDataInput.id,
mbom_process_id = mbomProcessId,
process_id = process.process_id,
material_id = input.material_id,
num = input.num,
org_id = orgId,
});
}
foreach (var output in process.outputs)
{
string outputId = SnowflakeIdHelper.NextId();
outputs.Add(new BasMbomOutput()
{
id = outputId,
mbom_id = mbomSaveDataInput.id,
mbom_process_id = mbomProcessId,
process_id = process.process_id,
material_id = output.material_id,
num = output.num,
org_id = orgId,
});
}
}
await _repository.AsSugarClient().Deleteable<BasMbomProcess>().Where(x=>x.mbom_id==mbomSaveDataInput.id).ExecuteCommandAsync();
await _repository.AsSugarClient().Deleteable<BasMbomInput>().Where(x=>x.mbom_id==mbomSaveDataInput.id).ExecuteCommandAsync();
await _repository.AsSugarClient().Deleteable<BasMbomOutput>().Where(x=>x.mbom_id==mbomSaveDataInput.id).ExecuteCommandAsync();
if (processes.Count > 0)
{
await _repository.AsSugarClient().Insertable<BasMbomProcess>(processes).ExecuteCommandAsync();
}
if (inputs.Count > 0)
{
await _repository.AsSugarClient().Insertable<BasMbomInput>(inputs).ExecuteCommandAsync();
}
if (outputs.Count > 0)
{
await _repository.AsSugarClient().Insertable<BasMbomOutput>(outputs).ExecuteCommandAsync();
}
}
});
return result.IsSuccess ? "保存成功" : result.ErrorMessage;
}
} }
} }