From 18dac9b6b21d0bc18d0017c8ec6d17d3071b07b7 Mon Sep 17 00:00:00 2001 From: zhou keda <1315948824@qq.com> Date: Thu, 8 Aug 2024 11:46:12 +0800 Subject: [PATCH] bug --- .../Dto/EqpSpotInsRecordListOutput.cs | 1 + .../Tnb.EquipMgr/EquSpotInsRecordService.cs | 8 +- .../PrdManage/PrdRawMaterialBarcodeListDto.cs | 98 +++++++++++++++++++ .../PrdRawMaterialBarcodeService.cs | 40 +++++++- 4 files changed, 144 insertions(+), 3 deletions(-) create mode 100644 ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdRawMaterialBarcodeListDto.cs diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Dto/EqpSpotInsRecordListOutput.cs b/EquipMgr/Tnb.EquipMgr.Entities/Dto/EqpSpotInsRecordListOutput.cs index 0b40d67f..15956bcd 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Dto/EqpSpotInsRecordListOutput.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Dto/EqpSpotInsRecordListOutput.cs @@ -3,6 +3,7 @@ namespace Tnb.EquipMgr.Entities.Dto public class EqpSpotInsRecordListOutput { public string id { get; set; } + public string f_flowid { get; set; } public string equip_id { get; set; } public string equip_id_id { get; set; } public string status { get; set; } diff --git a/EquipMgr/Tnb.EquipMgr/EquSpotInsRecordService.cs b/EquipMgr/Tnb.EquipMgr/EquSpotInsRecordService.cs index 109d3fcb..71375c89 100644 --- a/EquipMgr/Tnb.EquipMgr/EquSpotInsRecordService.cs +++ b/EquipMgr/Tnb.EquipMgr/EquSpotInsRecordService.cs @@ -53,6 +53,7 @@ namespace Tnb.EquipMgr Dictionary? queryJson = (input == null || string.IsNullOrEmpty(input.queryJson)) ? new Dictionary() : input.queryJson.ToObject>(); string equioInfo = queryJson.ContainsKey("query_info") ? (queryJson["query_info"].ToString() ?? "") : ""; string status = queryJson.ContainsKey("status") ? (queryJson["status"].ToString() ?? "") : ""; + string equipTypeId = queryJson.ContainsKey("f_flowid") ? (queryJson["f_flowid"].ToString() ?? "") : ""; DateTime? start_time = queryJson.ContainsKey("start_time") ? queryJson["start_time"].ToString() == "" ? null : Convert.ToDateTime(queryJson["start_time"]) : null; DateTime? end_time = queryJson.ContainsKey("end_time") ? queryJson["end_time"].ToString() == "" ? null : Convert.ToDateTime(queryJson["end_time"]) : null; string now = DateTime.Now.ToString("yyyy-MM-dd"); @@ -66,22 +67,25 @@ namespace Tnb.EquipMgr input.sidx = "a." + input.sidx; } - SqlSugarPagedList list = await db.Queryable((a, b, c, d,e) => new object[] + SqlSugarPagedList list = await db.Queryable((a, b, c, d,e,f) => new object[] { JoinType.Left, a.equip_id == b.id, JoinType.Left, a.spot_record_user_id == c.Id, JoinType.Left, a.repeat_user_id == d.Id, JoinType.Left, a.modify_id == e.Id, + JoinType.Left, b.equip_type_id == f.id }) .WhereIF(!string.IsNullOrEmpty(status), (a, b, c) => a.status == status) .WhereIF(!string.IsNullOrEmpty(equioInfo), (a, b, c) => b.code.Contains(equioInfo) || b.name.Contains(equioInfo)) + .WhereIF(!string.IsNullOrEmpty(equipTypeId), (a, b, c) => b.equip_type_id==equipTypeId) .WhereIF(status == "3" && start_time != null, a => a.spot_record_date_time >= start_time) .WhereIF(status == "3" && end_time != null, a => a.spot_record_date_time <= end_time) .Where(a => a.create_time.Value.ToString("yyyy-MM-dd") == now) .OrderBy($"{input.sidx} {input.sort}") - .Select((a, b, c, d,e) => new EqpSpotInsRecordListOutput + .Select((a, b, c, d,e,f) => new EqpSpotInsRecordListOutput { id = a.id, + f_flowid = f.name, equip_id = b.code + "/" + b.name, equip_id_id = a.equip_id, status = a.status, diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdRawMaterialBarcodeListDto.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdRawMaterialBarcodeListDto.cs new file mode 100644 index 00000000..e0715a7e --- /dev/null +++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdRawMaterialBarcodeListDto.cs @@ -0,0 +1,98 @@ +namespace Tnb.ProductionMgr.Entities.Dto.PrdManage +{ + public class PrdRawMaterialBarcodeListDto + { + public string id { get; set; } + + /// + /// 单据编号 + /// + public string bill_code { get; set; } = string.Empty; + + /// + /// 料仓id + /// + public string equip_id { get; set; } = string.Empty; + + /// + /// 机台id + /// + public string equip_ids { get; set; } = string.Empty; + + /// + /// 截料阀 + /// + public string stop_valve { get; set; } + + /// + /// 物料id + /// + public string? material_id { get; set; } + + /// + /// 1 料仓原料条码 2 机台原料 + /// + public string type { get; set; } + + /// + /// 是否更新 + /// + public string is_update { get; set; } + + /// + /// 吸料完成 + /// + public string absorb_material_finish { get; set; } + + /// + /// 管道状态 + /// + public int piping_status { get; set; } + + /// + /// 开始时间 + /// + public string start_time { get; set; } + + /// + /// 结束时间 + /// + public string end_time { get; set; } + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + public string equip_id_id { get; set; } + + public string material_id_id { get; set; } + + public string f_flowid { get; set; } + } +} \ No newline at end of file diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdRawMaterialBarcodeService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdRawMaterialBarcodeService.cs index 48ec6257..ba838c8a 100644 --- a/ProductionMgr/Tnb.ProductionMgr/PrdRawMaterialBarcodeService.cs +++ b/ProductionMgr/Tnb.ProductionMgr/PrdRawMaterialBarcodeService.cs @@ -2,14 +2,17 @@ using JNPF; using JNPF.Common.Core.Manager; using JNPF.Common.Dtos.VisualDev; using JNPF.Common.Extension; +using JNPF.Common.Filter; using JNPF.Common.Security; using JNPF.DependencyInjection; using JNPF.DynamicApiController; using JNPF.FriendlyException; using JNPF.Logging; +using JNPF.Systems.Entitys.System; using JNPF.Systems.Interfaces.System; using JNPF.VisualDev; using JNPF.VisualDev.Entitys; +using JNPF.VisualDev.Entitys.Dto.VisualDevModelData; using JNPF.VisualDev.Interfaces; using Mapster; using Microsoft.AspNetCore.Mvc; @@ -26,6 +29,7 @@ using Tnb.Common.Utils; using Tnb.WarehouseMgr.Entities.Consts; using HttpClientHelper = Tnb.Common.Utils.HttpClientHelper; using Tnb.Common.Redis; +using Tnb.ProductionMgr.Entities.Dto.PrdManage; namespace Tnb.ProductionMgr { @@ -65,6 +69,40 @@ namespace Tnb.ProductionMgr _runService = runService; _redisData = redisData; OverideFuncs.UpdateAsync = Update; + OverideFuncs.GetListAsync = GetList; + } + + private async Task GetList(VisualDevModelListQueryInput input) + { + Dictionary? queryJson = !string.IsNullOrEmpty(input.queryJson) ? Newtonsoft.Json.JsonConvert.DeserializeObject>(input.queryJson) : new Dictionary(); + string billCode = queryJson.ContainsKey("bill_code") ? queryJson["bill_code"].ToString() : ""; + string equipTypeId = queryJson.ContainsKey("f_flowid") ? queryJson["f_flowid"].ToString() : ""; + string isUpdate = queryJson.ContainsKey("is_update") ? queryJson["is_update"].ToString() : ""; + + SqlSugarPagedList result = await _db.Queryable() + .LeftJoin((a, b) => a.material_id == b.id) + .LeftJoin((a, b,c) => a.equip_id == c.id) + .LeftJoin((a,b,c,d)=>c.equip_type_id==d.id) + .WhereIF(!string.IsNullOrEmpty(billCode),(a,b,c)=>a.bill_code.Contains(billCode)) + .WhereIF(!string.IsNullOrEmpty(equipTypeId),(a,b,c)=>c.equip_type_id==equipTypeId) + .WhereIF(!string.IsNullOrEmpty(isUpdate),(a,b,c)=>a.is_update.ToString()==isUpdate) + .Where((a,b,c)=>a.type=="1") + .Select((a, b, c,d) => new PrdRawMaterialBarcodeListDto + { + id = a.id, + bill_code = a.bill_code, + equip_id = c.name, + material_id = b.name, + absorb_material_finish = a.absorb_material_finish==1 ? "是" : "否", + is_update = a.is_update==1 ? "是" : "否", + start_time = a.start_time!=null ? a.start_time.Value.ToString(DbTimeFormat.SS) : "", + end_time = a.end_time!=null ? a.end_time.Value.ToString(DbTimeFormat.SS) : "", + remark = a.remark, + f_flowid = d.name, + equip_id_id = c.id, + material_id_id = b.id + }).ToPagedListAsync(input.currentPage, int.MaxValue); + return PageResult.SqlSugarPageResult(result); } private async Task Update(string id, VisualDevModelDataUpInput visualDevModelDataUpInput) @@ -199,7 +237,7 @@ namespace Tnb.ProductionMgr public async Task AsyncMaterialWarhouse() { List equipIds = await _db.Queryable().Where(x=>x.type=="1").Select(x=>x.equip_id).ToListAsync(); - List equipments = await _db.Queryable().Where(x=>!equipIds.Contains(x.id) && x.code.StartsWith("abc")).ToListAsync(); + List equipments = await _db.Queryable().Where(x=>!equipIds.Contains(x.id) && x.code.StartsWith("JZGL")).ToListAsync(); List insertList = new List(); if (equipments != null && !equipments.IsEmpty())