采购合同明细接口

hx-sale/src/main/java/com/fjhx/sale/entity/purchase/vo/EhsdPurchaseVo.java

@@ -58,4 +58,22 @@ public class EhsdPurchaseVo extends EhsdPurchase {
      * 卖方城市名称
      */
     private String sellCityName;
+
+
+    /**
+     * 开户银行
+     */
+    private String openingBank;
+    /**
+     * 账户名
+     */
+    private String openingName;
+    /**
+     * 联系人
+     */
+    private String contactPerson;
+    /**
+     * 账户
+     */
+    private String accountOpening;
 }

hx-sale/src/main/java/com/fjhx/sale/service/purchase/impl/EhsdPurchaseServiceImpl.java

@@ -9,9 +9,6 @@ import com.fjhx.area.utils.CustomizeAreaUtil;
 import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.common.entity.corporation.po.Corporation;
 import com.fjhx.common.service.corporation.CorporationService;
-import com.fjhx.customer.entity.customer.po.Customer;
-import com.fjhx.customer.service.customer.CustomerService;
-import com.fjhx.sale.entity.intermediate.vo.IntermediateContractVo;
 import com.fjhx.sale.entity.pack.po.PackDetail;
 import com.fjhx.sale.entity.pack.po.PackDetailProduct;
 import com.fjhx.sale.entity.pack.vo.PackDetailProductVo;
@@ -26,14 +23,14 @@ import com.fjhx.sale.service.pack.PackDetailProductService;
 import com.fjhx.sale.service.pack.PackDetailService;
 import com.fjhx.sale.service.purchase.EhsdPurchaseProductService;
 import com.fjhx.sale.service.purchase.EhsdPurchaseService;
+import com.fjhx.supply.entity.supplier.po.SupplierInfo;
+import com.fjhx.supply.service.supplier.SupplierInfoService;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.ruoyi.common.utils.wrapper.SqlField;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.lang.reflect.Array;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -58,7 +55,7 @@ public class EhsdPurchaseServiceImpl extends ServiceImpl<EhsdPurchaseMapper, Ehs
     @Autowired
     private PackDetailService packDetailService;
     @Autowired
-    private CustomerService customerService;
+    private SupplierInfoService supplierInfoService;
     @Autowired
     private CorporationService corporationService;
 
@@ -89,6 +86,7 @@ public class EhsdPurchaseServiceImpl extends ServiceImpl<EhsdPurchaseMapper, Ehs
     public EhsdPurchaseVo detail(Long id) {
         EhsdPurchase ehsdPurchase = this.getById(id);
         EhsdPurchaseVo result = BeanUtil.toBean(ehsdPurchase, EhsdPurchaseVo.class);
+
         List<Long> ids = new ArrayList<>();
         ids.add(result.getBuyCountryId());
         ids.add(result.getBuyProvinceId());
@@ -106,14 +104,20 @@ public class EhsdPurchaseServiceImpl extends ServiceImpl<EhsdPurchaseMapper, Ehs
         result.setBuyProvinceName(areaMapByIds.get(result.getBuyProvinceId()));
         result.setBuyCityName(areaMapByIds.get(result.getBuyCityId()));
 
-        //赋值买卖方名称
-        Customer customer = customerService.getById(result.getBuyCorporationId());
-        if(ObjectUtils.isNotEmpty(customer)){
-            result.setBuyCorporationName(customer.getName());
+        //赋值卖方名称
+        SupplierInfo supplierInfo = supplierInfoService.getById(result.getSellCorporationId());
+        if (ObjectUtils.isNotEmpty(supplierInfo)) {
+            result.setSellCorporationName(supplierInfo.getName());
         }
-        Corporation corporation = corporationService.getById(result.getSellCorporationId());
-        if(ObjectUtils.isNotEmpty(corporation)){
-            result.setSellCorporationName(corporation.getName());
+        //赋值卖方（供应商）银行信息
+        result.setOpeningBank(supplierInfo.getOpeningBank());//开户银行
+        result.setOpeningName(supplierInfo.getOpeningName());//账户名
+        result.setContactPerson(supplierInfo.getContactPerson());//联系人
+        result.setAccountOpening(supplierInfo.getAccountOpening());//账户
+        //赋值买方名称
+        Corporation corporation = corporationService.getById(result.getBuyCorporationId());
+        if (ObjectUtils.isNotEmpty(corporation)) {
+            result.setBuyCorporationName(corporation.getName());
         }
         //赋值采购明细
         List<EhsdPurchaseProduct> ehsdPurchaseProductList = ehsdPurchaseProductService.list(q ->
@@ -128,7 +132,7 @@ public class EhsdPurchaseServiceImpl extends ServiceImpl<EhsdPurchaseMapper, Ehs
         );
         List<PackDetailProductVo> packDetailProductVos = BeanUtil.copyToList(packDetailProductList, PackDetailProductVo.class);
         //赋值出货时间
-        if(ObjectUtils.isNotEmpty(packDetailProductVos)) {
+        if (ObjectUtils.isNotEmpty(packDetailProductVos)) {
             PackDetail packDetail = packDetailService.getById(packDetailProductVos.get(0).getPackDetailId());
             packDetailProductVos.forEach(item -> item.setShipmentTime(packDetail.getShipmentTime()));
         }