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

bug

Browse Source
This commit is contained in:
周科达
2023-06-21 11:17:32 +08:00
parent c4434ce477
commit 1e555f372f
6 changed files with 70 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
BasicData/Tnb.BasicData.Entities/Dto/BasEbom/EbomListOutput.cs
View File

@@ -19,6 +19,10 @@ namespace Tnb.BasicData.Entities.Dto
public string? unit_id { get; set; } public string? unit_id { get; set; }
public string? version { get; set; } public string? version { get; set; }
/// <summary> /// <summary>
/// 数量
/// </summary>
public int quantity { get; set; }
/// <summary>
/// 工艺路线名称 /// 工艺路线名称
/// </summary> /// </summary>
public string? route_id { get; set; } public string? route_id { get; set; }

9
BasicData/Tnb.BasicData.Entities/Dto/BasEbom/EbomTreeOutput.cs
View File

@@ -45,12 +45,11 @@ namespace Tnb.BasicData.Entities.Dto
/// </summary> /// </summary>
public string? loss_rate {get;set;} public string? loss_rate {get;set;}
/// <summary>
/// Desc:数量
/// Default:NULL::character varying
/// Nullable:True
/// </summary> /// </summary>
public string? quantity {get;set;} /// <summary>
/// 数量
/// </summary>
public int quantity { get; set; }
/// <summary> /// <summary>
/// Desc:需要称量 /// Desc:需要称量

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

@@ -37,7 +37,7 @@ public partial class BasEbomD : BaseEntity<string>
/// <summary> /// <summary>
/// 数量 /// 数量
/// </summary> /// </summary>
public string? quantity { get; set; } public int quantity { get; set; }
/// <summary> /// <summary>
/// 损耗率 /// 损耗率

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

@@ -32,7 +32,7 @@ public partial class BasEbomH : BaseEntity<string>
/// <summary> /// <summary>
/// 数量 /// 数量
/// </summary> /// </summary>
public string? quantity { get; set; } public int quantity { get; set; }
/// <summary> /// <summary>
/// 单位id /// 单位id

1
BasicData/Tnb.BasicData/BasEbomService.cs
View File

@@ -63,6 +63,7 @@ namespace Tnb.BasicData
material_id_id = b.id, material_id_id = b.id,
status = SqlFunc.IIF(a.status == "0", "禁用", "启用"), status = SqlFunc.IIF(a.status == "0", "禁用", "启用"),
descrip = a.descrip, descrip = a.descrip,
quantity = a.quantity,
version = a.version, version = a.version,
route_id = c.name, route_id = c.name,
route_id_id = c.id, route_id_id = c.id,

67
ProductionMgr/Tnb.ProductionMgr/PrdMoService.cs
View File

@@ -179,6 +179,56 @@ namespace Tnb.ProductionMgr
.ExecuteCommandAsync(); .ExecuteCommandAsync();
return (row > 0); return (row > 0);
} }
// /// <summary>
// /// 关联同组工单
// /// </summary>
// /// <param name="input">关联同组工单输入参数</param>
// /// <returns></returns>
// [HttpPost]
// public async Task<dynamic> RelevancySameGroupMo(MoCrInput input)
// {
// (bool executeRes, string errMsg) multi = (true, "");
// var list = await _repository.AsSugarClient().Queryable<PrdMo>()
// .InnerJoin<ToolMolds>((a, b) => a.material_id == b.material_id)
// .Where((a, b) => input.WorkOrderIds.Contains(a.id))
// .Select((a, b) => new
// {
// planDate = a.plan_start_date,
// mold_code = b.mold_code,
// }).ToListAsync();
// var planDateAll = true;
// var moldIdAll = true;
// if (list?.Count > 0)
// {
// var planDate = list.FirstOrDefault()?.planDate;
// var moldCode = list.FirstOrDefault()?.mold_code;
//
// planDateAll = list.Skip(1).All(x => x.planDate == planDate);
// moldIdAll = list.Skip(1).All(x => x.mold_code == moldCode);
// if (planDateAll && moldIdAll)
// {
// var groupId = SnowflakeIdHelper.NextId();
// multi.executeRes = await _repository.AsSugarClient().Updateable<PrdMo>()
// .SetColumns(c => new PrdMo { combine_mo_code = groupId })
// .Where(it => input.WorkOrderIds.Contains(it.id))
// .ExecuteCommandHasChangeAsync();
// }
// else
// {
// multi.executeRes = false;
// if (!planDateAll)
// {
// throw new AppFriendlyException("计划开始日期不一致", null);
// }
// if (!moldIdAll)
// {
// throw new AppFriendlyException("未关联到同一模具下", null);
// }
// }
// }
// return multi;
// }
/// <summary> /// <summary>
/// 关联同组工单 /// 关联同组工单
/// </summary> /// </summary>
@@ -189,12 +239,13 @@ namespace Tnb.ProductionMgr
{ {
(bool executeRes, string errMsg) multi = (true, ""); (bool executeRes, string errMsg) multi = (true, "");
var list = await _repository.AsSugarClient().Queryable<PrdMo>() var list = await _repository.AsSugarClient().Queryable<PrdMo>()
.InnerJoin<ToolMolds>((a, b) => a.material_id == b.material_id) .LeftJoin<ToolMoldsMaterial>((a, b) => a.material_id == b.material_id)
.Where((a, b) => input.WorkOrderIds.Contains(a.id)) .LeftJoin<ToolMolds>((a,b,c)=>b.mold_id==c.id)
.Select((a, b) => new .Where((a, b,c) => input.WorkOrderIds.Contains(a.id))
.Select((a, b,c) => new
{ {
planDate = a.plan_start_date, planDate = a.plan_start_date,
mold_code = b.mold_code, mold_code = c.mold_code,
}).ToListAsync(); }).ToListAsync();
var planDateAll = true; var planDateAll = true;
var moldIdAll = true; var moldIdAll = true;
@@ -203,8 +254,8 @@ namespace Tnb.ProductionMgr
var planDate = list.FirstOrDefault()?.planDate; var planDate = list.FirstOrDefault()?.planDate;
var moldCode = list.FirstOrDefault()?.mold_code; var moldCode = list.FirstOrDefault()?.mold_code;
planDateAll = list.Skip(1).All(x => x.planDate == planDate); planDateAll = list.All(x => x.planDate == planDate);
moldIdAll = list.Skip(1).All(x => x.mold_code == moldCode); moldIdAll = moldCode != null && list.All(x => x.mold_code == moldCode);
if (planDateAll && moldIdAll) if (planDateAll && moldIdAll)
{ {
var groupId = SnowflakeIdHelper.NextId(); var groupId = SnowflakeIdHelper.NextId();
@@ -218,11 +269,11 @@ namespace Tnb.ProductionMgr
multi.executeRes = false; multi.executeRes = false;
if (!planDateAll) if (!planDateAll)
{ {
throw new AppFriendlyException("计划开始日期不一致", null); throw Oops.Bah("计划开始日期不一致");
} }
if (!moldIdAll) if (!moldIdAll)
{ {
throw new AppFriendlyException("未关联到同一模具下", null); throw Oops.Bah("未关联到同一模具下");
} }
} }
} }