Merge branch 'dev' of http://123.60.180.165:4647/ZZYDOP/DOPCore into dev

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

@@ -3383,8 +3383,8 @@ namespace Business.ResourceExamineManagement
 
             //删除同步Mysql后旧数据
             await DeleteMySqlOldData(sentrys);
-            List<string> tsWork = new List<string> { "试制工单", "TCN工单", "返工工单" };
-            List<mo_ic_bom> boms = _ic_bom.GetListAsync(p => mo_Mes_Morders.Where(x=> !tsWork.Contains(x.morder_type)).Select(m => m.bom_number).Contains(p.bom_number) && p.factory_id == param.factoryId && p.company_id == param.company_id && !p.IsDeleted).Result.ToList();
+            
+            List<mo_ic_bom> boms = _ic_bom.GetListAsync(p => mo_Mes_Morders.Select(m => m.bom_number).Contains(p.bom_number) && p.factory_id == param.factoryId && p.company_id == param.company_id && !p.IsDeleted).Result.ToList();
 
             //物料bom
             List<mo_ic_bom> bomlist = new List<mo_ic_bom>();
@@ -3419,6 +3419,7 @@ namespace Business.ResourceExamineManagement
             AsyncItemStockFromWMS(pretreatments);
 
             //增加特殊工单的预处理结果，因为特殊工单是自定义物料清单
+            List<string> tsWork = new List<string> { "试制工单", "返工工单" };
             var specialWork = mo_Mes_Morders.Where(x => tsWork.Contains(x.morder_type)).ToList();
             pretreatments.AddRange(_mysql_b_bom_pretreatment.GetListAsync(s => specialWork.Select(c => c.Id).ToList().Contains(s.sourceid)).Result);
 
@@ -3487,18 +3488,19 @@ namespace Business.ResourceExamineManagement
 
                 //获取当前物料bom数据
                 List<b_bom_pretreatment> itemPrelist = new List<b_bom_pretreatment>();
-                var childBom = boms.Where(p => p.bom_number == item.bom_number).FirstOrDefault();
-                if (childBom != null)
+                //通过工单ID读取，考虑特殊工单的预处理
+                itemPrelist = pretreatments.Where(s => s.sourceid == item.Id).ToList();
+                if (!itemPrelist.Any())
                 {
-                    itemPrelist = pretreatments.Where(s => s.sourceid == childBom.mysql_id).ToList();
-                }
-                else {
-                    itemPrelist = pretreatments.Where(s => s.sourceid == item.Id).ToList();
+                    var childBom = boms.Where(p => p.bom_number == item.bom_number).FirstOrDefault();
+                    if (childBom != null)
+                    {
+                        itemPrelist = pretreatments.Where(s => s.sourceid == childBom.mysql_id).ToList();
+                    }
+                    else {
+                        continue;
+                    }
                 }
-                /*if (tsWork.Contains(item.morder_type))
-                {
-                    itemPrelist = pretreatments.Where(s => s.sourceid == item.Id).ToList();
-                }*/
                 if (!itemPrelist.Any())
                 {
                     continue;
@@ -4156,7 +4158,8 @@ namespace Business.ResourceExamineManagement
                             CreateUser = user?.Name,
                             UpdateUser = user?.Name,
                             UM = find.UM,
-                            LotSerial = typed ? a.LotSerial : ""
+                            LotSerial = typed ? a.LotSerial : "",
+                            ItemName = find.Descr
                         });
                         i++;
                     }

MicroServices/Business/Business.Domain/StructuredDB/MES/IC/NbrDetail.cs

@@ -144,5 +144,11 @@ namespace Business.Domain
         /// </summary>
         [Comment("工单已发料数量")]
         public decimal QtyRec { get; set; }
+
+        /// <summary>
+        /// 物料名称
+        /// </summary>
+        [Comment("物料名称")]
+        public string ItemName { get; set; }
     }
 }