1

ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs

@@ -76,11 +76,8 @@ namespace Tnb.ProductionMgr
 
         }
 
-
         #region Get
 
-
-
         /// <summary>
         /// 根据产品ID获取模具列表 
         /// </summary>
@@ -98,8 +95,6 @@ namespace Tnb.ProductionMgr
         /// <br/>    }
         /// <br/>]
         /// </remarks>
-
-
         [HttpGet("{materialId}")]
         public async Task<dynamic> GetMoldListByItemId(string materialId)
         {
@@ -415,24 +410,31 @@ namespace Tnb.ProductionMgr
         /// </summary>
         /// <returns></returns>
         [HttpGet]
-        public async Task<dynamic> GetPackScheldToBeIssueList()
+        public async Task<dynamic> GetPackScheldToBeIssueList([FromQuery] PackScheldToBeIssueListInput input)
         {
             var dic = await _dictionaryDataService.GetDicByTypeId(DictConst.PrdTaskStatusTypeId);
             var result = await _db.Queryable<PrdMoTask>().Where(it => it.schedule_type == 2)
                 .LeftJoin<BasMaterial>((a, b) => a.material_id == b.id)
                 .LeftJoin<OrganizeEntity>((a, b, c) => a.workline_id == c.Id)
                 .LeftJoin<PrdMo>((a, b, c, d) => a.mo_id == d.id)
-                .Select((a, b, c, d) => new PackSechelToBeIssueListOutput
+                .LeftJoin<BasMbom>((a, b, c, d, e) => a.bom_id == e.id)
+                .WhereIF(!string.IsNullOrEmpty(input.mo_task_code), (a, b, c, d, e) => a.mo_task_code.Contains(input.mo_task_code))
+                .Select((a, b, c, d, e) => new PackSechelToBeIssueListOutput
                 {
                     mo_task_id = a.id,
                     mo_task_code = a.mo_task_code,
                     material_code = b.code,
                     material_name = b.name,
+                    workline_id = a.workline_id,
                     workline_code = c.EnCode,
                     workline_name = c.FullName,
                     mo_task_status = a.mo_task_status,
                     scheduled_qty = a.scheduled_qty,
-                    plan_qty = d.plan_qty
+                    plan_qty = d.plan_qty,
+                    estimated_start_date = a.estimated_start_date,
+                    estimated_end_date = a.estimated_end_date,
+                    bom_id = e.id,
+                    bom_version = e.version
                 })
                 .Mapper(it => it.mo_task_status = dic.ContainsKey(it.mo_task_status) ? dic[it.mo_task_status].ToString()! : "")
                 .ToListAsync();
@@ -705,11 +707,11 @@ namespace Tnb.ProductionMgr
                 }
                 else
                 {
-                    var pos = taskCode.IndexOf("-", StringComparison.Ordinal);
-                    if (pos > -1)
+                    var pos = taskCode?.IndexOf("-", StringComparison.Ordinal);
+                    if (pos.HasValue && pos.Value > -1)
                     {
-                        var num = taskCode.AsSpan().Slice(pos + 1).ToString().ParseToInt();
-                        var code = taskCode.AsSpan().Slice(0, pos).ToString();
+                        var num = taskCode.AsSpan().Slice(pos.Value + 1).ToString().ParseToInt();
+                        var code = taskCode.AsSpan().Slice(0, pos.Value).ToString();
                         var n = (num + 1).ToString().PadLeft(2, '0');
                         moTask.mo_task_code = $"{code}-{n}";
                     }
@@ -1083,6 +1085,26 @@ namespace Tnb.ProductionMgr
             });
             return result.IsSuccess;
         }
+        /// <summary>
+        /// 修改组装、包装，生产任务信息 
+        /// </summary>
+        /// <param name="updateToObj"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<dynamic> UpdatePackMoTask(PackPrdTaskUpInput input)
+        {
+            if (input == null) throw new ArgumentNullException("input");
+            var row = await _db.Updateable<PrdMoTask>().SetColumns(it => new PrdMoTask
+            {
+                workline_id = input.workline_id,
+                bom_id = input.bom_id,
+                estimated_start_date = input.estimated_start_date,
+                estimated_end_date = input.estimated_end_date,
+                scheduled_qty = input.scheduled_qty,
+            })
+            .Where(it => it.id == input.mo_task_id).ExecuteCommandAsync();
+            return row > 0;
+        }
 
         #endregion