From aea9e3a9d5d9e8f5b8a7dffcef109627d53253c4 Mon Sep 17 00:00:00 2001 From: zhoukeda <1315948824@qq.com> Date: Mon, 19 Jun 2023 16:27:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4warn?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Dto/BasEbom/EbomListOutput.cs | 18 +- .../Dto/BasEbom/EbomTreeOutput.cs | 24 +- .../Dto/BasEbom/EbomTreeQueryInput.cs | 4 +- .../Dto/BasMaterial/MaterialSelectOutput.cs | 12 +- .../BasMaterial/MaterialSelectQueryInput.cs | 6 +- .../Dto/BasMbom/MbomDataOutput.cs | 28 +-- .../Dto/BasMbom/MbomListOutput.cs | 24 +- .../Dto/BasMbom/MbomSaveDataInput.cs | 28 +-- .../Dto/BasProcess/ProcessStationInput.cs | 4 +- .../Dto/BasRoute/VaildRouteOutput.cs | 12 +- .../Dto/ElementSelectDto.cs | 4 +- .../Tnb.BasicData.Entities/Entity/BasEbomD.cs | 2 +- BasicData/Tnb.BasicData/BasEbomService.cs | 17 +- BasicData/Tnb.BasicData/BasMaterialService.cs | 5 +- BasicData/Tnb.BasicData/BasMbomService.cs | 226 +++++++++--------- BasicData/Tnb.BasicData/BasProcessService.cs | 4 +- BasicData/Tnb.BasicData/BasRouteService.cs | 5 +- .../Dto/EquipDaqQueryOutput.cs | 18 +- .../Dto/EquipFileQueryOutput.cs | 16 +- .../Dto/EquipMaintainRecordQueryOutput.cs | 30 +-- .../Dto/EquipQueryInput.cs | 4 +- .../Dto/EquipRepairRecordQueryOutput.cs | 20 +- .../Dto/EquipSparePartsInput.cs | 4 +- .../Dto/EquipSparePartsQueryOutput.cs | 12 +- .../Dto/EquipSpotInsRecordQueryOutput.cs | 28 +-- .../EquipTechnologyParameterQueryOutput.cs | 8 +- .../Dto/MaintainRecordRepeatInput.cs | 10 +- .../Dto/MaintainRecordRepeatOutput.cs | 4 +- .../Dto/RepairApplyDetailOutput.cs | 4 +- .../Dto/RepairApplyOutRegisterInput.cs | 4 +- .../Dto/RepairApplyRegisterInput.cs | 4 +- .../Dto/RepairDelayInput.cs | 10 +- .../Dto/RepairOutApplyInput.cs | 8 +- .../Dto/SpotInsRecordExecuteInput.cs | 10 +- .../Dto/SpotInsRecordRepeatInput.cs | 6 +- .../Dto/SpotInsRecordRepeatOutput.cs | 4 +- .../Dto/SpotInsTemPublishInput.cs | 4 +- .../Dto/SubEquipQueryOutput.cs | 24 +- .../Entity/EqpEquipSpareParts.cs | 2 +- .../Entity/EqpEquipment.cs | 6 +- .../Entity/EqpMaintainItem.cs | 2 +- .../Entity/EqpMaintainTemEquipH.cs | 4 +- .../Entity/EqpMaintainTemH.cs | 2 +- .../Entity/EqpRepairApply.cs | 2 +- .../Entity/EqpRepairDelay.cs | 2 +- .../Entity/EqpSpEquipCheckRecord.cs | 2 +- .../Entity/ToolMoldsMaterial.cs | 2 +- EquipMgr/Tnb.EquipMgr/EqpDaqService.cs | 16 +- EquipMgr/Tnb.EquipMgr/EqpEquipFileService.cs | 6 +- .../Tnb.EquipMgr/EqpEquipSparePartsService.cs | 34 +-- .../Tnb.EquipMgr/EqpMaintainTemService.cs | 1 - .../Tnb.EquipMgr/EqpRepairApplyService.cs | 4 +- .../Tnb.EquipMgr/EqpRepairDelayService.cs | 3 +- .../Tnb.EquipMgr/EqpRepairOutApplyService.cs | 42 ++-- .../EqpSpEquipCheckRecordService.cs | 25 +- EquipMgr/Tnb.EquipMgr/EqpSpotInsTemService.cs | 3 +- EquipMgr/Tnb.EquipMgr/EqpSubEquipService.cs | 10 +- .../EqpTechnologyParameterService.cs | 12 +- .../Tnb.EquipMgr/EquMaintainRecordService.cs | 57 +++-- .../Tnb.EquipMgr/EquSpotInsRecordService.cs | 25 +- .../Dto/ProcessChildDataInput.cs | 12 +- .../Dto/ProcessParamOutput.cs | 2 +- .../Dto/ProcessParamTypeChildrenOutput.cs | 8 +- .../Dto/ProcessParamTypeDaqListOutput.cs | 4 +- .../Tnb.PerMgr/PerProcessParamTypeService.cs | 22 +- .../Tnb.PerMgr/PerProcessStandardsService.cs | 22 +- .../Dto/PrdManage/MaterialReceiptInput.cs | 4 +- .../ProductionReportRecordService.cs | 2 +- Tnb.Server.sln | 2 +- 69 files changed, 512 insertions(+), 483 deletions(-) diff --git a/BasicData/Tnb.BasicData.Entities/Dto/BasEbom/EbomListOutput.cs b/BasicData/Tnb.BasicData.Entities/Dto/BasEbom/EbomListOutput.cs index 9bdc1445..0a0c08a5 100644 --- a/BasicData/Tnb.BasicData.Entities/Dto/BasEbom/EbomListOutput.cs +++ b/BasicData/Tnb.BasicData.Entities/Dto/BasEbom/EbomListOutput.cs @@ -5,26 +5,26 @@ namespace Tnb.BasicData.Entities.Dto /// public class EbomListOutput { - public string id { get; set; } + public string? id { get; set; } /// /// 物料编码-物料名称 /// - public string material_id { get; set; } + public string? material_id { get; set; } /// /// 物料id /// - public string material_id_id { get; set; } - public string status { get; set; } - public string descrip { get; set; } - public string unit_id { get; set; } - public string version { get; set; } + public string? material_id_id { get; set; } + public string? status { get; set; } + public string? descrip { get; set; } + public string? unit_id { get; set; } + public string? version { get; set; } /// /// 工艺路线名称 /// - public string route_id { get; set; } + public string? route_id { get; set; } /// /// 工艺路线id /// - public string route_id_id { get; set; } + public string? route_id_id { get; set; } } } \ No newline at end of file diff --git a/BasicData/Tnb.BasicData.Entities/Dto/BasEbom/EbomTreeOutput.cs b/BasicData/Tnb.BasicData.Entities/Dto/BasEbom/EbomTreeOutput.cs index e6062a07..1c494894 100644 --- a/BasicData/Tnb.BasicData.Entities/Dto/BasEbom/EbomTreeOutput.cs +++ b/BasicData/Tnb.BasicData.Entities/Dto/BasEbom/EbomTreeOutput.cs @@ -5,15 +5,15 @@ namespace Tnb.BasicData.Entities.Dto /// /// 物料名称 /// - public string material_id { get; set; } + public string? material_id { get; set; } /// /// 规格描述 /// - public string material_id_descrip { get; set; } + public string? material_id_descrip { get; set; } /// /// 物料id /// - public string material_id_id { get; set; } + public string? material_id_id { get; set; } /// /// 最小包装 /// @@ -21,11 +21,11 @@ namespace Tnb.BasicData.Entities.Dto /// /// 备注 /// - public string material_id_remark { get; set; } + public string? material_id_remark { get; set; } /// /// 单位 /// - public string material_id_unit_id { get; set; } + public string? material_id_unit_id { get; set; } /// /// 是否有下级 /// @@ -36,49 +36,49 @@ namespace Tnb.BasicData.Entities.Dto /// Default:NULL::character varying /// Nullable:True /// - public string feeding_control {get;set;} + public string? feeding_control {get;set;} /// /// Desc:损耗率 /// Default:NULL::character varying /// Nullable:True /// - public string loss_rate {get;set;} + public string? loss_rate {get;set;} /// /// Desc:数量 /// Default:NULL::character varying /// Nullable:True /// - public string quantity {get;set;} + public string? quantity {get;set;} /// /// Desc:需要称量 /// Default:NULL::character varying /// Nullable:True /// - public string require_weight {get;set;} + public string? require_weight {get;set;} /// /// Desc:替代物料 /// Default:NULL::character varying /// Nullable:True /// - public string substitute_material_id {get;set;} + public string? substitute_material_id {get;set;} /// /// Desc:工艺路线 /// Default:NULL::character varying /// Nullable:True /// - public string route_name {get;set;} + public string? route_name {get;set;} /// /// Desc:版本号 /// Default:NULL::character varying /// Nullable:True /// - public string version {get;set;} + public string? version {get;set;} } } \ No newline at end of file diff --git a/BasicData/Tnb.BasicData.Entities/Dto/BasEbom/EbomTreeQueryInput.cs b/BasicData/Tnb.BasicData.Entities/Dto/BasEbom/EbomTreeQueryInput.cs index 4d8a7550..7bfe858f 100644 --- a/BasicData/Tnb.BasicData.Entities/Dto/BasEbom/EbomTreeQueryInput.cs +++ b/BasicData/Tnb.BasicData.Entities/Dto/BasEbom/EbomTreeQueryInput.cs @@ -5,11 +5,11 @@ namespace Tnb.BasicData.Entities.Dto /// /// 物料清单id /// - public string ebomId { get; set; } + public string? ebomId { get; set; } /// /// 物料id /// - public string materialId { get; set; } + public string? materialId { get; set; } diff --git a/BasicData/Tnb.BasicData.Entities/Dto/BasMaterial/MaterialSelectOutput.cs b/BasicData/Tnb.BasicData.Entities/Dto/BasMaterial/MaterialSelectOutput.cs index 76ee9199..4838899a 100644 --- a/BasicData/Tnb.BasicData.Entities/Dto/BasMaterial/MaterialSelectOutput.cs +++ b/BasicData/Tnb.BasicData.Entities/Dto/BasMaterial/MaterialSelectOutput.cs @@ -8,31 +8,31 @@ namespace Tnb.BasicData.Entities.Dto /// /// 物料id /// - public string id { get; set; } + public string? id { get; set; } /// /// 编码 /// - public string code { get; set; } + public string? code { get; set; } /// /// 名称 /// - public string name { get; set; } + public string? name { get; set; } /// /// 描述 /// - public string descrip { get; set; } + public string? descrip { get; set; } /// /// 主单位id /// - public string unit_id { get; set; } + public string? unit_id { get; set; } /// /// 主单位名称 /// - public string unit_name { get; set; } + public string? unit_name { get; set; } } } \ No newline at end of file diff --git a/BasicData/Tnb.BasicData.Entities/Dto/BasMaterial/MaterialSelectQueryInput.cs b/BasicData/Tnb.BasicData.Entities/Dto/BasMaterial/MaterialSelectQueryInput.cs index 4ca42123..45394189 100644 --- a/BasicData/Tnb.BasicData.Entities/Dto/BasMaterial/MaterialSelectQueryInput.cs +++ b/BasicData/Tnb.BasicData.Entities/Dto/BasMaterial/MaterialSelectQueryInput.cs @@ -5,12 +5,12 @@ namespace Tnb.BasicData.Entities.Dto /// /// 物料清单id /// - public string ebom_id { get; set; } - + public string? ebom_id { get; set; } + /// /// 物料编码名称查询 /// - public string material_info { get; set; } + public string material_info { get; set; } = string.Empty; /// /// 当前页码:pageIndex. diff --git a/BasicData/Tnb.BasicData.Entities/Dto/BasMbom/MbomDataOutput.cs b/BasicData/Tnb.BasicData.Entities/Dto/BasMbom/MbomDataOutput.cs index 1deef47e..88178349 100644 --- a/BasicData/Tnb.BasicData.Entities/Dto/BasMbom/MbomDataOutput.cs +++ b/BasicData/Tnb.BasicData.Entities/Dto/BasMbom/MbomDataOutput.cs @@ -7,12 +7,12 @@ namespace Tnb.BasicData.Entities.Dto /// /// 生产bomid /// - public string id { get; set; } + public string? id { get; set; } /// /// 物料id /// - public string material_id { get; set; } + public string? material_id { get; set; } /// /// 数量 @@ -22,12 +22,12 @@ namespace Tnb.BasicData.Entities.Dto /// /// 单位id /// - public string unit_id { get; set; } + public string? unit_id { get; set; } /// /// 版本号 /// - public string version { get; set; } + public string? version { get; set; } /// /// 有效开始时间 @@ -42,12 +42,12 @@ namespace Tnb.BasicData.Entities.Dto /// /// 物料清单id /// - public string ebom_id { get; set; } + public string? ebom_id { get; set; } /// /// 工艺路线id /// - public string route_id { get; set; } + public string? route_id { get; set; } /// /// 物料均再首道工序投产 @@ -57,12 +57,12 @@ namespace Tnb.BasicData.Entities.Dto /// /// 备注 /// - public string remark { get; set; } + public string? remark { get; set; } /// /// 工序 /// - public List processes { get; set; } + public List? processes { get; set; } } public class MbomProcessOutDto @@ -72,14 +72,14 @@ namespace Tnb.BasicData.Entities.Dto /// Default: /// Nullable:False /// - public string mbom_id { get; set; } + public string? mbom_id { get; set; } /// /// Desc:工序id /// Default: /// Nullable:False /// - public string process_id { get; set; } + public string? process_id { get; set; } /// /// Desc:准备时间 @@ -93,7 +93,7 @@ namespace Tnb.BasicData.Entities.Dto /// Default:NULL::character varying /// Nullable:True /// - public string station { get; set; } + public string? station { get; set; } /// /// Desc:副产出管控 0 不启用 1 启用 @@ -107,16 +107,16 @@ namespace Tnb.BasicData.Entities.Dto /// Default:NULL::character varying /// Nullable:True /// - public string production_method {get;set;} + public string? production_method {get;set;} /// /// 投入物料 /// - public List inputs { get; set; } + public List? inputs { get; set; } /// /// 产出物料 /// - public List outputs { get; set; } + public List? outputs { get; set; } } } \ No newline at end of file diff --git a/BasicData/Tnb.BasicData.Entities/Dto/BasMbom/MbomListOutput.cs b/BasicData/Tnb.BasicData.Entities/Dto/BasMbom/MbomListOutput.cs index 3c4f1a44..86267e59 100644 --- a/BasicData/Tnb.BasicData.Entities/Dto/BasMbom/MbomListOutput.cs +++ b/BasicData/Tnb.BasicData.Entities/Dto/BasMbom/MbomListOutput.cs @@ -2,17 +2,17 @@ namespace Tnb.BasicData.Entities.Dto { public class MbomListOutput { - public string id { get; set; } - public string ebom_id { get; set; } - public string num { get; set; } - public string unit_id { get; set; } - public string version { get; set; } - public string start_time { get; set; } - public string end_time { get; set; } - public string material_id { get; set; } - public string material_id_id { get; set; } - public string route_id { get; set; } - public string route_id_id { get; set; } - public string is_first { get; set; } + public string? id { get; set; } + public string? ebom_id { get; set; } + public string? num { get; set; } + public string? unit_id { get; set; } + public string? version { get; set; } + public string start_time { get; set; } = string.Empty; + public string end_time { get; set; } = string.Empty; + public string? material_id { get; set; } + public string? material_id_id { get; set; } + public string? route_id { get; set; } + public string? route_id_id { get; set; } + public string? is_first { get; set; } } } \ No newline at end of file diff --git a/BasicData/Tnb.BasicData.Entities/Dto/BasMbom/MbomSaveDataInput.cs b/BasicData/Tnb.BasicData.Entities/Dto/BasMbom/MbomSaveDataInput.cs index 647d6160..bc7e7c38 100644 --- a/BasicData/Tnb.BasicData.Entities/Dto/BasMbom/MbomSaveDataInput.cs +++ b/BasicData/Tnb.BasicData.Entities/Dto/BasMbom/MbomSaveDataInput.cs @@ -7,12 +7,12 @@ namespace Tnb.BasicData.Entities.Dto /// /// 生产bomid /// - public string id { get; set; } + public string id { get; set; } = string.Empty; /// /// 物料id /// - public string material_id { get; set; } + public string material_id { get; set; } = string.Empty; /// /// 数量 @@ -22,12 +22,12 @@ namespace Tnb.BasicData.Entities.Dto /// /// 单位id /// - public string unit_id { get; set; } + public string unit_id { get; set; } = string.Empty; /// /// 版本号 /// - public string version { get; set; } + public string version { get; set; } = string.Empty; /// /// 有效开始时间 @@ -42,12 +42,12 @@ namespace Tnb.BasicData.Entities.Dto /// /// 物料清单id /// - public string ebom_id { get; set; } + public string ebom_id { get; set; } = string.Empty; /// /// 工艺路线id /// - public string route_id { get; set; } + public string route_id { get; set; } = string.Empty; /// /// 物料均再首道工序投产 @@ -57,12 +57,12 @@ namespace Tnb.BasicData.Entities.Dto /// /// 备注 /// - public string remark { get; set; } + public string remark { get; set; } = string.Empty; /// /// 工序 /// - public List processes { get; set; } + public List? processes { get; set; } } public class MbomProcessDto @@ -72,14 +72,14 @@ namespace Tnb.BasicData.Entities.Dto /// Default: /// Nullable:False /// - public string mbom_id { get; set; } + public string? mbom_id { get; set; } /// /// Desc:工序id /// Default: /// Nullable:False /// - public string process_id { get; set; } + public string? process_id { get; set; } /// /// Desc:准备时间 @@ -93,7 +93,7 @@ namespace Tnb.BasicData.Entities.Dto /// Default:NULL::character varying /// Nullable:True /// - public string station { get; set; } + public string? station { get; set; } /// /// Desc:副产出管控 0 不启用 1 启用 @@ -107,16 +107,16 @@ namespace Tnb.BasicData.Entities.Dto /// Default:NULL::character varying /// Nullable:True /// - public string production_method {get;set;} + public string? production_method {get;set;} /// /// 投入物料 /// - public List inputs { get; set; } + public List? inputs { get; set; } /// /// 产出物料 /// - public List outputs { get; set; } + public List? outputs { get; set; } } } \ No newline at end of file diff --git a/BasicData/Tnb.BasicData.Entities/Dto/BasProcess/ProcessStationInput.cs b/BasicData/Tnb.BasicData.Entities/Dto/BasProcess/ProcessStationInput.cs index 99f90029..ea21a076 100644 --- a/BasicData/Tnb.BasicData.Entities/Dto/BasProcess/ProcessStationInput.cs +++ b/BasicData/Tnb.BasicData.Entities/Dto/BasProcess/ProcessStationInput.cs @@ -5,11 +5,11 @@ namespace Tnb.BasicData.Entities.Dto /// /// 工序id /// - public string process_id { get; set; } + public string? process_id { get; set; } /// /// 工位id集合 /// - public List stationIds { get; set; } + public List? stationIds { get; set; } } } \ No newline at end of file diff --git a/BasicData/Tnb.BasicData.Entities/Dto/BasRoute/VaildRouteOutput.cs b/BasicData/Tnb.BasicData.Entities/Dto/BasRoute/VaildRouteOutput.cs index 66a65837..040ab357 100644 --- a/BasicData/Tnb.BasicData.Entities/Dto/BasRoute/VaildRouteOutput.cs +++ b/BasicData/Tnb.BasicData.Entities/Dto/BasRoute/VaildRouteOutput.cs @@ -2,14 +2,14 @@ namespace Tnb.BasicData.Entities.Dto { public class VaildRouteOutput { - public string id { get; set; } + public string? id { get; set; } - public string code { get; set; } + public string? code { get; set; } - public string name { get; set; } + public string? name { get; set; } + + public string start_time { get; set; } = string.Empty; - public string start_time { get; set; } - - public string end_time { get; set; } + public string end_time { get; set; } = string.Empty; } } \ No newline at end of file diff --git a/BasicData/Tnb.BasicData.Entities/Dto/ElementSelectDto.cs b/BasicData/Tnb.BasicData.Entities/Dto/ElementSelectDto.cs index fe156e41..bfeaa24d 100644 --- a/BasicData/Tnb.BasicData.Entities/Dto/ElementSelectDto.cs +++ b/BasicData/Tnb.BasicData.Entities/Dto/ElementSelectDto.cs @@ -2,8 +2,8 @@ namespace Tnb.BasicData.Entitys { public class ElementSelectDto { - public string label { get; set; } + public string?label { get; set; } - public string value { get; set; } + public string? value { get; set; } } } \ No newline at end of file diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasEbomD.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasEbomD.cs index fd9ec3fd..eb68464a 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasEbomD.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasEbomD.cs @@ -22,7 +22,7 @@ public partial class BasEbomD : BaseEntity /// /// 物料编号/名称 /// - public string? material_id { get; set; } + public string material_id { get; set; } = string.Empty; /// /// 描述 diff --git a/BasicData/Tnb.BasicData/BasEbomService.cs b/BasicData/Tnb.BasicData/BasEbomService.cs index 46e63b58..363c5878 100644 --- a/BasicData/Tnb.BasicData/BasEbomService.cs +++ b/BasicData/Tnb.BasicData/BasEbomService.cs @@ -48,8 +48,8 @@ namespace Tnb.BasicData public async Task GetList(VisualDevModelListQueryInput input) { var db = _repository.AsSugarClient(); - Dictionary queryJson = string.IsNullOrEmpty(input.queryJson) ? null : input.queryJson.ToObject>(); - string materialInfo = queryJson?["query_info"]?.ToString(); + Dictionary? queryJson = (input==null || string.IsNullOrEmpty(input.queryJson)) ? null : input.queryJson.ToObject>(); + string materialInfo = queryJson?["query_info"]?.ToString() ?? ""; var list = await db.Queryable((a, b, c) => new object[] { JoinType.Left, a.material_id == b.id, @@ -67,7 +67,7 @@ namespace Tnb.BasicData route_id = c.name, route_id_id = c.id, - }).ToPagedListAsync(input.currentPage, input.pageSize); + }).ToPagedListAsync((input?.currentPage ?? 1), (input?.pageSize ?? 50)); return PageResult.SqlSugarPageResult(list); } @@ -75,7 +75,6 @@ namespace Tnb.BasicData /// /// 获取物料清单树. /// - /// 获取物料清单树. /// [HttpPost] public async Task GetTree(EbomTreeQueryInput queryInput) @@ -115,7 +114,7 @@ namespace Tnb.BasicData hasChildren = SqlFunc.Subqueryable().Where(x=>x.material_id==a.material_id).Any(), }).Mapper(it => { - it.material_id_unit_id = dic[it.material_id_unit_id].ToString(); + it.material_id_unit_id = !string.IsNullOrEmpty(it.material_id_unit_id) ? dic[it.material_id_unit_id].ToString() : ""; }).ToListAsync(); return data; } @@ -145,7 +144,7 @@ namespace Tnb.BasicData hasChildren = SqlFunc.Subqueryable().Where(x=>x.material_id==a.material_id).Any(), }).Mapper(it => { - it.material_id_unit_id = dic[it.material_id_unit_id].ToString(); + it.material_id_unit_id = !string.IsNullOrEmpty(it.material_id_unit_id) ? dic[it.material_id_unit_id].ToString() : ""; }).ToListAsync(); return data; } @@ -182,9 +181,9 @@ namespace Tnb.BasicData }).FirstAsync(); return new Dictionary() { - ["version"] = ebom?.version, - ["routeName"] = ebom?.name, - ["routeId"] = ebom?.id + ["version"] = ebom?.version ?? "", + ["routeName"] = ebom?.name ?? "", + ["routeId"] = ebom?.id ?? "" , }; } diff --git a/BasicData/Tnb.BasicData/BasMaterialService.cs b/BasicData/Tnb.BasicData/BasMaterialService.cs index 831b10d5..16716cc5 100644 --- a/BasicData/Tnb.BasicData/BasMaterialService.cs +++ b/BasicData/Tnb.BasicData/BasMaterialService.cs @@ -88,7 +88,8 @@ namespace Tnb.BasicData { List ids = await GetAllChildrenMaterialId(queryInput.ebom_id,0); BasEbomH ebom = await db.Queryable().Where(x => x.id == queryInput.ebom_id).SingleAsync(); - ids.Add(ebom.material_id); + if(ebom!=null && !string.IsNullOrEmpty(ebom.material_id)) + ids.Add(ebom.material_id); var result = await db.Queryable() .LeftJoin((a, b) => b.EnCode == DictConst.MeasurementUnit && b.DeleteMark == null) .LeftJoin((a, b, c) => c.DictionaryTypeId == b.Id && a.unit_id == c.EnCode) @@ -144,7 +145,7 @@ namespace Tnb.BasicData { //获取最新创建的物料清单 var ebom = await _repository.AsSugarClient().Queryable().Where(x=>x.material_id==id).OrderByDescending(x=>x.create_time).FirstAsync(); - ids.AddRange(await GetAllChildrenMaterialId(ebom?.id,index)); + ids.AddRange(await GetAllChildrenMaterialId(ebom?.id ?? "",index)); } ids.AddRange(list); } diff --git a/BasicData/Tnb.BasicData/BasMbomService.cs b/BasicData/Tnb.BasicData/BasMbomService.cs index e16924c5..313b0211 100644 --- a/BasicData/Tnb.BasicData/BasMbomService.cs +++ b/BasicData/Tnb.BasicData/BasMbomService.cs @@ -57,8 +57,8 @@ namespace Tnb.BasicData public async Task GetList(VisualDevModelListQueryInput input) { var db = _repository.AsSugarClient(); - Dictionary queryJson = string.IsNullOrEmpty(input.queryJson) ? null : input.queryJson.ToObject>(); - string materialInfo = queryJson?["query_info"]?.ToString(); + Dictionary? queryJson = string.IsNullOrEmpty(input.queryJson) ? null : input.queryJson.ToObject>(); + string materialInfo = queryJson?["query_info"]?.ToString() ?? ""; var list = await db.Queryable((a, b, c, d) => new object[] { JoinType.Left, a.material_id == b.id, @@ -75,8 +75,8 @@ 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"), + start_time = a.start_time==null ? "" : a.start_time.Value.ToString("yyyy-MM-dd"), + end_time = a.end_time==null ? "" : a.end_time.Value.ToString("yyyy-MM-dd"), is_first = SqlFunc.IIF(a.is_first == 0, "否", "是"), }).ToPagedListAsync(input.currentPage, input.pageSize); @@ -278,55 +278,58 @@ namespace Tnb.BasicData List inputs = new List(); List outputs = new List(); - foreach (var process in mbomSaveDataInput.processes) + if (mbomSaveDataInput != null && mbomSaveDataInput.processes != null) { - string mbomProcessId = SnowflakeIdHelper.NextId(); - processes.Add(new BasMbomProcess() + foreach (var process in mbomSaveDataInput.processes) { - 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, - production_method = process.production_method, - - }); - - if (process.inputs != null) - { - foreach (var input in process.inputs) + string mbomProcessId = SnowflakeIdHelper.NextId(); + processes.Add(new BasMbomProcess() { - string inputId = SnowflakeIdHelper.NextId(); - inputs.Add(new BasMbomInput() + id = mbomProcessId, + org_id = orgId, + mbom_id = mbomId, + process_id = process?.process_id ?? "", + preparation_time = process?.preparation_time ?? 0, + station = process?.station ?? "", + byproduct_status = process.byproduct_status, + production_method = process.production_method, + + }); + + if (process.inputs != null) + { + 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, + }); + } } - } - if (process.outputs != null) - { - 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, + }); + } } } } @@ -356,84 +359,93 @@ namespace Tnb.BasicData } string orgId = _userManager.GetUserInfo().Result.organizeId; - await _repository.UpdateAsync(x => new BasMbom() + if (mbomSaveDataInput != null) { - // 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, + 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); + }, x => x.id == mbomSaveDataInput.id); + } List processes = new List(); List inputs = new List(); List outputs = new List(); - foreach (var process in mbomSaveDataInput.processes) + if (mbomSaveDataInput != null && mbomSaveDataInput.processes != null) { - string mbomProcessId = SnowflakeIdHelper.NextId(); - processes.Add(new BasMbomProcess() + foreach (var process in mbomSaveDataInput.processes) { - 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, - production_method = process.production_method, - - }); - - if (process.inputs != null) - { - foreach (var input in process.inputs) + string mbomProcessId = SnowflakeIdHelper.NextId(); + processes.Add(new BasMbomProcess() { - 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, - }); - } - } + id = mbomProcessId, + org_id = orgId ?? "", + mbom_id = mbomSaveDataInput?.id ?? "", + process_id = process?.process_id ?? "", + preparation_time = process?.preparation_time ?? 0, + station = process.station, + byproduct_status = process.byproduct_status, + production_method = process.production_method, - if (process.outputs != null) - { - foreach (var output in process.outputs) + }); + + if (process.inputs != null) { - string outputId = SnowflakeIdHelper.NextId(); - outputs.Add(new BasMbomOutput() + foreach (var input in process.inputs) { - 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, - }); + 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, + }); + } } - } + if (process.outputs != null) + { + 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().Where(x => x.mbom_id == mbomSaveDataInput.id).ExecuteCommandAsync(); - await _repository.AsSugarClient().Deleteable().Where(x => x.mbom_id == mbomSaveDataInput.id).ExecuteCommandAsync(); - await _repository.AsSugarClient().Deleteable().Where(x => x.mbom_id == mbomSaveDataInput.id).ExecuteCommandAsync(); + if (mbomSaveDataInput != null && !string.IsNullOrEmpty(mbomSaveDataInput.id)) + { + await _repository.AsSugarClient().Deleteable().Where(x => x.mbom_id == mbomSaveDataInput.id).ExecuteCommandAsync(); + await _repository.AsSugarClient().Deleteable().Where(x => x.mbom_id == mbomSaveDataInput.id).ExecuteCommandAsync(); + await _repository.AsSugarClient().Deleteable().Where(x => x.mbom_id == mbomSaveDataInput.id).ExecuteCommandAsync(); + } if (processes.Count > 0) { await _repository.AsSugarClient().Insertable(processes).ExecuteCommandAsync(); diff --git a/BasicData/Tnb.BasicData/BasProcessService.cs b/BasicData/Tnb.BasicData/BasProcessService.cs index 8639a1b8..df785b20 100644 --- a/BasicData/Tnb.BasicData/BasProcessService.cs +++ b/BasicData/Tnb.BasicData/BasProcessService.cs @@ -108,8 +108,6 @@ namespace Tnb.BasicData /// /// 保存工序工位关联表 /// - /// process_id 工序id - /// stationIds 工位id集合 [HttpPost] public async Task Create(VisualDevModelDataCrInput visualDevModelDataCrInput) { @@ -118,7 +116,7 @@ namespace Tnb.BasicData VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModelId, true); await _runService.Create(templateEntity, visualDevModelDataCrInput); - string processId = visualDevModelDataCrInput.data["ReturnIdentity"].ToString(); + string processId = visualDevModelDataCrInput.data["ReturnIdentity"].ToString() ?? ""; List list = new List(); foreach (var item in (JArray)visualDevModelDataCrInput.data["station"]) diff --git a/BasicData/Tnb.BasicData/BasRouteService.cs b/BasicData/Tnb.BasicData/BasRouteService.cs index ca2d37fc..741f9f54 100644 --- a/BasicData/Tnb.BasicData/BasRouteService.cs +++ b/BasicData/Tnb.BasicData/BasRouteService.cs @@ -83,7 +83,6 @@ namespace Tnb.BasicData /// /// 获取有效的已发布的工艺路线 /// - /// [HttpPost] public async Task GetValidRouteList([FromBody]VisualDevDataFieldDataListInput pageInput) { @@ -99,8 +98,8 @@ namespace Tnb.BasicData id = x.id, code = x.code, name = x.name, - start_time = x.start_time.Value.ToString("yyyy-MM-dd"), - end_time = x.end_time.Value.ToString("yyyy-MM-dd"), + start_time = x.start_time==null ? "" : x.start_time.Value.ToString("yyyy-MM-dd"), + end_time = x.end_time==null ? "" : x.end_time.Value.ToString("yyyy-MM-dd"), }).ToPagedListAsync(pageInput.currentPage, pageInput.pageSize); return PageResult.SqlSugarPageResult(result); } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipDaqQueryOutput.cs b/EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipDaqQueryOutput.cs index 2f30d374..a70f922b 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipDaqQueryOutput.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipDaqQueryOutput.cs @@ -2,15 +2,15 @@ namespace Tnb.EquipMgr.Entities.Dto { public class EquipDaqQueryOutput { - public string id { get; set; } - public string data_source { get; set; } + public string? id { get; set; } + public string? data_source { get; set; } public string create_id { get; set; } - public string create_time { get; set; } - public string data_type { get; set; } - public string enabled { get; set; } - public string equip_id { get; set; } - public string label_name { get; set; } - public string label_point { get; set; } - public string remark { get; set; } + public string? create_time { get; set; } + public string? data_type { get; set; } + public string? enabled { get; set; } + public string? equip_id { get; set; } + public string? label_name { get; set; } + public string? label_point { get; set; } + public string? remark { get; set; } } } \ No newline at end of file diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipFileQueryOutput.cs b/EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipFileQueryOutput.cs index 2b280b55..894388aa 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipFileQueryOutput.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipFileQueryOutput.cs @@ -2,13 +2,13 @@ namespace Tnb.EquipMgr.Entities.Dto { public class EquipFileQueryOutput { - public string id { get; set; } - public string attachment { get; set; } - public string create_id { get; set; } - public string create_id_id { get; set; } - public string create_time { get; set; } - public string equip_id { get; set; } - public string equip_id_id { get; set; } - public string file_name { get; set; } + public string? id { get; set; } + public string? attachment { get; set; } + public string? create_id { get; set; } + public string? create_id_id { get; set; } + public string? create_time { get; set; } + public string? equip_id { get; set; } + public string? equip_id_id { get; set; } + public string? file_name { get; set; } } } \ No newline at end of file diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipMaintainRecordQueryOutput.cs b/EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipMaintainRecordQueryOutput.cs index a8978a55..12b4ded0 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipMaintainRecordQueryOutput.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipMaintainRecordQueryOutput.cs @@ -2,20 +2,20 @@ namespace Tnb.EquipMgr.Entities.Dto { public class EquipMaintainRecordQueryOutput { - public string id { get; set; } - public string attachment { get; set; } - public string create_time { get; set; } - public string equip_id { get; set; } - public string equip_id_id { get; set; } - public string execute_time { get; set; } - public string execute_user_id { get; set; } - public string repeat_remark { get; set; } - public string repeat_result { get; set; } - public string repeat_time { get; set; } - public string repeat_user_id { get; set; } - public string result { get; set; } - public string result_remark { get; set; } - public string maintain_tem_equip_id { get; set; } - public string status { get; set; } + public string? id { get; set; } + public string? attachment { get; set; } + public string? create_time { get; set; } + public string? equip_id { get; set; } + public string? equip_id_id { get; set; } + public string? execute_time { get; set; } + public string? execute_user_id { get; set; } + public string? repeat_remark { get; set; } + public string? repeat_result { get; set; } + public string? repeat_time { get; set; } + public string? repeat_user_id { get; set; } + public string? result { get; set; } + public string? result_remark { get; set; } + public string? maintain_tem_equip_id { get; set; } + public string? status { get; set; } } } \ No newline at end of file diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipQueryInput.cs b/EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipQueryInput.cs index 80af62d9..c067c21d 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipQueryInput.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipQueryInput.cs @@ -2,7 +2,7 @@ namespace Tnb.EquipMgr.Entities.Dto { public class EquipQueryInput { - public string equip_id { get; set; } + public string equip_id { get; set; } = string.Empty; /// /// 当前页码:pageIndex. @@ -14,6 +14,6 @@ namespace Tnb.EquipMgr.Entities.Dto /// public virtual int pageSize { get; set; } = 50; - public string queryJson { get; set; } + public string? queryJson { get; set; } } } \ No newline at end of file diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipRepairRecordQueryOutput.cs b/EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipRepairRecordQueryOutput.cs index ba539654..fbe1a180 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipRepairRecordQueryOutput.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipRepairRecordQueryOutput.cs @@ -2,15 +2,15 @@ namespace Tnb.EquipMgr.Entities.Dto { public class EquipRepairRecordQueryOutput { - public string id { get; set; } - public string code { get; set; } - public string name { get; set; } - public string equip_id { get; set; } - public string apply_user_id { get; set; } - public string is_ugent { get; set; } - public string description { get; set; } - public string complete_time { get; set; } - public string repairer_id { get; set; } - public string repair_description { get; set; } + public string? id { get; set; } + public string? code { get; set; } + public string? name { get; set; } + public string? equip_id { get; set; } + public string? apply_user_id { get; set; } + public string? is_ugent { get; set; } + public string? description { get; set; } + public string? complete_time { get; set; } + public string? repairer_id { get; set; } + public string? repair_description { get; set; } } } \ No newline at end of file diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipSparePartsInput.cs b/EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipSparePartsInput.cs index 69b222b3..8d7ae4a6 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipSparePartsInput.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipSparePartsInput.cs @@ -2,8 +2,8 @@ namespace Tnb.EquipMgr.Entities.Dto { public class EquipSparePartsInput { - public string equip_id { get; set; } + public string equip_id { get; set; } = string.Empty; - public List spare_parts_ids { get; set; } + public List? spare_parts_ids { get; set; } } } \ No newline at end of file diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipSparePartsQueryOutput.cs b/EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipSparePartsQueryOutput.cs index 2e35315d..460cf8e4 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipSparePartsQueryOutput.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipSparePartsQueryOutput.cs @@ -2,12 +2,12 @@ namespace Tnb.EquipMgr.Entities.Dto { public class EquipSparePartsQueryOutput { - public string id { get; set; } - public string type_code { get; set; } - public string type_name { get; set; } - public string code { get; set; } - public string name { get; set; } - public string specification { get; set; } + public string? id { get; set; } + public string? type_code { get; set; } + public string? type_name { get; set; } + public string? code { get; set; } + public string? name { get; set; } + public string? specification { get; set; } } } \ No newline at end of file diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipSpotInsRecordQueryOutput.cs b/EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipSpotInsRecordQueryOutput.cs index b0162c36..ba40ffb9 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipSpotInsRecordQueryOutput.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipSpotInsRecordQueryOutput.cs @@ -2,19 +2,19 @@ namespace Tnb.EquipMgr.Entities.Dto { public class EquipSpotInsRecordQueryOutput { - public string id { get; set; } - public string attachment { get; set; } - public string create_time { get; set; } - public string equip_id { get; set; } - public string repeat_remark { get; set; } - public string repeat_result { get; set; } - public string repeat_time { get; set; } - public string repeat_user_id { get; set; } - public string result { get; set; } - public string result_remark { get; set; } - public string spot_ins_tem_equip_id { get; set; } - public string spot_record_date_time { get; set; } - public string spot_record_user_id { get; set; } - public string status { get; set; } + public string? id { get; set; } + public string? attachment { get; set; } + public string? create_time { get; set; } + public string? equip_id { get; set; } + public string? repeat_remark { get; set; } + public string? repeat_result { get; set; } + public string? repeat_time { get; set; } + public string? repeat_user_id { get; set; } + public string? result { get; set; } + public string? result_remark { get; set; } + public string? spot_ins_tem_equip_id { get; set; } + public string? spot_record_date_time { get; set; } + public string? spot_record_user_id { get; set; } + public string? status { get; set; } } } \ No newline at end of file diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipTechnologyParameterQueryOutput.cs b/EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipTechnologyParameterQueryOutput.cs index d1e91278..4a1ee583 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipTechnologyParameterQueryOutput.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipTechnologyParameterQueryOutput.cs @@ -2,9 +2,9 @@ namespace Tnb.EquipMgr.Entities.Dto { public class EquipTechnologyParameterQueryOutput { - public string id { get; set; } - public string name { get; set; } - public string definition { get; set; } - public string remark { get; set; } + public string? id { get; set; } + public string? name { get; set; } + public string? definition { get; set; } + public string? remark { get; set; } } } \ No newline at end of file diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Dto/MaintainRecordRepeatInput.cs b/EquipMgr/Tnb.EquipMgr.Entities/Dto/MaintainRecordRepeatInput.cs index 83b7df9a..a923ef71 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Dto/MaintainRecordRepeatInput.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Dto/MaintainRecordRepeatInput.cs @@ -2,12 +2,12 @@ namespace Tnb.EquipMgr.Entities.Dto { public class MaintainRecordRepeatInput { - public string id { get; set; } + public string id { get; set; } = string.Empty; + + public string repeat_result { get; set; } = string.Empty; - public string repeat_result { get; set; } + public string? repeat_remark { get; set; } - public string repeat_remark { get; set; } - - public List> details { get; set; } + public List>? details { get; set; } } } \ No newline at end of file diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Dto/MaintainRecordRepeatOutput.cs b/EquipMgr/Tnb.EquipMgr.Entities/Dto/MaintainRecordRepeatOutput.cs index d262d480..c8a415c0 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Dto/MaintainRecordRepeatOutput.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Dto/MaintainRecordRepeatOutput.cs @@ -2,8 +2,8 @@ namespace Tnb.EquipMgr.Entities.Dto { public class MaintainRecordRepeatOutput { - public EqpMaintainRecordH model { get; set; } + public EqpMaintainRecordH? model { get; set; } - public List details { get; set; } + public List? details { get; set; } } } \ No newline at end of file diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Dto/RepairApplyDetailOutput.cs b/EquipMgr/Tnb.EquipMgr.Entities/Dto/RepairApplyDetailOutput.cs index 34c6c8e0..5e3e9aa5 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Dto/RepairApplyDetailOutput.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Dto/RepairApplyDetailOutput.cs @@ -2,7 +2,7 @@ namespace Tnb.EquipMgr.Entities.Dto { public class RepairApplyDetailOutput { - public EqpRepairApply eqpRepairApply { get; set; } - public EqpRepairOutApply eqpRepairOutApply { get; set; } + public EqpRepairApply? eqpRepairApply { get; set; } + public EqpRepairOutApply? eqpRepairOutApply { get; set; } } } \ No newline at end of file diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Dto/RepairApplyOutRegisterInput.cs b/EquipMgr/Tnb.EquipMgr.Entities/Dto/RepairApplyOutRegisterInput.cs index 22d61759..628e9f43 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Dto/RepairApplyOutRegisterInput.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Dto/RepairApplyOutRegisterInput.cs @@ -2,7 +2,7 @@ namespace Tnb.EquipMgr.Entities.Dto { public class RepairApplyOutRegisterInput { - public string id { get; set; } + public string? id { get; set; } /// /// 实际维修供应商id @@ -37,6 +37,6 @@ namespace Tnb.EquipMgr.Entities.Dto /// /// 报修申请id /// - public string repair_apply_id { get; set; } + public string? repair_apply_id { get; set; } } } \ No newline at end of file diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Dto/RepairApplyRegisterInput.cs b/EquipMgr/Tnb.EquipMgr.Entities/Dto/RepairApplyRegisterInput.cs index d7790a52..2ade3738 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Dto/RepairApplyRegisterInput.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Dto/RepairApplyRegisterInput.cs @@ -2,12 +2,12 @@ namespace Tnb.EquipMgr.Entities.Dto { public class RepairApplyRegisterInput { - public string id { get; set; } + public string? id { get; set; } /// /// 故障ID /// - public string fault_id { get; set; } + public string? fault_id { get; set; } /// /// 是否完成 diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Dto/RepairDelayInput.cs b/EquipMgr/Tnb.EquipMgr.Entities/Dto/RepairDelayInput.cs index 7c68740e..439a2bef 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Dto/RepairDelayInput.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Dto/RepairDelayInput.cs @@ -2,16 +2,16 @@ namespace Tnb.EquipMgr.Entities.Dto { public class RepairDelayInput { - public string repair_apply_id { get; set; } + public string? repair_apply_id { get; set; } - public string equip_id { get; set; } + public string? equip_id { get; set; } - public string repair_request_sender_id { get; set; } + public string? repair_request_sender_id { get; set; } - public string repair_sender_id { get; set; } + public string? repair_sender_id { get; set; } public DateTime expected_time { get; set; } - public string delay_reason { get; set; } + public string? delay_reason { get; set; } } } \ No newline at end of file diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Dto/RepairOutApplyInput.cs b/EquipMgr/Tnb.EquipMgr.Entities/Dto/RepairOutApplyInput.cs index 9a7242a2..ae5c6e37 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Dto/RepairOutApplyInput.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Dto/RepairOutApplyInput.cs @@ -2,13 +2,13 @@ namespace Tnb.EquipMgr.Entities.Dto { public class RepairOutApplyInput { - public string id { get; set; } - public string repair_apply_id { get; set; } - public string equip_id { get; set; } + public string? id { get; set; } + public string? repair_apply_id { get; set; } + public string? equip_id { get; set; } public string? supplier_id { get; set; } public decimal? estimated_cost { get; set; } public string? construction_period_requirement { get; set; } - public string out_apply_reason { get; set; } + public string? out_apply_reason { get; set; } public string? remark { get; set; } } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Dto/SpotInsRecordExecuteInput.cs b/EquipMgr/Tnb.EquipMgr.Entities/Dto/SpotInsRecordExecuteInput.cs index 469c7b10..6823a5dd 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Dto/SpotInsRecordExecuteInput.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Dto/SpotInsRecordExecuteInput.cs @@ -2,14 +2,14 @@ namespace Tnb.EquipMgr.Entities.Dto { public class SpotInsRecordExecuteInput { - public string id { get; set; } + public string? id { get; set; } - public string attachment { get; set; } + public string? attachment { get; set; } - public string result { get; set; } + public string? result { get; set; } - public string result_remark { get; set; } + public string? result_remark { get; set; } - public List> details { get; set; } + public List>? details { get; set; } } } \ No newline at end of file diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Dto/SpotInsRecordRepeatInput.cs b/EquipMgr/Tnb.EquipMgr.Entities/Dto/SpotInsRecordRepeatInput.cs index ce77eef0..2b45861b 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Dto/SpotInsRecordRepeatInput.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Dto/SpotInsRecordRepeatInput.cs @@ -2,10 +2,10 @@ namespace Tnb.EquipMgr.Entities.Dto { public class SpotInsRecordRepeatInput { - public string id { get; set; } + public string? id { get; set; } - public string repeat_result { get; set; } + public string? repeat_result { get; set; } - public string repeat_remark { get; set; } + public string? repeat_remark { get; set; } } } \ No newline at end of file diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Dto/SpotInsRecordRepeatOutput.cs b/EquipMgr/Tnb.EquipMgr.Entities/Dto/SpotInsRecordRepeatOutput.cs index 58ed6d64..37db7bc2 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Dto/SpotInsRecordRepeatOutput.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Dto/SpotInsRecordRepeatOutput.cs @@ -2,8 +2,8 @@ namespace Tnb.EquipMgr.Entities.Dto { public class SpotInsRecordRepeatOutput { - public EqpSpotInsRecordH model { get; set; } + public EqpSpotInsRecordH? model { get; set; } - public List details { get; set; } + public List? details { get; set; } } } \ No newline at end of file diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Dto/SpotInsTemPublishInput.cs b/EquipMgr/Tnb.EquipMgr.Entities/Dto/SpotInsTemPublishInput.cs index bc1bfaec..3e27dd1b 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Dto/SpotInsTemPublishInput.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Dto/SpotInsTemPublishInput.cs @@ -2,8 +2,8 @@ namespace Tnb.EquipMgr.Entities.Dto { public class SpotInsTemPublishInput { - public string id { get; set; } + public string? id { get; set; } - public string[] equipIds { get; set; } + public string[]? equipIds { get; set; } } } \ No newline at end of file diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Dto/SubEquipQueryOutput.cs b/EquipMgr/Tnb.EquipMgr.Entities/Dto/SubEquipQueryOutput.cs index 32200413..5cfa569d 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Dto/SubEquipQueryOutput.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Dto/SubEquipQueryOutput.cs @@ -2,17 +2,17 @@ namespace Tnb.EquipMgr.Entities.Dto { public class SubEquipQueryOutput { - public string code { get; set; } - public string create_id { get; set; } - public string create_id_id { get; set; } - public string create_time { get; set; } - public string equip_id { get; set; } - public string equip_id_id { get; set; } - public string id { get; set; } - public string modify_id { get; set; } - public string modify_time { get; set; } - public string name { get; set; } - public string org_id { get; set; } - public string specification { get; set; } + public string? code { get; set; } + public string? create_id { get; set; } + public string? create_id_id { get; set; } + public string? create_time { get; set; } + public string? equip_id { get; set; } + public string? equip_id_id { get; set; } + public string? id { get; set; } + public string? modify_id { get; set; } + public string? modify_time { get; set; } + public string? name { get; set; } + public string? org_id { get; set; } + public string? specification { get; set; } } } \ No newline at end of file diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipSpareParts.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipSpareParts.cs index 64136645..bad793fd 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipSpareParts.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipSpareParts.cs @@ -27,7 +27,7 @@ public partial class EqpEquipSpareParts : BaseEntity /// /// 创建用户 /// - public string? create_id { get; set; } + public string create_id { get; set; } = string.Empty; /// /// 创建时间 diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipment.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipment.cs index c071c729..335cda29 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipment.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipment.cs @@ -52,7 +52,7 @@ public partial class EqpEquipment : BaseEntity /// /// 安装日期 /// - public string? install_date { get; set; } + public string install_date { get; set; } = string.Empty; /// /// 使用日期 @@ -82,7 +82,7 @@ public partial class EqpEquipment : BaseEntity /// /// 备注 /// - public string? remark { get; set; } + public string remark { get; set; } = string.Empty; /// /// 时间戳 @@ -186,6 +186,6 @@ public partial class EqpEquipment : BaseEntity /// /// 工位编码 /// - public string station_code { get; set; } + public string? station_code { get; set; } } diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMaintainItem.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMaintainItem.cs index 754685cf..246a1ab8 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMaintainItem.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMaintainItem.cs @@ -47,7 +47,7 @@ public partial class EqpMaintainItem : BaseEntity /// /// 保养类型 /// - public string maintain_type { get; set; } + public string? maintain_type { get; set; } /// /// 保养内容 diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMaintainTemEquipH.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMaintainTemEquipH.cs index 27755b9c..3724956c 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMaintainTemEquipH.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMaintainTemEquipH.cs @@ -102,12 +102,12 @@ public partial class EqpMaintainTemEquipH : BaseEntity /// /// 是否启用 /// - public string is_start { get; set; } + public string? is_start { get; set; } /// /// 是否复核 /// - public string is_repeat { get; set; } + public string? is_repeat { get; set; } /// /// 复核岗位id diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMaintainTemH.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMaintainTemH.cs index a666bf62..971809e6 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMaintainTemH.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMaintainTemH.cs @@ -57,7 +57,7 @@ public partial class EqpMaintainTemH : BaseEntity /// /// 周期方式 1 单次 2 循环 /// - public string plan_cycle_unit { get; set; } + public string? plan_cycle_unit { get; set; } /// /// 计划执行通知提前量 diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairApply.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairApply.cs index ca95fcaa..c8a0cd84 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairApply.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairApply.cs @@ -47,7 +47,7 @@ public partial class EqpRepairApply : BaseEntity /// /// 设备ID /// - public string equip_id { get; set; } + public string? equip_id { get; set; } /// /// 申请用户ID diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairDelay.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairDelay.cs index dee65e54..e62cce1a 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairDelay.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairDelay.cs @@ -64,7 +64,7 @@ namespace Tnb.EquipMgr.Entities /// Default:NULL::character varying /// Nullable:True /// - public string delay_reason { get; set; } + public string? delay_reason { get; set; } /// /// Desc:创建用户 diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpEquipCheckRecord.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpEquipCheckRecord.cs index e568daed..a72ad608 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpEquipCheckRecord.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpEquipCheckRecord.cs @@ -97,7 +97,7 @@ public partial class EqpSpEquipCheckRecord : BaseEntity /// /// 状态 0 待检验 1 已检验 /// - public string status { get; set; } + public string? status { get; set; } /// /// 证书名称 diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMoldsMaterial.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMoldsMaterial.cs index 7a5b6acb..62ddeac7 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMoldsMaterial.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMoldsMaterial.cs @@ -52,6 +52,6 @@ public partial class ToolMoldsMaterial : BaseEntity /// /// 物料同组标识 /// - public string? material_group { get; set; } + public string material_group { get; set; } = string.Empty; } diff --git a/EquipMgr/Tnb.EquipMgr/EqpDaqService.cs b/EquipMgr/Tnb.EquipMgr/EqpDaqService.cs index 044bec62..0218b0e5 100644 --- a/EquipMgr/Tnb.EquipMgr/EqpDaqService.cs +++ b/EquipMgr/Tnb.EquipMgr/EqpDaqService.cs @@ -32,30 +32,30 @@ namespace Tnb.EquipMgr public async Task GetEquipDaqList(EquipQueryInput input) { var db = _repository.AsSugarClient(); - Dictionary queryJson = new Dictionary(); - if (!string.IsNullOrEmpty(input.queryJson)) + Dictionary? queryJson = new Dictionary(); + if (input!=null && !string.IsNullOrEmpty(input.queryJson)) { queryJson = JsonConvert.DeserializeObject>(input.queryJson); } var result = await db.Queryable() .LeftJoin((a,b)=>a.create_id==b.Id) - .Where(a=>a.equip_id==input.equip_id) - .WhereIF(queryJson.ContainsKey("data_source"),a=>a.data_source==queryJson["data_source"]) - .WhereIF(queryJson.ContainsKey("label_name"),a=>a.label_name.Contains(queryJson["label_name"])) - .WhereIF(queryJson.ContainsKey("label_point"),a=>a.label_point.Contains(queryJson["label_point"])) + .WhereIF(input!=null,a=>a.equip_id==input.equip_id) + .WhereIF(queryJson!=null && queryJson.ContainsKey("data_source"),a=>a.data_source==queryJson["data_source"]) + .WhereIF(queryJson!=null && queryJson.ContainsKey("label_name"),a=>a.label_name.Contains(queryJson["label_name"])) + .WhereIF(queryJson!=null && queryJson.ContainsKey("label_point"),a=>a.label_point.Contains(queryJson["label_point"])) .Select((a,b) => new EquipDaqQueryOutput { id = a.id, data_source = a.data_source, create_id = b.RealName, - create_time = a.create_time.Value.ToString("yyyy-MM-dd HH:mm"), + create_time = a.create_time==null ? null : a.create_time.Value.ToString("yyyy-MM-dd HH:mm"), data_type = a.data_type, enabled = a.enabled==1 ? "是" : "否", equip_id = a.equip_id, label_name = a.label_name, label_point = a.label_point, remark = a.remark - }).ToPagedListAsync(input.currentPage, input.pageSize); + }).ToPagedListAsync((input?.currentPage??1), (input?.pageSize??50)); return PageResult.SqlSugarPageResult(result); } diff --git a/EquipMgr/Tnb.EquipMgr/EqpEquipFileService.cs b/EquipMgr/Tnb.EquipMgr/EqpEquipFileService.cs index adc74cac..6a61b196 100644 --- a/EquipMgr/Tnb.EquipMgr/EqpEquipFileService.cs +++ b/EquipMgr/Tnb.EquipMgr/EqpEquipFileService.cs @@ -79,7 +79,7 @@ namespace Tnb.EquipMgr public async Task GetEquipFileList(EquipQueryInput input) { var db = _repository.AsSugarClient(); - Dictionary queryJson = new Dictionary(); + Dictionary? queryJson = new Dictionary(); if (!string.IsNullOrEmpty(input.queryJson)) { queryJson = JsonConvert.DeserializeObject>(input.queryJson); @@ -89,14 +89,14 @@ namespace Tnb.EquipMgr .LeftJoin((a, b,c) => a.modify_id == c.Id) .LeftJoin((a, b,c,d) => a.equip_id == d.id) .Where((a,b,c,d)=>a.equip_id==input.equip_id) - .WhereIF(queryJson.ContainsKey("file_name"),(a,b,c,d)=>a.file_name.Contains(queryJson["file_name"])) + .WhereIF(queryJson!=null && queryJson.ContainsKey("file_name"),(a,b,c,d)=>a.file_name.Contains(queryJson["file_name"])) .Select((a, b, c,d) => new EquipFileQueryOutput { id = a.id, attachment = a.attachment, create_id = b.RealName, create_id_id = a.create_id, - create_time = a.create_time.Value.ToString("yyyy-MM-dd"), + create_time = a.create_time==null ? null : a.create_time.Value.ToString("yyyy-MM-dd"), equip_id=d.name, equip_id_id= a.equip_id, file_name=a.file_name, diff --git a/EquipMgr/Tnb.EquipMgr/EqpEquipSparePartsService.cs b/EquipMgr/Tnb.EquipMgr/EqpEquipSparePartsService.cs index 59dc823d..83d1341c 100644 --- a/EquipMgr/Tnb.EquipMgr/EqpEquipSparePartsService.cs +++ b/EquipMgr/Tnb.EquipMgr/EqpEquipSparePartsService.cs @@ -14,6 +14,7 @@ using Tnb.EquipMgr.Interfaces; namespace Tnb.EquipMgr { + /// /// 设备备品备件 /// [ApiDescriptionSettings(Tag = ModuleConsts.Tag, Area = ModuleConsts.Area, Order = 700)] @@ -34,20 +35,23 @@ namespace Tnb.EquipMgr { List oldList = await _repository.GetListAsync(x => x.equip_id == input.equip_id); List list = new List(); - string orgId = _userManager.GetUserInfo().Result.organizeId; - foreach (var spare_parts_id in input.spare_parts_ids) + string orgId = _userManager?.GetUserInfo().Result.organizeId ?? ""; + if (input != null && input.spare_parts_ids != null) { - if (oldList.Any(x => x.spare_parts_id == spare_parts_id)) - continue; - list.Add(new EqpEquipSpareParts() + foreach (var spare_parts_id in input.spare_parts_ids) { - id = SnowflakeIdHelper.NextId(), - equip_id = input.equip_id, - spare_parts_id = spare_parts_id, - create_id = _userManager.UserId, - create_time = DateTime.Now, - org_id = orgId, - }); + if (oldList.Any(x => x.spare_parts_id == spare_parts_id)) + continue; + list.Add(new EqpEquipSpareParts() + { + id = SnowflakeIdHelper.NextId(), + equip_id = input.equip_id, + spare_parts_id = spare_parts_id, + create_id = _userManager.UserId, + create_time = DateTime.Now, + org_id = orgId, + }); + } } await _repository.InsertRangeAsync(list); @@ -57,7 +61,7 @@ namespace Tnb.EquipMgr public async Task GetEquipSparePartsList(EquipQueryInput input) { var db = _repository.AsSugarClient(); - Dictionary queryJson = new Dictionary(); + Dictionary? queryJson = new Dictionary(); if (!string.IsNullOrEmpty(input.queryJson)) { queryJson = JsonConvert.DeserializeObject>(input.queryJson); @@ -67,8 +71,8 @@ namespace Tnb.EquipMgr .LeftJoin((a, b, c) => c.EnCode == Tnb.BasicData.DictConst.SparePartsType && c.DeleteMark == null) .LeftJoin((a, b,c,d) => d.DictionaryTypeId == c.Id && b.type_id == d.EnCode) .Where((a,b,c,d)=>a.equip_id==input.equip_id) - .WhereIF(queryJson.ContainsKey("code"),(a,b,c,d)=>b.code.Contains(queryJson["code"])) - .WhereIF(queryJson.ContainsKey("name"),(a,b,c,d)=>b.name.Contains(queryJson["name"])) + .WhereIF(queryJson!=null && queryJson.ContainsKey("code"),(a,b,c,d)=>b.code.Contains(queryJson["code"])) + .WhereIF(queryJson!=null && queryJson.ContainsKey("name"),(a,b,c,d)=>b.name.Contains(queryJson["name"])) .Select((a, b, c,d) => new EquipSparePartsQueryOutput { id = a.id, diff --git a/EquipMgr/Tnb.EquipMgr/EqpMaintainTemService.cs b/EquipMgr/Tnb.EquipMgr/EqpMaintainTemService.cs index bc1bc84f..9fd92c46 100644 --- a/EquipMgr/Tnb.EquipMgr/EqpMaintainTemService.cs +++ b/EquipMgr/Tnb.EquipMgr/EqpMaintainTemService.cs @@ -33,7 +33,6 @@ namespace Tnb.EquipMgr /// /// 根据模板id发布到设备 /// - /// [HttpPost] public async Task Publish(SpotInsTemPublishInput input) { diff --git a/EquipMgr/Tnb.EquipMgr/EqpRepairApplyService.cs b/EquipMgr/Tnb.EquipMgr/EqpRepairApplyService.cs index 18f17524..c16efefb 100644 --- a/EquipMgr/Tnb.EquipMgr/EqpRepairApplyService.cs +++ b/EquipMgr/Tnb.EquipMgr/EqpRepairApplyService.cs @@ -137,7 +137,7 @@ namespace Tnb.EquipMgr public async Task GetRepairRecordList(EquipQueryInput input) { var db = _repository.AsSugarClient(); - Dictionary queryJson = new Dictionary(); + Dictionary? queryJson = new Dictionary(); if (!string.IsNullOrEmpty(input.queryJson)) { queryJson = JsonConvert.DeserializeObject>(input.queryJson); @@ -156,7 +156,7 @@ namespace Tnb.EquipMgr is_ugent = a.is_ugent==1 ? "是" : "否", description = a.description, repair_description = a.repair_description, - complete_time = a.complete_time.Value.ToString("yyyy-MM-dd HH:mm"), + complete_time = a.complete_time==null ? null : a.complete_time.Value.ToString("yyyy-MM-dd HH:mm"), repairer_id = c.RealName }).ToPagedListAsync(input.currentPage, input.pageSize); diff --git a/EquipMgr/Tnb.EquipMgr/EqpRepairDelayService.cs b/EquipMgr/Tnb.EquipMgr/EqpRepairDelayService.cs index c405d7d9..d83763cb 100644 --- a/EquipMgr/Tnb.EquipMgr/EqpRepairDelayService.cs +++ b/EquipMgr/Tnb.EquipMgr/EqpRepairDelayService.cs @@ -33,7 +33,6 @@ namespace Tnb.EquipMgr /// /// 维修延期 /// - /// [HttpPost] public async Task Delay(RepairDelayInput input) { @@ -43,7 +42,7 @@ namespace Tnb.EquipMgr EqpRepairDelay repairDelay = new EqpRepairDelay() { id = SnowflakeIdHelper.NextId(), - equip_id = eqpRepairApply.equip_id, + equip_id = eqpRepairApply?.equip_id ?? "", repair_apply_id = input.repair_apply_id, delay_reason = input.delay_reason, expected_time = input.expected_time, diff --git a/EquipMgr/Tnb.EquipMgr/EqpRepairOutApplyService.cs b/EquipMgr/Tnb.EquipMgr/EqpRepairOutApplyService.cs index 400d3677..320481b0 100644 --- a/EquipMgr/Tnb.EquipMgr/EqpRepairOutApplyService.cs +++ b/EquipMgr/Tnb.EquipMgr/EqpRepairOutApplyService.cs @@ -104,7 +104,7 @@ namespace Tnb.EquipMgr { if (string.IsNullOrEmpty(input.id)) { - _flowTaskService.Create(new FlowTaskSubmitModel() + await _flowTaskService.Create(new FlowTaskSubmitModel() { flowId = flowId, parentId = "0", @@ -127,26 +127,30 @@ namespace Tnb.EquipMgr else { var entity = await _repository.GetSingleAsync(x=>x.id==input.id); - _flowTaskService.Update("",new FlowTaskSubmitModel() + if (entity != null) { - flowId = flowId, - parentId = "0", - id = entity.flow_task_id, - formData = new JObject() - { - {"id",id}, - {"repair_apply_id",input.repair_apply_id}, - {"equip_id",input.equip_id}, - {"create_id",_userManager.UserId}, - {"supplier_id",input.supplier_id}, - {"estimated_cost",input.estimated_cost}, - {"construction_period_requirement",input.construction_period_requirement}, - {"out_apply_reason",input.out_apply_reason}, - {"remark",input.remark}, - {"approve_status",RepairOutApplyStatus.TOBEAPPROVE}, - } - }); + await _flowTaskService.Update("",new FlowTaskSubmitModel() + { + flowId = flowId, + parentId = "0", + id = entity?.flow_task_id??"", + formData = new JObject() + { + {"id",id}, + {"repair_apply_id",input.repair_apply_id}, + {"equip_id",input.equip_id}, + {"create_id",_userManager.UserId}, + {"supplier_id",input.supplier_id}, + {"estimated_cost",input.estimated_cost}, + {"construction_period_requirement",input.construction_period_requirement}, + {"out_apply_reason",input.out_apply_reason}, + {"remark",input.remark}, + {"approve_status",RepairOutApplyStatus.TOBEAPPROVE}, + } + + }); + } } } return result.IsSuccess ? "操作成功" : result.ErrorMessage; diff --git a/EquipMgr/Tnb.EquipMgr/EqpSpEquipCheckRecordService.cs b/EquipMgr/Tnb.EquipMgr/EqpSpEquipCheckRecordService.cs index 415dbcea..ab5eac67 100644 --- a/EquipMgr/Tnb.EquipMgr/EqpSpEquipCheckRecordService.cs +++ b/EquipMgr/Tnb.EquipMgr/EqpSpEquipCheckRecordService.cs @@ -37,19 +37,22 @@ namespace Tnb.EquipMgr throw Oops.Bah("该设备已存在检验计划"); } - if (entity.warn_unit == "1")//月 + if (entity != null) { - entity.next_check_time = entity.end_time.Value.AddMonths(-entity.warm_time.Value); - }else if (entity.warn_unit == "2")//天 - { - entity.next_check_time = entity.end_time.Value.AddDays(-entity.warm_time.Value); - } + if (entity.warn_unit == "1")//月 + { + entity.next_check_time = entity.end_time?.AddMonths(-entity.warm_time.Value); + }else if (entity.warn_unit == "2")//天 + { + entity.next_check_time = entity.end_time?.AddDays(-entity.warm_time.Value); + } - entity.id = SnowflakeIdHelper.NextId(); - entity.create_time = DateTime.Now; - entity.create_id = _userManager.UserId; - entity.org_id = _userManager.GetUserInfo().Result.organizeId; - await _repository.InsertAsync(entity); + entity.id = SnowflakeIdHelper.NextId(); + entity.create_time = DateTime.Now; + entity.create_id = _userManager.UserId; + entity.org_id = _userManager.GetUserInfo().Result.organizeId; + await _repository.InsertAsync(entity); + } } } diff --git a/EquipMgr/Tnb.EquipMgr/EqpSpotInsTemService.cs b/EquipMgr/Tnb.EquipMgr/EqpSpotInsTemService.cs index bd1bf6b0..f3036cb7 100644 --- a/EquipMgr/Tnb.EquipMgr/EqpSpotInsTemService.cs +++ b/EquipMgr/Tnb.EquipMgr/EqpSpotInsTemService.cs @@ -34,7 +34,6 @@ namespace Tnb.EquipMgr /// /// 根据模板id发布到设备 /// - /// [HttpPost] public async Task Publish(SpotInsTemPublishInput input) { @@ -86,7 +85,7 @@ namespace Tnb.EquipMgr EqpSpotInsTemEquipD eqpSpotInsTemEquipD = new EqpSpotInsTemEquipD() { id = SnowflakeIdHelper.NextId(), - spot_ins_item_id = eqpSpotInsTem.spot_ins_item_id, + spot_ins_item_id = eqpSpotInsTem?.spot_ins_item_id ?? "", spot_ins_tem_equip_id = id, }; insertEqpSpotInsTemEquipDs.Add(eqpSpotInsTemEquipD); diff --git a/EquipMgr/Tnb.EquipMgr/EqpSubEquipService.cs b/EquipMgr/Tnb.EquipMgr/EqpSubEquipService.cs index f7059e63..95e2b2c9 100644 --- a/EquipMgr/Tnb.EquipMgr/EqpSubEquipService.cs +++ b/EquipMgr/Tnb.EquipMgr/EqpSubEquipService.cs @@ -33,7 +33,7 @@ namespace Tnb.EquipMgr public async Task GetSubEquipList(EquipQueryInput input) { var db = _repository.AsSugarClient(); - Dictionary queryJson = new Dictionary(); + Dictionary? queryJson = new Dictionary(); if (!string.IsNullOrEmpty(input.queryJson)) { queryJson = JsonConvert.DeserializeObject>(input.queryJson); @@ -43,19 +43,19 @@ namespace Tnb.EquipMgr .LeftJoin((a, b,c) => a.modify_id == c.Id) .LeftJoin((a, b,c,d) => a.equip_id == d.id) .Where((a,b,c,d)=>a.equip_id==input.equip_id) - .WhereIF(queryJson.ContainsKey("code"),(a,b,c,d)=>a.code.Contains(queryJson["code"])) - .WhereIF(queryJson.ContainsKey("name"),(a,b,c,d)=>a.name.Contains(queryJson["name"])) + .WhereIF(queryJson!=null && queryJson.ContainsKey("code"),(a,b,c,d)=>a.code.Contains(queryJson["code"])) + .WhereIF(queryJson!=null && queryJson.ContainsKey("name"),(a,b,c,d)=>a.name.Contains(queryJson["name"])) .Select((a, b, c,d) => new SubEquipQueryOutput { id = a.id, create_id = b.RealName, create_id_id = a.create_id, - create_time = a.create_time.Value.ToString("yyyy-MM-dd"), + create_time = a.create_time==null ? null : a.create_time.Value.ToString("yyyy-MM-dd"), equip_id=d.name, equip_id_id= a.equip_id, code = a.code, modify_id = c.RealName, - modify_time = a.modify_time.Value.ToString("yyyy-MM-dd"), + modify_time = a.modify_time==null ? null : a.modify_time.Value.ToString("yyyy-MM-dd"), name = a.name, org_id = a.org_id, specification = a.specification, diff --git a/EquipMgr/Tnb.EquipMgr/EqpTechnologyParameterService.cs b/EquipMgr/Tnb.EquipMgr/EqpTechnologyParameterService.cs index d392a776..4ec042e2 100644 --- a/EquipMgr/Tnb.EquipMgr/EqpTechnologyParameterService.cs +++ b/EquipMgr/Tnb.EquipMgr/EqpTechnologyParameterService.cs @@ -31,21 +31,21 @@ namespace Tnb.EquipMgr public async Task GetEquipTechnologyParameterList(EquipQueryInput input) { var db = _repository.AsSugarClient(); - Dictionary queryJson = new Dictionary(); - if (!string.IsNullOrEmpty(input.queryJson)) + Dictionary? queryJson = new Dictionary(); + if (input!=null && !string.IsNullOrEmpty(input.queryJson)) { - queryJson = JsonConvert.DeserializeObject>(input.queryJson); + queryJson = JsonConvert.DeserializeObject>(input?.queryJson ?? ""); } var result = await db.Queryable() - .Where(a=>a.equip_id==input.equip_id) - .WhereIF(queryJson.ContainsKey("name"),a=>a.name.Contains(queryJson["name"])) + .WhereIF(input!=null,a=>a.equip_id==input.equip_id) + .WhereIF(queryJson!=null && queryJson.ContainsKey("name"),a=>a.name.Contains(queryJson["name"])) .Select(a => new EquipTechnologyParameterQueryOutput { id = a.id, name = a.name, definition = a.definition, remark = a.remark - }).ToPagedListAsync(input.currentPage, input.pageSize); + }).ToPagedListAsync((input?.currentPage??1), (input?.pageSize??50)); return PageResult.SqlSugarPageResult(result); } diff --git a/EquipMgr/Tnb.EquipMgr/EquMaintainRecordService.cs b/EquipMgr/Tnb.EquipMgr/EquMaintainRecordService.cs index 4beaf951..e69aad04 100644 --- a/EquipMgr/Tnb.EquipMgr/EquMaintainRecordService.cs +++ b/EquipMgr/Tnb.EquipMgr/EquMaintainRecordService.cs @@ -48,7 +48,6 @@ namespace Tnb.EquipMgr /// /// 执行设备保养计划 /// - /// /// [HttpPost] public async Task ExecuteMaintain(SpotInsRecordExecuteInput input) @@ -75,13 +74,16 @@ namespace Tnb.EquipMgr execute_user_id = _userManager.UserId }, x => x.id == input.id); - foreach (var item in input.details) + if (input != null && input.details != null) { - await _repository.AsSugarClient().Updateable() - .SetColumns(x=>x.result==item["result"]) - .SetColumnsIF(item.ContainsKey("maintain_descrip"),x=>x.maintain_descrip==item["maintain_descrip"]) - .Where(x=>x.id==item["id"]) - .ExecuteCommandAsync(); + foreach (var item in input.details) + { + await _repository.AsSugarClient().Updateable() + .SetColumns(x=>x.result==item["result"]) + .SetColumnsIF(item.ContainsKey("maintain_descrip"),x=>x.maintain_descrip==item["maintain_descrip"]) + .Where(x=>x.id==item["id"]) + .ExecuteCommandAsync(); + } } @@ -114,7 +116,6 @@ namespace Tnb.EquipMgr /// /// 复核设备保养计划 /// - /// /// [HttpPost] public async Task RepeatMaintain(MaintainRecordRepeatInput input) @@ -123,22 +124,28 @@ namespace Tnb.EquipMgr DbResult result = await db.Ado.UseTranAsync(async () => { - foreach (var item in input.details) + if (input != null && input.details != null) { - await db.Updateable() - .SetColumns(x => x.repeat_descrip == item["repeat_descrip"]) - .SetColumns(x => x.repeat_result == item["repeat_result"]) - .Where(x => x.id == item["id"]).ExecuteCommandAsync(); + foreach (var item in input.details) + { + await db.Updateable() + .SetColumns(x => x.repeat_descrip == item["repeat_descrip"]) + .SetColumns(x => x.repeat_result == item["repeat_result"]) + .Where(x => x.id == item["id"]).ExecuteCommandAsync(); + } } - - await _repository.UpdateAsync(x => new EqpMaintainRecordH() + + if (input != null) { - repeat_result = input.repeat_result, - repeat_remark = input.repeat_remark, - repeat_user_id = _userManager.UserId, - repeat_time = DateTime.Now, - status = SpotInsRecordExecutionStatus.COMPLETED - }, x => x.id == input.id); + await _repository.UpdateAsync(x => new EqpMaintainRecordH() + { + repeat_result = input.repeat_result, + repeat_remark = input.repeat_remark, + repeat_user_id = _userManager.UserId, + repeat_time = DateTime.Now, + status = SpotInsRecordExecutionStatus.COMPLETED + }, x => x.id == input.id); + } }); if(!result.IsSuccess) throw Oops.Oh(ErrorCode.COM1008); @@ -149,7 +156,7 @@ namespace Tnb.EquipMgr public async Task GetMaintainRecordList(EquipQueryInput input) { var db = _repository.AsSugarClient(); - Dictionary queryJson = new Dictionary(); + Dictionary? queryJson = new Dictionary(); if (!string.IsNullOrEmpty(input.queryJson)) { queryJson = JsonConvert.DeserializeObject>(input.queryJson); @@ -163,17 +170,17 @@ namespace Tnb.EquipMgr { id = a.id, attachment = a.attachment, - create_time = a.create_time.Value.ToString("yyyy-MM-dd HH:mm"), + create_time = a.create_time==null ? null : a.create_time.Value.ToString("yyyy-MM-dd HH:mm"), equip_id = b.code, equip_id_id = a.equip_id, repeat_remark = a.repeat_remark, repeat_result = a.repeat_result=="1"?"合格":"不合格", - repeat_time = a.repeat_time.Value.ToString("yyyy-MM-dd HH:mm"), + repeat_time = a.repeat_time==null ? null : a.repeat_time.Value.ToString("yyyy-MM-dd HH:mm"), repeat_user_id = d.RealName, result = a.result=="1"?"合格":"不合格", result_remark = a.result_remark, maintain_tem_equip_id = a.maintain_tem_equip_id, - execute_time = a.execute_time.Value.ToString("yyyy-MM-dd HH:mm"), + execute_time = a.execute_time==null ? null : a.execute_time.Value.ToString("yyyy-MM-dd HH:mm"), execute_user_id = c.RealName, status = SqlFunc.IF(a.status.Equals("1")).Return("待执行").ElseIF(a.status.Equals("2")).Return("待复核").ElseIF(a.status.Equals("3")).Return("已完成").End("") }).ToPagedListAsync(input.currentPage, input.pageSize); diff --git a/EquipMgr/Tnb.EquipMgr/EquSpotInsRecordService.cs b/EquipMgr/Tnb.EquipMgr/EquSpotInsRecordService.cs index f3b10465..fad3138d 100644 --- a/EquipMgr/Tnb.EquipMgr/EquSpotInsRecordService.cs +++ b/EquipMgr/Tnb.EquipMgr/EquSpotInsRecordService.cs @@ -48,7 +48,6 @@ namespace Tnb.EquipMgr /// /// 执行点巡检 /// - /// /// [HttpPost] public async Task ExecuteSpotIns(SpotInsRecordExecuteInput input) @@ -75,13 +74,16 @@ namespace Tnb.EquipMgr spot_record_user_id = _userManager.UserId }, x => x.id == input.id); - foreach (var item in input.details) + if(input!=null && input.details!=null) { - await _repository.AsSugarClient().Updateable(). - SetColumns(x=>x.result==item["result"]) - .SetColumnsIF(item["judge_type"]=="1",x=>x.real_value==Convert.ToDouble(item["real_value"])) - .Where(x=>x.id==item["id"]) - .ExecuteCommandAsync(); + foreach (var item in input.details) + { + await _repository.AsSugarClient().Updateable(). + SetColumns(x=>x.result==item["result"]) + .SetColumnsIF(item["judge_type"]=="1",x=>x.real_value==Convert.ToDouble(item["real_value"])) + .Where(x=>x.id==item["id"]) + .ExecuteCommandAsync(); + } } @@ -114,7 +116,6 @@ namespace Tnb.EquipMgr /// /// 复核点巡检 /// - /// /// [HttpPost] public async Task RepeatSpotIns(SpotInsRecordRepeatInput input) @@ -133,7 +134,7 @@ namespace Tnb.EquipMgr public async Task GetSpotInsRecordList(EquipQueryInput input) { var db = _repository.AsSugarClient(); - Dictionary queryJson = new Dictionary(); + Dictionary? queryJson = new Dictionary(); if (!string.IsNullOrEmpty(input.queryJson)) { queryJson = JsonConvert.DeserializeObject>(input.queryJson); @@ -145,16 +146,16 @@ namespace Tnb.EquipMgr { id = a.id, attachment = a.attachment, - create_time = a.create_time.Value.ToString("yyyy-MM-dd HH:mm"), + create_time = a.create_time==null ? null : a.create_time.Value.ToString("yyyy-MM-dd HH:mm"), equip_id = a.equip_id, repeat_remark = a.repeat_remark, repeat_result = a.repeat_result=="1"?"合格":"不合格", - repeat_time = a.repeat_time.Value.ToString("yyyy-MM-dd HH:mm"), + repeat_time = a.repeat_time==null ? null : a.repeat_time.Value.ToString("yyyy-MM-dd HH:mm"), repeat_user_id = b.RealName, result = a.result=="1"?"合格":"不合格", result_remark = a.result_remark, spot_ins_tem_equip_id = a.spot_ins_tem_equip_id, - spot_record_date_time = a.spot_record_date_time.Value.ToString("yyyy-MM-dd HH:mm"), + spot_record_date_time = a.spot_record_date_time==null ? null :a.spot_record_date_time.Value.ToString("yyyy-MM-dd HH:mm"), spot_record_user_id = a.spot_record_user_id, status = SqlFunc.IF(a.status.Equals("1")).Return("待执行").ElseIF(a.status.Equals("2")).Return("待复核").ElseIF(a.status.Equals("3")).Return("已完成").End("") }).ToPagedListAsync(input.currentPage, input.pageSize); diff --git a/PerMgr/Tnb.PerMgr.Entities/Dto/ProcessChildDataInput.cs b/PerMgr/Tnb.PerMgr.Entities/Dto/ProcessChildDataInput.cs index 9c9b4ea0..e0f4c4f7 100644 --- a/PerMgr/Tnb.PerMgr.Entities/Dto/ProcessChildDataInput.cs +++ b/PerMgr/Tnb.PerMgr.Entities/Dto/ProcessChildDataInput.cs @@ -2,18 +2,18 @@ namespace Tnb.PerMgr.Entities.Dto { public class ProcessChildDataInput { - - public string id { get; set; } - public string process_standards_id { get; set; } + + public string id { get; set; } = string.Empty; + public string? process_standards_id { get; set; } /// /// 工艺参数id /// - public string process_param_id { get; set; } + public string? process_param_id { get; set; } /// /// 工艺参数类型id /// - public string process_param_type_id { get; set; } + public string? process_param_type_id { get; set; } public decimal value { get; set; } - public string daq_id { get; set; } + public string? daq_id { get; set; } } } \ No newline at end of file diff --git a/PerMgr/Tnb.PerMgr.Entities/Dto/ProcessParamOutput.cs b/PerMgr/Tnb.PerMgr.Entities/Dto/ProcessParamOutput.cs index 2ec9c6da..9b35fff1 100644 --- a/PerMgr/Tnb.PerMgr.Entities/Dto/ProcessParamOutput.cs +++ b/PerMgr/Tnb.PerMgr.Entities/Dto/ProcessParamOutput.cs @@ -2,7 +2,7 @@ namespace Tnb.PerMgr.Entities.Dto { public class ProcessParamOutput { - public string name { get; set; } + public string? name { get; set; } public decimal upper_value { get; set; } diff --git a/PerMgr/Tnb.PerMgr.Entities/Dto/ProcessParamTypeChildrenOutput.cs b/PerMgr/Tnb.PerMgr.Entities/Dto/ProcessParamTypeChildrenOutput.cs index c11cf8ea..d437adc9 100644 --- a/PerMgr/Tnb.PerMgr.Entities/Dto/ProcessParamTypeChildrenOutput.cs +++ b/PerMgr/Tnb.PerMgr.Entities/Dto/ProcessParamTypeChildrenOutput.cs @@ -5,16 +5,16 @@ namespace Tnb.PerMgr.Entities.Dto /// /// 工艺标准子表id /// - public string id { get; set; } + public string? id { get; set; } /// /// 工艺参数id /// - public string process_param_id { get; set; } - public string name { get; set; } + public string? process_param_id { get; set; } + public string? name { get; set; } public decimal? value { get; set; } public decimal upper_value { get; set; } public decimal lower_value { get; set; } - public string daq_id { get; set; } + public string? daq_id { get; set; } } } \ No newline at end of file diff --git a/PerMgr/Tnb.PerMgr.Entities/Dto/ProcessParamTypeDaqListOutput.cs b/PerMgr/Tnb.PerMgr.Entities/Dto/ProcessParamTypeDaqListOutput.cs index 1aa5c6e7..b938e836 100644 --- a/PerMgr/Tnb.PerMgr.Entities/Dto/ProcessParamTypeDaqListOutput.cs +++ b/PerMgr/Tnb.PerMgr.Entities/Dto/ProcessParamTypeDaqListOutput.cs @@ -2,7 +2,7 @@ namespace Tnb.PerMgr.Entities.Dto { public class ProcessParamTypeDaqListOutput { - public string id { get; set; } - public string label_name { get; set; } + public string? id { get; set; } + public string? label_name { get; set; } } } \ No newline at end of file diff --git a/PerMgr/Tnb.PerMgr/PerProcessParamTypeService.cs b/PerMgr/Tnb.PerMgr/PerProcessParamTypeService.cs index bd9a1651..92d612f2 100644 --- a/PerMgr/Tnb.PerMgr/PerProcessParamTypeService.cs +++ b/PerMgr/Tnb.PerMgr/PerProcessParamTypeService.cs @@ -35,7 +35,7 @@ namespace Tnb.PerMgr string equipId = dic["equip_id"]; var db = _repository.AsSugarClient(); var equipment = await db.Queryable().Where(x => x.id == equipId).SingleAsync(); - string equipTypeId = equipment?.equip_type_id; + string? equipTypeId = equipment?.equip_type_id; //List perProcessParamTypes = await _repository.GetListAsync(x => x.equip_type_id == equipTypeId); var result = await db.Queryable() @@ -94,29 +94,29 @@ namespace Tnb.PerMgr { PerProcessParamEditRecord record = new PerProcessParamEditRecord { - process_param_id = item.process_param_id, + process_param_id = item?.process_param_id ?? "", old_value = processStandardsD.value, - new_value = item.value, + new_value = item?.value ?? 0, modify_id = _userManager.UserId, modify_time = DateTime.Now, org_id = _userManager.GetUserInfo().Result.organizeId, equip_id = perProcessStandardsH.equip_id, process_param_name = processParam.name }; - db.Insertable(record).ExecuteCommandAsync(); + await db.Insertable(record).ExecuteCommandAsync(); } } - if (string.IsNullOrEmpty(item.id)) + if (item==null || string.IsNullOrEmpty(item.id)) { PerProcessStandardsD insertObj = new PerProcessStandardsD() { - value = item.value, - process_param_id = item.process_param_id, - process_standards_id = item.process_standards_id, - process_param_type_id = item.process_param_type_id, - daq_id = item.daq_id, + value = item?.value ?? 0, + process_param_id = item?.process_param_id ?? "", + process_standards_id = item?.process_standards_id ?? "", + process_param_type_id = item?.process_param_type_id ?? "", + daq_id = item?.daq_id??"", }; insertIds.Add(insertObj.id); @@ -152,7 +152,7 @@ namespace Tnb.PerMgr var db = _repository.AsSugarClient(); var perProcessStandardsH = await db.Queryable().SingleAsync(x => x.id == id); var equipment = await db.Queryable().Where(x => x.id == perProcessStandardsH.equip_id).SingleAsync(); - string equipTypeId = equipment?.equip_type_id; + string? equipTypeId = equipment?.equip_type_id; var result = await db.Queryable() .Where(a => a.equip_type_id == equipTypeId) diff --git a/PerMgr/Tnb.PerMgr/PerProcessStandardsService.cs b/PerMgr/Tnb.PerMgr/PerProcessStandardsService.cs index bd165278..29220237 100644 --- a/PerMgr/Tnb.PerMgr/PerProcessStandardsService.cs +++ b/PerMgr/Tnb.PerMgr/PerProcessStandardsService.cs @@ -72,7 +72,7 @@ namespace Tnb.PerMgr sheet.SetColumnWidth(i,15 * 256); } - int rowIndex = 1; + // int rowIndex = 1; // var column = sheet.GetColumn(0); // 设置下拉项 @@ -109,7 +109,7 @@ namespace Tnb.PerMgr { int rowIndex = 1; bool flag = false; - IWorkbook workbook = null; + IWorkbook? workbook = null; try { using (Stream stream = input.file.OpenReadStream()) @@ -121,9 +121,12 @@ namespace Tnb.PerMgr else if (input.fileName.IndexOf(".xls") > 0) workbook = new HSSFWorkbook(stream); - ISheet sheet = workbook.GetSheetAt(0); + ISheet? sheet = workbook?.GetSheetAt(0); + + if(workbook==null || sheet==null) + throw Oops.Bah("无导入数据"); - if (sheet.LastRowNum <= 1) + if (sheet?.LastRowNum <= 1) throw Oops.Bah("无导入数据"); var db = _repository.AsSugarClient(); @@ -132,12 +135,12 @@ namespace Tnb.PerMgr int errorColumnIndex = 5; ICellStyle style = workbook.CreateCellStyle(); - IFont font = workbook.CreateFont(); + IFont font = workbook.CreateFont(); font.Color = IndexedColors.Red.Index; // 将字体颜色设置为红色 style.SetFont(font); List list = new List() { }; - for (rowIndex = 1; rowIndex <= sheet.LastRowNum; rowIndex++) + for (rowIndex = 1; rowIndex <= sheet?.LastRowNum; rowIndex++) { IRow row = sheet.GetRow(rowIndex); ICell cell0 = row.GetCell(0); @@ -146,7 +149,7 @@ namespace Tnb.PerMgr PerProcessStandardsD item = new PerProcessStandardsD(); item.process_standards_id = id; - PerProcessParamType perProcessParamType = perProcessParamTypes.FirstOrDefault(x => x.name == cell0.StringCellValue); + PerProcessParamType? perProcessParamType = perProcessParamTypes.FirstOrDefault(x => x.name == cell0.StringCellValue); if (perProcessParamType != null) { item.process_param_type_id = perProcessParamType.id; @@ -159,7 +162,7 @@ namespace Tnb.PerMgr flag = true; } - PerProcessParam perProcessParam = perProcessParams.FirstOrDefault(x => x.name == cell1.StringCellValue); + PerProcessParam? perProcessParam = perProcessParams.FirstOrDefault(x => x.name == cell1.StringCellValue); if (perProcessParam != null) { item.process_param_id = perProcessParam.id; @@ -232,7 +235,7 @@ namespace Tnb.PerMgr { MemoryStream ms = new MemoryStream(); - workbook.Write(ms); + workbook?.Write(ms); string fileName = $"工艺标准导入报错{DateTime.Now.Ticks}.xlsx"; using (MemoryStream ms2 = new MemoryStream(ms.ToArray())) { @@ -278,6 +281,7 @@ namespace Tnb.PerMgr } catch (Exception e) { + Console.WriteLine(e); return false; } } diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/MaterialReceiptInput.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/MaterialReceiptInput.cs index 91ead988..93589603 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/MaterialReceiptInput.cs +++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/MaterialReceiptInput.cs @@ -2,7 +2,7 @@ namespace Tnb.ProductionMgr.Entities.Dto { public class MaterialReceiptInput { - public string id { get; set; } + public string? id { get; set; } /// /// 签收单号 @@ -59,6 +59,6 @@ namespace Tnb.ProductionMgr.Entities.Dto /// public string? mbom_process_id { get; set; } - public List> details { get; set; } + public List>? details { get; set; } } } \ No newline at end of file diff --git a/ProductionMgr/Tnb.ProductionMgr/ProductionReportRecordService.cs b/ProductionMgr/Tnb.ProductionMgr/ProductionReportRecordService.cs index feb1fa21..9b7a26a3 100644 --- a/ProductionMgr/Tnb.ProductionMgr/ProductionReportRecordService.cs +++ b/ProductionMgr/Tnb.ProductionMgr/ProductionReportRecordService.cs @@ -95,7 +95,7 @@ namespace Tnb.ProductionMgr { mo_task_id = input.data["mo_task_id"]?.ToString(), mo_task_code = input.data["mo_task_code"]?.ToString(), - reported_qty = (int)item["reported_qty"], + reported_qty = item["reported_qty"]!=null ? (int)item["reported_qty"] : 0, create_id = item["create_id"]?.ToString(), create_time = DateTime.Now, }); diff --git a/Tnb.Server.sln b/Tnb.Server.sln index cbf2b18c..7d6c0e17 100644 --- a/Tnb.Server.sln +++ b/Tnb.Server.sln @@ -129,7 +129,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tnb.BasicData.Entities", "B EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tnb.ProductionMgr.Entities", "ProductionMgr\Tnb.ProductionMgr.Entities\Tnb.ProductionMgr.Entities.csproj", "{57E7491F-7876-451E-BA9F-5B007EBD432D}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PerMgr", "PerMgr", "{74AB6486-1090-4CC9-9D1A-F1245E3ECFC3}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "16-PerMgr", "16-PerMgr", "{74AB6486-1090-4CC9-9D1A-F1245E3ECFC3}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tnb.PerMgr", "PerMgr\Tnb.PerMgr\Tnb.PerMgr.csproj", "{D41946CF-09C6-4CA4-A1F4-42E7E1538BF7}" EndProject