生产管理

ProductionMgr/Tnb.ProductionMgr/PrdMoService.cs

@@ -1,5 +1,7 @@
-using JNPF.Common.Core.Manager;
+using System.Dynamic;
+using JNPF.Common.Core.Manager;
 using JNPF.Common.Extension;
+using JNPF.Common.Filter;
 using JNPF.Common.Security;
 using JNPF.DependencyInjection;
 using JNPF.DynamicApiController;
@@ -9,6 +11,7 @@ using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using NPOI.OpenXmlFormats.Shared;
 using SqlSugar;
+using Tnb.ProductionMgr.Entitys.Dto.PrdManage;
 using Tnb.ProductionMgr.Entitys.Dto.WorkOrder;
 using Tnb.ProductionMgr.Entitys.Entity;
 using Tnb.ProductionPlanMgr.Entitys.Dto.WorkOrder;
@@ -25,10 +28,12 @@ namespace Tnb.ProductionPlanMgr
     {
         private readonly ISqlSugarRepository<PrdMoEntity> _repository;
         private readonly IDataBaseManager _dataBaseManager;
-        public PrdMoService(ISqlSugarRepository<PrdMoEntity> repository, IDataBaseManager dataBaseManager)
+        private readonly IUserManager _userManager;
+        public PrdMoService(ISqlSugarRepository<PrdMoEntity> repository, IDataBaseManager dataBaseManager,IUserManager userManager)
         {
             _repository = repository;
             _dataBaseManager = dataBaseManager;
+            _userManager = userManager;
         }
         /// <summary>
         /// 生产工单创建-生产工单下发
@@ -36,7 +41,7 @@ namespace Tnb.ProductionPlanMgr
         /// <param name="input">生产工单下发输入参数</param>
         /// <returns></returns>
         [HttpPut("workorder-issue")]
-        public async Task<dynamic> WorkOrderIssue(WorkOrderIssueCrInput input)
+        public async Task<dynamic> WorkOrderIssue(MoCrInput input)
         {
             if (input is null)
             {
@@ -52,26 +57,97 @@ namespace Tnb.ProductionPlanMgr
         /// <summary>
         /// 生产工单-生产排产
         /// </summary>
-        /// <param name="input"></param>
+        /// <param name="input">
+        ///<br/>{
+        ///<br/>    Id:生产任务主键Id
+        ///<br/>    MoType:工单类型 1、注塑/挤出 2、组装/包装
+        ///<br/>    MoId:工单Id
+        ///<br/>    ItemId:产品编号
+        ///<br/>    ItemName:产品名称
+        ///<br/>    MoldId:模具Id
+        ///<br/>    MoldName:模具名称
+        ///<br/>    EqpId:设备Id
+        ///<br/>    EqpName:设备名称
+        ///<br/>    LineId:产线编号
+        ///<br/>    LineName:产线名称
+        ///<br/>}
+        /// </param>
         /// <returns></returns>
+
         [HttpPost("scheduling")]
         public async Task<dynamic> ProductionScheduling(ProductionSchedulingCrInput input)
         {
             var entity = input.Adapt<PrdTask>();
-            entity.Id = input.Id ?? SnowflakeIdHelper.NextId();
+            entity.id ??= SnowflakeIdHelper.NextId();
+            entity.status = "ToBeScheduled"; //任务单状态默认，待排产
+            entity.create_id = _userManager.UserId;
+            entity.create_time = DateTime.Now;
+
             var db = await GetDbContext();
             var row = await db.Storageable(entity).ExecuteCommandAsync();
+            if (row > 0)
+            {
+                //修改工单状态为已排产，同事修改已排产数量
+                row = await db.Updateable<PrdMoEntity>().SetColumns(it => new PrdMoEntity
+                {
+                    MoStatus = "25019252113685",
+                    InputQty = entity.scheduled_num
+                })
+                    .Where(it => it.Id == entity.mo_id).ExecuteCommandAsync();
+            }
+            return row > 0;
+        }
+        /// <summary>
+        /// 生产任务下发
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost("task-release")]
+        public async Task<dynamic> PrdTaskRelease(PrdTaskReleaseUpInput input)
+        {
+            if (input is null)
+            {
+                throw new ArgumentNullException(nameof(input));
+            }
+            var db = await GetDbContext();
+            var row = await db.Updateable<PrdTask>()
+                              .SetColumns(it => new PrdTask { status = "ToBeStarted" })
+                              .Where(it => input.TaskIds.Contains(it.id))
+                              .ExecuteCommandAsync();
             return (row > 0);
         }
 
-        private async Task<ISqlSugarClient> GetDbContext()
+
+
+        /// <summary>
+        /// 根据产品ID获取模具列表 
+        /// </summary>
+        /// <param name="itemId">产品ID</param>
+        /// <returns></returns>
+        [HttpGet("moldlist/{itemId}")]
+        public async Task<dynamic> GetMoldListByItemId(string itemId)
         {
-            var link = await _repository.AsSugarClient().Queryable<DbLinkEntity>().FirstAsync(x => x.FullName == "tnb_mes");
+            var db = await GetDbContext("tnb_mom");
+            List<dynamic> items = await db.Queryable<object>().AS("bas_item").Select(new List<SelectModel>()
+            {
+                new SelectModel{ FiledName="id" },
+                new SelectModel{ FiledName="item_name" },
+            }).ToListAsync();
+            var itemDic = items.ToDictionary(x => x.id, x => x.item_name);
+            db = await GetDbContext("tnb_eqp");
+            var moldList = await db.Queryable<Molds>().Where(it => it.item_id == itemId).ToListAsync();
+            var list = moldList.Adapt<List<MoldListOutput>>();
+            db.ThenMapper(list, x => x.item_name = itemDic.ContainsKey(x.item_id) ? itemDic[x.item_id] : "");
+
+            return list;
+
+        }
+
+
+        private async Task<ISqlSugarClient> GetDbContext(string dbName = "tnb_mes")
+        {
+            var link = await _repository.AsSugarClient().Queryable<DbLinkEntity>().FirstAsync(x => x.FullName == dbName);
             var db = _dataBaseManager.ChangeDataBase(link);
             return db;
         }
     }
-
-
-
 }