自动领料添加几个必要时间

MicroServices/Business/Business.Application/ResourceExamineManagement/ResourceExamineAppService.cs

@@ -2027,8 +2027,8 @@ namespace Business.ResourceExamineManagement
         //    {
         //        lines = dbPeriodSequences.Select(a => a.Line).Distinct().ToList();
         //        lineMasters = _lineMaster.Select(p => lines.Contains(p.Line) && p.Domain == "1001" && p.IsActive);
-        //        List<ProductStructureMaster>  itemList=GetProductStructure(dbPeriodSequences.Select(a=>a.ItemNum).Distinct().ToList());
-        //        var childrenList= itemList.Select(a=>a.ComponentItem).Distinct().ToList();
+        //        List<ProductStructureMaster> itemList = GetProductStructure(dbPeriodSequences.Select(a => a.ItemNum).Distinct().ToList());
+        //        var childrenList = itemList.Select(a => a.ComponentItem).Distinct().ToList();
         //        List<ItemMaster> itemLocList = _itemMaster.Select(p => childrenList.Contains(p.ItemNum) && p.Domain == "1001" && p.IsActive).Distinct().ToList();
         //        foreach (var item in dbPeriodSequences)
         //        {
@@ -2045,7 +2045,13 @@ namespace Business.ResourceExamineManagement
         //                WorkOrd = item.WorkOrds,
         //                QtyOrd = item.OrdQty.HasValue ? item.OrdQty.Value : 0,
         //                IsActive = true,
-        //                IsChanged = false
+        //                IsChanged = true,
+        //                Name = "1001",
+        //                Department = "101",
+        //                CreateTmie = DateTime.Now,
+        //                UpdateTmie = DateTime.Now,
+        //                CreateUser = "1001",
+        //                UpdateUser = "1001"
         //            });
         //            int i = 1;
         //            itemList.Where(a => a.ParentItem == item.ItemNum).ToList()?.ForEach(a =>
@@ -2067,13 +2073,19 @@ namespace Business.ResourceExamineManagement
         //                    LocationTo = "",
         //                    WorkOrd = item.WorkOrds,
         //                    QtyOrd = item.OrdQty * a.Qty,
+        //                    CurrQtyOpened = item.OrdQty * a.Qty,
         //                    Line = i,
         //                    IsActive = true,
+        //                    CreateTmie = DateTime.Now,
+        //                    UpdateTmie = DateTime.Now,
+        //                    CreateUser = "1001",
+        //                    UpdateUser = "1001"
         //                });
-        //                if(dictItemQty.ContainsKey(a.ComponentItem))
+        //                if (dictItemQty.ContainsKey(a.ComponentItem))
         //                {
         //                    dictItemQty[a.ComponentItem] = dictItemQty[a.ComponentItem] + item.OrdQty.Value * a.Qty;
-        //                }else
+        //                }
+        //                else
         //                {
         //                    dictItemQty.Add(a.ComponentItem, item.OrdQty.Value * a.Qty);
         //                }
@@ -2082,20 +2094,20 @@ namespace Business.ResourceExamineManagement
         //        }
         //        _nbrMaster.Insert(nbrMasterList);
         //        //快开平台用自增列RecId关联，所以需要插入后再查给明细表赋相应的值
-        //        List<string> nbrs= nbrMasterList.Select(a=>a.Nbr).ToList();
-        //        var nbrList= _nbrMaster.Select(a => a.Domain == "1001" && a.Type == "SM" && nbrs.Contains(a.Nbr));
+        //        List<string> nbrs = nbrMasterList.Select(a => a.Nbr).ToList();
+        //        var nbrList = _nbrMaster.Select(a => a.Domain == "1001" && a.Type == "SM" && nbrs.Contains(a.Nbr));
         //        nbrDetailList.ForEach(c =>
         //        {
