采购单附件调整

oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillService.java

@@ -26,13 +26,16 @@
 package com.yxt.oms.biz.func.purchasebill;
 
 import cn.hutool.core.date.DateUtil;
+import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import com.yxt.oms.biz.func.commonmethod.CommonMethod;
 import com.yxt.oms.biz.func.commonmethod.DataRule;
+import com.yxt.oms.biz.func.purchaseappendix.PurchaseAppendixUrl;
 import com.yxt.oms.biz.func.purchasebilldetail.PurchaseBillDetailDetailsVo;
+import com.yxt.oms.biz.func.purchasebilldetail.PurchaseBillDetailDto;
 import com.yxt.oms.biz.func.sysorganization.SysOrganizationVo;
 import com.yxt.oms.biz.func.warehouseansbill.WarehouseAnsBillDto;
 import com.yxt.oms.biz.func.warehouseansbilldetail.WarehouseAnsBillDetailDto;
@@ -68,6 +71,8 @@ public class PurchaseBillService {
     private WarehouseAnsBillFeign warehouseAnsBillFeign;
     @Autowired
     private CommonMethod commonMethod;
+    @Autowired
+    private FileUploadComponent fileUploadComponent;
 
     public ResultBean<PagerVo<PurchaseBillVo>> listPageVo(PagerQuery<PurchaseBillQuery> pq) {
         ResultBean rb = ResultBean.fireFail();
@@ -92,6 +97,17 @@ public class PurchaseBillService {
     public ResultBean<String> saveOrUpdateDto(PurchaseBillDto dto) {
         ResultBean rb = ResultBean.fireFail();
         String orgPath = dto.getOrgPath();
+        List<PurchaseAppendixUrl> purchaseAppendixList = dto.getPurchaseAppendixList();
+        for (PurchaseAppendixUrl purchaseAppendixUrl : purchaseAppendixList) {
+            String filePath = purchaseAppendixUrl.getUrl().replace(fileUploadComponent.getUrlPrefix(), "");
+            purchaseAppendixUrl.setUrl(filePath);
+        }
+        List<PurchaseBillDetailDto> purchaseBillDetailList = dto.getPurchaseBillDetailList();
+        for (PurchaseBillDetailDto purchaseBillDetailDto : purchaseBillDetailList) {
+            String goodsImgUrl = purchaseBillDetailDto.getGoodsImgUrl();
+            goodsImgUrl = goodsImgUrl.replace(fileUploadComponent.getUrlPrefix(), "");
+            purchaseBillDetailDto.setGoodsImgUrl(goodsImgUrl);
+        }
         if (StringUtils.isBlank(dto.getSid())) {
             String deptName = "";
             String deptSid = "";
@@ -128,7 +144,20 @@ public class PurchaseBillService {
     }
 
     public ResultBean<PurchaseBillDetailsVo> fetchDetailsVoBySid(String sid) {
-        return purchaseBillFeign.fetchDetailsBySid(sid);
+        ResultBean rb = ResultBean.fireFail();
+        PurchaseBillDetailsVo purchaseBillDetailsVo = purchaseBillFeign.fetchDetailsBySid(sid).getData();
+        List<PurchaseBillDetailDetailsVo> purchaseBillDetailList = purchaseBillDetailsVo.getPurchaseBillDetailList();
+        for (PurchaseBillDetailDetailsVo purchaseBillDetailDetailsVo : purchaseBillDetailList) {
+            String goodsImgUrl = purchaseBillDetailDetailsVo.getGoodsImgUrl();
+            goodsImgUrl = fileUploadComponent.getUrlPrefix() + goodsImgUrl;
+            purchaseBillDetailDetailsVo.setGoodsImgUrl(goodsImgUrl);
+        }
+        List<PurchaseAppendixUrl> purchaseAppendixList = purchaseBillDetailsVo.getPurchaseAppendixList();
+        for (PurchaseAppendixUrl purchaseAppendixUrl : purchaseAppendixList) {
+            String url = fileUploadComponent.getUrlPrefix() + purchaseAppendixUrl.getUrl();
+            purchaseAppendixUrl.setUrl(url);
+        }
+        return rb.success().setData(purchaseBillDetailsVo);
     }
 
     public ResultBean delAll(String[] sids) {