楚江erp：样品反馈单查询接口逻辑调整

@@ -129,10 +129,5 @@ public class GetSampleResultFeedbackBo extends BaseBo<SampleResultFeedback> {
             Workshop workshop = workshopService.findById(dto.getWorkshopId());
             Workshop workshop = workshopService.findById(dto.getWorkshopId());
             this.workshopName = workshop == null ? null : workshop.getName();
             this.workshopName = workshop == null ? null : workshop.getName();
         }
         }
-        if (StringUtils.isNotBlank(dto.getOrderId())) {
-            PurchaseOrderInfoService purchaseOrderInfoService = ApplicationUtil.getBean(PurchaseOrderInfoService.class);
-            PurchaseOrderInfo orderInfo = purchaseOrderInfoService.findById(dto.getOrderId());
-            this.orderNo = orderInfo == null ? null : orderInfo.getOrderNo();
-        }
     }
     }
 }
 }

@@ -10,11 +10,13 @@ import com.lframework.starter.web.core.annotations.oplog.OpLog;
 import com.lframework.starter.web.core.utils.PageHelperUtil;
 import com.lframework.starter.web.core.utils.PageHelperUtil;
 import com.lframework.starter.common.utils.Assert;
 import com.lframework.starter.common.utils.Assert;
 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
+import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderLineService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderLineService;
 import com.lframework.xingyun.sc.service.sample.SampleFeedbackTrackingDetailService;
 import com.lframework.xingyun.sc.service.sample.SampleFeedbackTrackingDetailService;
 import com.lframework.xingyun.sc.service.shipments.ShipmentsPlanDetailService;
 import com.lframework.xingyun.sc.service.shipments.ShipmentsPlanDetailService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.BooleanUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
 import com.lframework.xingyun.sc.mappers.SampleResultFeedbackMapper;
 import com.lframework.xingyun.sc.mappers.SampleResultFeedbackMapper;
 import com.lframework.xingyun.sc.service.sample.SampleResultFeedbackService;
 import com.lframework.xingyun.sc.service.sample.SampleResultFeedbackService;
@@ -34,6 +36,8 @@ public class SampleResultFeedbackServiceImpl extends BaseMpServiceImpl<SampleRes
     private PurchaseOrderLineService purchaseOrderLineService;
     private PurchaseOrderLineService purchaseOrderLineService;
     @Resource
     @Resource
     private ShipmentsPlanDetailService shipmentsPlanDetailService;
     private ShipmentsPlanDetailService shipmentsPlanDetailService;
+    @Resource
+    private PurchaseOrderInfoService purchaseOrderInfoService;
 
 
 
 
     @Override
     @Override
@@ -59,6 +63,11 @@ public class SampleResultFeedbackServiceImpl extends BaseMpServiceImpl<SampleRes
         if (sampleResultFeedback != null) {
         if (sampleResultFeedback != null) {
             List<SampleFeedbackTrackingDetail> detailList = sampleFeedbackTrackingDetailService.listByFeedbackIds(Collections.singletonList(id));
             List<SampleFeedbackTrackingDetail> detailList = sampleFeedbackTrackingDetailService.listByFeedbackIds(Collections.singletonList(id));
             sampleResultFeedback.setDetailList(detailList);
             sampleResultFeedback.setDetailList(detailList);
+            String orderId = sampleResultFeedback.getOrderId();
+            if (StringUtils.isNotBlank(orderId)) {
+                PurchaseOrderInfo orderInfo = purchaseOrderInfoService.getBaseMapper().selectById(orderId);
+                sampleResultFeedback.setOrderNo(orderInfo == null ? null : orderInfo.getOrderNo());
+            }
         }
         }
         return sampleResultFeedback;
         return sampleResultFeedback;
     }
     }