-        //            c.NbrRecID= nbrList.Where(a=>a.Nbr==c.Nbr).First().RecID;
+        //            c.NbrRecID = nbrList.Where(a => a.Nbr == c.Nbr).First().RecID;
         //        });
         //        _nbrDetail.Insert(nbrDetailList);
         //        //TODO:
         //        //因为我们并没有模拟发料的过程,在自动生成领料单的时候就要扣减库存，实际业务不能这么做。
         //        //在有上料和追溯的系统，可以在扫码上料或报工时（从线边仓）扣减。或者在实际发料出库时扣减。
-        //        List<string> itemKeys= dictItemQty.Keys.ToList();
-        //        var items=_mysql_ic_item.GetListAsync(a => itemKeys.Contains(a.number) && a.factory_id == 1001 && a.tenant_id == 1000).Result;
-        //        var itemIds=items.Select(b => b.Id).ToList();
-        //        var stockList=_mysql_ic_item_stock.GetListAsync(a => itemIds.Contains(a.Id) && a.factory_id == 1001 && a.tenant_id == 1000).Result;
+        //        List<string> itemKeys = dictItemQty.Keys.ToList();
+        //        var items = _mysql_ic_item.GetListAsync(a => itemKeys.Contains(a.number) && a.factory_id == 1001 && a.tenant_id == 1000).Result;
+        //        var itemIds = items.Select(b => b.Id).ToList();
+        //        var stockList = _mysql_ic_item_stock.GetListAsync(a => itemIds.Contains(a.Id) && a.factory_id == 1001 && a.tenant_id == 1000).Result;
         //        stockList?.ForEach(a =>
         //        {
         //            a.sqty = a.sqty - dictItemQty[items.First(b => b.Id == a.Id).number];

MicroServices/Business/Bussiness.Model/MES/IC/NbrDetail.cs

@@ -81,6 +81,12 @@ namespace Business.Model.MES.IC
         [Comment("订单数量")]
         public decimal? QtyOrd { get; set; }
 
+        /// <summary>
+        /// 工单需求数量
+        /// </summary>
+        [Comment("工单需求数量")]
+        public decimal? CurrQtyOpened { get; set; }
+
         /// <summary>
         /// 行号
         /// </summary>
@@ -97,5 +103,36 @@ namespace Business.Model.MES.IC
         /// </summary>
         [Comment("是否有效")]
         public Boolean IsActive { get; set; }
+
+        /// <summary>
+        /// 单位
+        /// </summary>
+        [Comment("单位")]
+        public string? UM { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [Comment("创建时间")]
+        public DateTime? CreateTmie { get; set; }
+
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        [Comment("创建人")]
+        public string? CreateUser { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [Comment("修改时间")]
+        public DateTime? UpdateTmie { get; set; }
+
+        /// <summary>
+        /// 修改人
+        /// </summary>
+        [Comment("修改人")]
+        public string? UpdateUser { get; set; }
+
     }
 }

MicroServices/Business/Bussiness.Model/MES/IC/NbrMaster.cs

@@ -87,5 +87,48 @@ namespace Business.Model.MES.IC
         /// </summary>
         [Comment("是否编辑")]
         public Boolean IsChanged { get; set; }
+
+        /// <summary>
+        /// 部门
+        /// </summary>
+        [Comment("部门")]
+        public string? Department { get; set; }
+
+
+        /// <summary>
+        /// 领料人姓名
+        /// </summary>
+        [Comment("领料人姓名")]
+        public string? Name { get; set; }
+
+        /// <summary>
+        /// 备料人
+        /// </summary>
+        [Comment("备料人")]
+        public string? User1 { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [Comment("创建时间")]
+        public DateTime? CreateTmie { get; set; }
+
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        [Comment("创建人")]
+        public string? CreateUser { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [Comment("修改时间")]
+        public DateTime? UpdateTmie { get; set; }
+
+        /// <summary>
+        /// 修改人
+        /// </summary>
+        [Comment("修改人")]
+        public string? UpdateUser { get; set; }
     }
 }