Преглед изворни кода

工单逻辑调整提交。

tangdi пре 2 година
родитељ
комит
4d20704a1b

+ 1 - 1
MicroServices/Business/Business.Application/ReplenishmentManagement/ReplenishmentAppService.cs

@@ -2779,7 +2779,7 @@ namespace Business.Replenishment
         /// <param name="childs"></param>
         /// <param name="childs"></param>
         public void GetWorkDetalis(List<b_bom_child_examine> dtl, List<b_bom_child_examine> returnList, List<b_bom_child_examine> childs)
         public void GetWorkDetalis(List<b_bom_child_examine> dtl, List<b_bom_child_examine> returnList, List<b_bom_child_examine> childs)
         {
         {
-            returnList.AddRange(dtl);
+            returnList.AddRange(dtl.Where(x => x.erp_cls != 4).ToList());
             var rst = childs.Where(s => dtl.Where(x => x.erp_cls == 4).Select(c => c.fid).Contains(s.parent_id.GetValueOrDefault())).ToList();
             var rst = childs.Where(s => dtl.Where(x => x.erp_cls == 4).Select(c => c.fid).Contains(s.parent_id.GetValueOrDefault())).ToList();
             if (rst.Any())
             if (rst.Any())
             {
             {

+ 2 - 2
MicroServices/Business/Business.Application/ResourceExamineManagement/ResourceExamineAppService.cs

@@ -4297,7 +4297,7 @@ namespace Business.ResourceExamineManagement
         /// <param name="childs"></param>
         /// <param name="childs"></param>
         public void GetWorkDetalis(List<BomChildExamineDto> dtl, List<BomChildExamineDto> returnList, List<BomChildExamineDto> childs)
         public void GetWorkDetalis(List<BomChildExamineDto> dtl, List<BomChildExamineDto> returnList, List<BomChildExamineDto> childs)
         {
         {
-            returnList.AddRange(dtl);
+            returnList.AddRange(dtl.Where(x => x.erp_cls != 4).ToList());
             var rst = childs.Where(s => dtl.Where(x => x.erp_cls == 4).Select(c => c.fid).Contains(s.parent_id.GetValueOrDefault())).ToList();
             var rst = childs.Where(s => dtl.Where(x => x.erp_cls == 4).Select(c => c.fid).Contains(s.parent_id.GetValueOrDefault())).ToList();
             if (rst.Any())
             if (rst.Any())
             {
             {
@@ -4314,7 +4314,7 @@ namespace Business.ResourceExamineManagement
         /// <param name="childs"></param>
         /// <param name="childs"></param>
         public void GetWorkDetalis(List<b_bom_child_examine> dtl, List<b_bom_child_examine> returnList, List<b_bom_child_examine> childs)
         public void GetWorkDetalis(List<b_bom_child_examine> dtl, List<b_bom_child_examine> returnList, List<b_bom_child_examine> childs)
         {
         {
-            returnList.AddRange(dtl);
+            returnList.AddRange(dtl.Where(x => x.erp_cls != 4).ToList());
             var rst = childs.Where(s => dtl.Where(x => x.erp_cls == 4).Select(c => c.fid).Contains(s.parent_id.GetValueOrDefault())).ToList();
             var rst = childs.Where(s => dtl.Where(x => x.erp_cls == 4).Select(c => c.fid).Contains(s.parent_id.GetValueOrDefault())).ToList();
             if (rst.Any())
             if (rst.Any())
             {
             {