设备入库领用

EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipSparePartRecord.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tnb.EquipMgr.Entities
+{
+    public class EquipSparePartRecordInput
+    {
+        public string? equip_id { get; set; }
+    }
+    public class EquipSparePartRecordOut
+    {
+        public string? id { get; set; }
+        public string? code { get; set; }
+        public string? name { get; set; }
+        public string? type { get; set; }
+        public string? execuser { get; set; }
+        public string? execdatetime { get; set; }
+        public int? num { get; set; }
+
+    }
+}

EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipSparePartsQueryOutput.cs

@@ -8,6 +8,7 @@ namespace Tnb.EquipMgr.Entities.Dto
         public string? code { get; set; }
         public string? name { get; set; }
         public string? specification { get; set; }
+        public int? num { get; set; }
 
     }
 }

EquipMgr/Tnb.EquipMgr/EqpEquipSparePartsService.cs

@@ -1,11 +1,14 @@
+using System.CodeDom.Compiler;
 using JNPF.Common.Core.Manager;
 using JNPF.Common.Filter;
 using JNPF.Common.Security;
 using JNPF.DependencyInjection;
 using JNPF.DynamicApiController;
+using JNPF.Systems.Entitys.Permission;
 using JNPF.Systems.Entitys.System;
 using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json;
+using NPOI.SS.Formula.Functions;
 using SqlSugar;
 using Tnb.EquipMgr.Entities;
 using Tnb.EquipMgr.Entities.Dto;
@@ -68,6 +71,9 @@ namespace Tnb.EquipMgr
             {
                 queryJson = JsonConvert.DeserializeObject<Dictionary<string, string>>(input.queryJson);
             }
+            var eqpSpareParts = await db.Queryable<EqpSpareParts>().ToListAsync();
+            var InstockDs= await db.Queryable<EqpSparePartsInstockD>().ToListAsync();
+            var RequisitionDs = await db.Queryable<EqpSparePartsRequisitionD>().ToListAsync();
             SqlSugarPagedList<EquipSparePartsQueryOutput> result = await db.Queryable<EqpEquipSpareParts>()
                 .LeftJoin<EqpSpareParts>((a, b) => a.spare_parts_id == b.id)
                 .LeftJoin<DictionaryTypeEntity>((a, b, c) => c.EnCode == Tnb.BasicData.DictConst.SparePartsType && c.DeleteMark == null)
@@ -82,10 +88,68 @@ namespace Tnb.EquipMgr
                     type_name = d.FullName,
                     code = b.code,
                     name = b.name,
-                    specification = b.specification
+                    specification = b.specification,
+                    num = 0
                 }).ToPagedListAsync(input.currentPage, input.pageSize);
+            foreach (var item in result.list)
+            {
+                try
+                {
+                    var part = eqpSpareParts.Where(p => p.code == item.code).First();
+                    var Instocknum = InstockDs.Where(p => p.spare_parts_id == part.id).Sum(p => p.quantity);
+                    var Requisitionum = RequisitionDs.Where(p => p.spare_parts_id == part.id).Sum(p => p.quantity);
+                    item.num = Instocknum > Requisitionum ? Instocknum - Requisitionum : 0;
+                }
+                catch (Exception)
+                {
+                }
 
+            }
             return PageResult<EquipSparePartsQueryOutput>.SqlSugarPageResult(result);
         }
+
+        //获取备品备件历史
+        [HttpPost]
+        public async Task<dynamic> GetEquipSparePartRecord(EquipSparePartRecordInput input)
+        {
+            ISqlSugarClient db = _repository.AsSugarClient();
+            var partsids = await db.Queryable<EqpEquipSpareParts>().Where(p => p.equip_id == input.equip_id).Select(p => p.spare_parts_id).ToListAsync();
+            var Instocks = await db.Queryable<EqpSparePartsInstockD>()
+               .LeftJoin<EqpSparePartsInstockH>((a, b) => a.instock_id == b.id)
+               .LeftJoin<EqpSpareParts>((a, b, c) => a.spare_parts_id == c.id)
+               .LeftJoin<UserEntity>((a, b, c, d) => b.instock_id == d.Id)
+               .Where((a, b, c, d) => partsids.Contains(a.spare_parts_id!))
+               .Select((a, b, c, d) => new EquipSparePartRecordOut()
+               {
+                   id = a.id,
+                   code = c.code,
+                   name = c.name,
+                   type = "入库",
+                   execuser = d.RealName,
+                   execdatetime = b.create_time != null ? b.create_time.ToString() : "",
+                   num = a.quantity
+               })
+               .ToListAsync();
+
+            var Requisitions = await db.Queryable<EqpSparePartsRequisitionD>()
+             .LeftJoin<EqpSparePartsRequisitionH>((a, b) => a.spare_parts_requisition_id == b.id)
+             .LeftJoin<EqpSpareParts>((a, b, c) => a.spare_parts_id == c.id)
+             .LeftJoin<UserEntity>((a, b, c, d) => b.recipient_id == d.Id)
+             .Where((a, b, c, d) => partsids.Contains(a.spare_parts_id!))
+             .Select((a, b, c, d) => new EquipSparePartRecordOut()
+             {
+                 id = a.id,
+                 code = c.code,
+                 name = c.name,
+                 type = "领用",
+                 execuser = d.RealName,
+                 execdatetime = b.create_time != null ? b.create_time.ToString()!.Substring(0,19) : "",
+                 num = a.quantity
+             })
+             .ToListAsync();
+            Instocks.AddRange(Requisitions);
+            var result = Instocks.OrderByDescending(p => DateTime.Parse(p.execdatetime!));
+            return result;
+        }
     }
 }

