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

组装包装，生产排产代码调整

Browse Source
This commit is contained in:
DEVICE8\12494
2023-05-23 19:23:09 +08:00
parent 6ee558a3e4
commit f388692848
14 changed files with 632 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,6 +13,8 @@ using SqlSugar;
using Tnb.BasicData.Entities;
using Tnb.BasicData.Interfaces;
using Tnb.BasicData.Entities.Dto;
using NPOI.OpenXmlFormats.Dml;
using JNPF.Common.Extension;
namespace Tnb.BasicData
{
@@ -22,15 +24,16 @@ namespace Tnb.BasicData
[ApiDescriptionSettings(Tag = ModuleConst.Tag, Area = ModuleConst.Area, Order = 1102)]
[Route("api/[area]/[controller]/[action]")]
[OverideVisualDev(ModelId)]
public class BasMbomService : IBasMbomService,IOverideVisualDevService,IDynamicApiController, ITransient
public class BasMbomService : IBasMbomService, IOverideVisualDevService, IDynamicApiController, ITransient
{
public const string ModelId = "25574817510421";
private readonly ISqlSugarRepository<BasMbom> _repository;
private readonly DataBaseManager _dbManager;
private readonly IDictionaryDataService _dictionaryDataService;
private readonly IUserManager _userManager;
private readonly ISqlSugarClient _db;
public OverideVisualDevFunc OverideFuncs { get; } = new OverideVisualDevFunc();
public BasMbomService(
ISqlSugarRepository<BasMbom> repository,
DataBaseManager dbManager,
@@ -41,10 +44,11 @@ namespace Tnb.BasicData
_dbManager = dbManager;
_userManager = userManager;
_dictionaryDataService = dictionaryDataService;
_db = repository.AsSugarClient();
// OverideFuncs.GetAsync = GetInfo;
OverideFuncs.GetListAsync = GetList;
}
/// <summary>
/// 生产bom列表
/// </summary>
@@ -55,14 +59,14 @@ namespace Tnb.BasicData
var db = _repository.AsSugarClient();
Dictionary<string, object> queryJson = string.IsNullOrEmpty(input.queryJson) ? null : input.queryJson.ToObject<Dictionary<string, object>>();
string materialInfo = queryJson?["query_info"]?.ToString();
var list = await db.Queryable<BasMbom, BasMaterial, BasEbomH, BasRouteH>((a, b, c,d) => new object[]
var list = await db.Queryable<BasMbom, BasMaterial, BasEbomH, BasRouteH>((a, b, c, d) => new object[]
{
JoinType.Left, a.material_id == b.id,
JoinType.Left, a.ebom_id == c.id,
JoinType.Left, a.route_id == d.id,
})
.WhereIF(!string.IsNullOrEmpty(materialInfo),(a,b,c,d)=>b.code.Contains(materialInfo) || b.name.Contains(materialInfo))
.Select((a, b, c,d) => new MbomListOutput
.WhereIF(!string.IsNullOrEmpty(materialInfo), (a, b, c, d) => b.code.Contains(materialInfo) || b.name.Contains(materialInfo))
.Select((a, b, c, d) => new MbomListOutput
{
id = a.id,
material_id = b.code + "-" + b.name,
@@ -71,12 +75,41 @@ namespace Tnb.BasicData
ebom_id = c.version,
route_id = d.name,
route_id_id = c.id,
start_time = a.start_time.Value.ToString("yyyy-MM-dd"),
end_time = a.start_time.Value.ToString("yyyy-MM-dd"),
is_first = SqlFunc.IIF(a.is_first==0 , "否","是"),
start_time = a.start_time.Value.ToString("yyyy-MM-dd"),
end_time = a.start_time.Value.ToString("yyyy-MM-dd"),
is_first = SqlFunc.IIF(a.is_first == 0, "否", "是"),
}).ToPagedListAsync(input.currentPage, input.pageSize);
return PageResult<MbomListOutput>.SqlSugarPageResult(list);
return PageResult<MbomListOutput>.SqlSugarPageResult(list);
}
/// <summary>
/// 根据bomid获取对应的子bom列表
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
[HttpGet]
public async Task<dynamic> GetSubMoListByBomId([FromRoute] string bomId)
{
if (string.IsNullOrEmpty(bomId)) throw new ArgumentException($"parameter {nameof(bomId)} not be null or empty");
var result = await _db.Queryable<BasMbom>().LeftJoin<BasRouteD>((a, b) => a.route_id == b.route_id)
.LeftJoin<BasProcess>((a, b, c) => b.process_id == c.id)
.LeftJoin<BasMbomOutput>((a, b, c, d) => c.id == d.process_id)
.LeftJoin<BasMaterial>((a, b, c, d, e) => d.material_id == e.id)
.LeftJoin<BasMaterialCategory>((a, b, c, d, e, f) => e.category_id == f.id)
.Where((a, b, c, d, e, f) => a.id == bomId)
.Select((a, b, c, d, e, f) => new SubBomListOutput
{
material_id = e.id,
material_code = e.code,
material_name = e.name,
material_category_code = f.category_code,
num = d.num
})
.Mapper(it => it.output_qty = it.num.ParseToInt())
.Distinct()
.ToListAsync();
return result;
}
/// <summary>
@@ -87,13 +120,13 @@ namespace Tnb.BasicData
public async Task<dynamic> GetInfo(string id)
{
var db = _repository.AsSugarClient();
BasMbom mbom = await _repository.GetSingleAsync(x=>x.id==id);
BasMbom mbom = await _repository.GetSingleAsync(x => x.id == id);
List<BasMbomProcess> processes = await db.Queryable<BasMbomProcess>().Where(x => x.mbom_id == id).ToListAsync();
List<BasMbomInput> inputs = await db.Queryable<BasMbomInput>().Where(x => x.mbom_id == id).ToListAsync();
List<BasMbomOutput> outputs = await db.Queryable<BasMbomOutput>().Where(x => x.mbom_id == id).ToListAsync();
MbomDataOutput mbomDataOutput = new MbomDataOutput();
List<MbomProcessOutDto> mbomProcessOutDtos = new List<MbomProcessOutDto>();
mbomDataOutput.id = mbom.id;
mbomDataOutput.ebom_id = mbom.ebom_id;
mbomDataOutput.is_first = mbom.is_first;
@@ -105,7 +138,7 @@ namespace Tnb.BasicData
mbomDataOutput.end_time = mbom.end_time;
mbomDataOutput.unit_id = mbom.unit_id;
mbomDataOutput.version = mbom.version;
foreach (BasMbomProcess process in processes)
{
mbomProcessOutDtos.Add(new MbomProcessOutDto()
@@ -118,13 +151,51 @@ namespace Tnb.BasicData
production_method = process.production_method,
inputs = inputs.Where(x => x.process_id == process.process_id).ToList(),
outputs = outputs.Where(x => x.process_id == process.process_id).ToList(),
});
}
mbomDataOutput.processes = mbomProcessOutDtos;
return mbomDataOutput;
}
/// <summary>
/// 根据物料id获取生产bom
/// </summary>
/// <param name="materialId"></param>
/// <remarks>
/// returns:
/// <br/>{
/// <br/> bom_id:bomid
/// <br/> material_code:物料编码
/// <br/> material_name:物料名称
/// <br/> start_time:有效开始时间
/// <br/> end_time:有效结束时间
/// <br/> version:bom版本
/// <br/> route_id:工艺路线id
/// <br/> route_name:工艺路线名称
/// <br/>}
/// </remarks>
[HttpGet]
public async Task<dynamic> GetMBomListByMaterialId([FromRoute] string materialId)
{
return await _db.Queryable<BasMbom>()
.LeftJoin<BasMaterial>((a, b) => a.material_id == b.id)
.LeftJoin<BasRouteH>((a, b, c) => a.route_id == c.id)
.Where((a, b, c) => a.material_id == materialId)
.Select((a, b, c) => new
{
bom_id = a.id,
material_code = b.code,
material_name = b.name,
start_time = a.start_time.HasValue ? a.start_time.Value.ToString("yyyy-MM-dd HH:mm:ss") : null,
end_time = a.end_time.HasValue ? a.end_time.Value.ToString("yyyy-MM-dd HH:mm:ss") : null,
version = a.version,
route_id = c.id,
route_name = c.name,
})
.ToListAsync();
}
/// <summary>
/// 保存生产bom
/// </summary>
@@ -133,18 +204,18 @@ namespace Tnb.BasicData
[HttpPost]
public async Task<string> SaveData(MbomSaveDataInput mbomSaveDataInput)
{
DbResult<bool> result = await _repository.AsSugarClient().Ado.UseTranAsync(async () =>
DbResult<bool> result = await _repository.AsSugarClient().Ado.UseTranAsync(async () =>
{
//新增
if (string.IsNullOrEmpty(mbomSaveDataInput.id))
{
string mbomId = SnowflakeIdHelper.NextId();
string orgId = _userManager.GetUserInfo().Result.organizeId;
string orgId = _userManager.GetUserInfo().Result.organizeId;
BasMbom mbom = new BasMbom()
{
id = mbomId,
org_id = orgId,
material_id= mbomSaveDataInput.material_id,
material_id = mbomSaveDataInput.material_id,
num = mbomSaveDataInput.num,
unit_id = mbomSaveDataInput.unit_id,
version = mbomSaveDataInput.version,
@@ -156,13 +227,13 @@ namespace Tnb.BasicData
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();
@@ -170,13 +241,13 @@ namespace Tnb.BasicData
{
id = mbomProcessId,
org_id = orgId,
mbom_id= mbomId,
mbom_id = mbomId,
process_id = process.process_id,
preparation_time = process.preparation_time,
station = process.station,
byproduct_status = process.byproduct_status,
production_method = process.production_method,
});
if (process.inputs != null)
@@ -220,12 +291,12 @@ namespace Tnb.BasicData
{
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();
@@ -233,11 +304,11 @@ namespace Tnb.BasicData
}
else//修改
{
string orgId = _userManager.GetUserInfo().Result.organizeId;
await _repository.UpdateAsync(x=>new BasMbom()
string orgId = _userManager.GetUserInfo().Result.organizeId;
await _repository.UpdateAsync(x => new BasMbom()
{
// org_id = orgId,
material_id= mbomSaveDataInput.material_id,
material_id = mbomSaveDataInput.material_id,
num = mbomSaveDataInput.num,
unit_id = mbomSaveDataInput.unit_id,
version = mbomSaveDataInput.version,
@@ -249,12 +320,12 @@ namespace Tnb.BasicData
remark = mbomSaveDataInput.remark,
modify_id = _userManager.UserId,
modify_time = DateTime.Now,
},x=>x.id==mbomSaveDataInput.id);
}, 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();
@@ -262,13 +333,13 @@ namespace Tnb.BasicData
{
id = mbomProcessId,
org_id = orgId,
mbom_id= mbomSaveDataInput.id,
mbom_id = mbomSaveDataInput.id,
process_id = process.process_id,
preparation_time = process.preparation_time,
station = process.station,
byproduct_status = process.byproduct_status,
production_method = process.production_method,
});
if (process.inputs != null)
@@ -306,28 +377,28 @@ namespace Tnb.BasicData
});
}
}
}
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();
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();
}
}
});
if (!result.IsSuccess)
@@ -340,7 +411,7 @@ namespace Tnb.BasicData
{
throw Oops.Oh(ErrorCode.COM1000);
}
}
return result.IsSuccess ? "保存成功" : result.ErrorMessage;
}