Sfoglia il codice sorgente

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

heteng 2 anni fa
parent
commit
8c031a28ef

+ 4 - 1
MicroServices/Business/Business.Application/ResourceExamineManagement/ResourceExamineAppService.cs

@@ -3690,8 +3690,11 @@ namespace Business.ResourceExamineManagement
                     if (exm != null)
                     if (exm != null)
                     {
                     {
                         var childs = exm.BomChildExamineList.Where(s => s.is_use == true).ToList();
                         var childs = exm.BomChildExamineList.Where(s => s.is_use == true).ToList();
-
                         var child = childs.Find(s => s.item_number == workord.product_code);
                         var child = childs.Find(s => s.item_number == workord.product_code);
+                        if (workord.morder_type == "返工工单")
+                        {
+                            child = childs.Find(s => s.item_number == workord.product_code && s.level == 1);
+                        }
                         if (child == null)
                         if (child == null)
                         {
                         {
                             continue;
                             continue;