From 208e6258d3025e014819ede9287e97f7159d8b3a Mon Sep 17 00:00:00 2001 From: zhoukeda <1315948824@qq.com> Date: Tue, 9 May 2023 17:25:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entity/BasMaterial.cs | 7 ++ .../Entity/BasMbomInput.cs | 2 +- BasicData/Tnb.BasicData/BasMaterialService.cs | 7 +- BasicData/Tnb.BasicData/BasMbomService.cs | 66 ++++++++++++------- BasicData/Tnb.BasicData/BasProcessService.cs | 3 + BasicData/Tnb.BasicData/BasRouteService.cs | 3 + 6 files changed, 63 insertions(+), 25 deletions(-) diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasMaterial.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasMaterial.cs index 397026ad..bee3353f 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasMaterial.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasMaterial.cs @@ -334,5 +334,12 @@ namespace Tnb.BasicData.Entities /// Nullable:True /// public string descrip { get; set; } + + /// + /// Desc:是否包含入库数 0 包含 1 不包含 + /// Default:NULL::character varying + /// Nullable:True + /// + public int is_contain_into_num {get;set;} } } \ No newline at end of file diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasMbomInput.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasMbomInput.cs index 54f7d5f7..64db9c61 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasMbomInput.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasMbomInput.cs @@ -46,7 +46,7 @@ namespace Tnb.BasicData.Entities /// Default: /// Nullable:False /// - public int num { get; set; } + public decimal? num { get; set; } /// /// Desc:所属组织id diff --git a/BasicData/Tnb.BasicData/BasMaterialService.cs b/BasicData/Tnb.BasicData/BasMaterialService.cs index db96bd82..f4174821 100644 --- a/BasicData/Tnb.BasicData/BasMaterialService.cs +++ b/BasicData/Tnb.BasicData/BasMaterialService.cs @@ -1,8 +1,10 @@ using JNPF.Common.Core.Manager; +using JNPF.Common.Enums; using JNPF.Common.Filter; using JNPF.Common.Security; using JNPF.DependencyInjection; using JNPF.DynamicApiController; +using JNPF.FriendlyException; using JNPF.Systems.Entitys.System; using JNPF.Systems.Interfaces.System; using Microsoft.AspNetCore.Mvc; @@ -69,11 +71,12 @@ namespace Tnb.BasicData await _repository.AsSugarClient().Insertable(materialIntoFactorySpecifications).ExecuteCommandAsync(); }); + if(!result.IsSuccess) throw Oops.Oh(ErrorCode.COM1008); return result.IsSuccess ? "复制成功" : result.ErrorMessage; } /// - /// 获取物料清单所有子集物料信息 + /// 获取本物料清单及其所有子集物料信息 /// /// /// @@ -82,6 +85,8 @@ namespace Tnb.BasicData { var db = _repository.AsSugarClient(); List ids = await GetAllChildrenMaterialId(queryInput.ebom_id); + BasEbomH ebom = await db.Queryable().Where(x => x.id == queryInput.ebom_id).SingleAsync(); + ids.Add(ebom.material_id); var result = await db.Queryable() .LeftJoin((a, b) => a.unit_id == b.EnCode) .LeftJoin((a, b, c) => b.DictionaryTypeId == c.Id && c.EnCode == DictConst.MeasurementUnit && c.DeleteMark == null) diff --git a/BasicData/Tnb.BasicData/BasMbomService.cs b/BasicData/Tnb.BasicData/BasMbomService.cs index 1fd5b097..586fc06c 100644 --- a/BasicData/Tnb.BasicData/BasMbomService.cs +++ b/BasicData/Tnb.BasicData/BasMbomService.cs @@ -1,8 +1,10 @@ using JNPF.Common.Core.Manager; +using JNPF.Common.Enums; using JNPF.Common.Filter; using JNPF.Common.Security; using JNPF.DependencyInjection; using JNPF.DynamicApiController; +using JNPF.FriendlyException; using JNPF.Systems.Interfaces.System; using JNPF.VisualDev; using JNPF.VisualDev.Entitys.Dto.VisualDevModelData; @@ -177,34 +179,40 @@ namespace Tnb.BasicData }); - foreach (var input in process.inputs) + if (process.inputs != null) { - string inputId = SnowflakeIdHelper.NextId(); - inputs.Add(new BasMbomInput() + foreach (var input in process.inputs) { - 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, - }); + 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) + + if (process.outputs != null) { - string outputId = SnowflakeIdHelper.NextId(); - outputs.Add(new BasMbomOutput() + foreach (var output in process.outputs) { - 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, - }); + 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, + }); + } } } @@ -322,6 +330,18 @@ namespace Tnb.BasicData }); + if (!result.IsSuccess) + { + if (!string.IsNullOrEmpty(mbomSaveDataInput.id)) + { + throw Oops.Oh(ErrorCode.COM1001); + } + else + { + throw Oops.Oh(ErrorCode.COM1000); + } + + } return result.IsSuccess ? "保存成功" : result.ErrorMessage; } } diff --git a/BasicData/Tnb.BasicData/BasProcessService.cs b/BasicData/Tnb.BasicData/BasProcessService.cs index 6dd4ac2a..8639a1b8 100644 --- a/BasicData/Tnb.BasicData/BasProcessService.cs +++ b/BasicData/Tnb.BasicData/BasProcessService.cs @@ -1,9 +1,11 @@ using Aop.Api.Domain; using JNPF.Common.Core.Manager; using JNPF.Common.Dtos.VisualDev; +using JNPF.Common.Enums; using JNPF.Common.Security; using JNPF.DependencyInjection; using JNPF.DynamicApiController; +using JNPF.FriendlyException; using JNPF.Systems.Entitys.Permission; using JNPF.Systems.Entitys.System; using JNPF.Systems.Interfaces.System; @@ -137,6 +139,7 @@ namespace Tnb.BasicData await _repository.AsSugarClient().Insertable(list).ExecuteCommandAsync(); }); + if(!result.IsSuccess) throw Oops.Oh(ErrorCode.COM1008); return result.IsSuccess ? "保存成功" : result.ErrorMessage; } diff --git a/BasicData/Tnb.BasicData/BasRouteService.cs b/BasicData/Tnb.BasicData/BasRouteService.cs index d54c644c..89a0d15f 100644 --- a/BasicData/Tnb.BasicData/BasRouteService.cs +++ b/BasicData/Tnb.BasicData/BasRouteService.cs @@ -1,8 +1,10 @@ using JNPF.Common.Core.Manager; +using JNPF.Common.Enums; using JNPF.Common.Filter; using JNPF.Common.Security; using JNPF.DependencyInjection; using JNPF.DynamicApiController; +using JNPF.FriendlyException; using Microsoft.AspNetCore.Mvc; using SqlSugar; using Tnb.BasicData.Entities; @@ -72,6 +74,7 @@ namespace Tnb.BasicData await _repository.AsSugarClient().Insertable(basRouteDs).ExecuteCommandAsync(); }); + if(!result.IsSuccess) throw Oops.Oh(ErrorCode.COM1008); return result.IsSuccess ? "复制成功" : result.ErrorMessage; }