taskschedule/Tnb.TaskScheduler/Listener/GenerateMaintainPlanTimeWorker.cs

@@ -1,5 +1,8 @@
 using JNPF.Common.Security;
 using JNPF.Logging;
+using JNPF.Message;
+using JNPF.Message.Interfaces.Message;
+using JNPF.Message.Service;
 using SqlSugar;
 using Tnb.EquipMgr.Entities;
 
@@ -15,7 +18,7 @@ namespace JNPF.TaskScheduler.Listener
         // {
         //     _repository = repository;
         // }
-
+        private IMessageService _sendMessageService => App.GetService<IMessageService>();
         [SpareTime("0 0 0 * * ?", "生成设备保养计划", ExecuteType = SpareTimeExecuteTypes.Serial, StartNow = false)]
         public async void GenerateSpotInspectionPlan(SpareTimer timer, long count)
         {
@@ -171,6 +174,24 @@ namespace JNPF.TaskScheduler.Listener
                         Console.WriteLine(dbResult.ErrorMessage);
                         Log.Error(dbResult.ErrorMessage);
                     }
+                    else
+                    {
+                        List<EqpEquipment> equipments = await db.Queryable<EqpEquipment>().Where(x => x.life == Tnb.EquipMgr.EquipmentLife.ENABLE).ToListAsync();
+                        foreach (var item in tobeCreateList)
+                        {
+                            try
+                            {
+                                if (equipments.FirstOrDefault(x => x.id == item.equip_id) == null)
+                                    continue;
+                                var users = new List<string>() { item.execute_user_id };
+                                var title = equipments.FirstOrDefault(x => x.id == item.equip_id).code + "设备保养提醒";
+                                await _sendMessageService.SentMessage(users, title, title);
+                            }
+                            catch (Exception)
+                            {
+                            }
+                        }
+                    }
                     Log.Information($"---------------生成{tobeCreateList.Count}个计划---------------");
                 }
             }

taskschedule/Tnb.TaskScheduler/Listener/GenerateSpotInspectionPlanTimeWorker.cs

@@ -1,5 +1,6 @@
 using JNPF.Common.Security;
 using JNPF.Logging;
+using JNPF.Message.Interfaces.Message;
 using SqlSugar;
 using Tnb.EquipMgr.Entities;
 
@@ -15,7 +16,7 @@ namespace JNPF.TaskScheduler.Listener
         // {
         //     _repository = repository;
         // }
-
+        private IMessageService _sendMessageService => App.GetService<IMessageService>();
         [SpareTime("0 0,30 * * * ?", "生成点巡检计划", ExecuteType = SpareTimeExecuteTypes.Serial, StartNow = false)]
         public async void GenerateSpotInspectionPlan(SpareTimer timer, long count)
         {
@@ -172,6 +173,24 @@ namespace JNPF.TaskScheduler.Listener
                         Console.WriteLine(dbResult.ErrorMessage);
                         Log.Error(dbResult.ErrorMessage);
                     }
+                    else
+                    {
+                        List<EqpEquipment> equipments = await db.Queryable<EqpEquipment>().Where(x => x.life == Tnb.EquipMgr.EquipmentLife.ENABLE).ToListAsync();
+                        foreach (var item in tobeCreateList)
+                        {
+                            try
+                            {
+                                if (equipments.FirstOrDefault(x => x.id == item.equip_id) == null)
+                                    continue;
+                                var users = new List<string>() { item.spot_record_user_id };
+                                var title = equipments.FirstOrDefault(x => x.id == item.equip_id).code + "设备点巡检提醒";
+                                await _sendMessageService.SentMessage(users, title, title);
+                            }
+                            catch (Exception)
+                            {
+                            }
+                        }
+                    }
                     Log.Information($"---------------生成{tobeCreateList.Count}个计划---------------");
                 }
             }