样品单明细 销售合同明细

hx-sale/src/main/java/com/fjhx/sale/entity/contract/po/Contract.java

@@ -357,4 +357,9 @@ public class Contract extends BasePo {
     @TableField(exist = false)
     private String sellCorporationName;
 
+    /**
+     * 报价有效期
+     */
+    private String effective;
+
 }

hx-sale/src/main/java/com/fjhx/sale/entity/contract/vo/ContractVo.java

@@ -5,6 +5,7 @@ import com.fjhx.sale.entity.contract.po.Contract;
 import com.fjhx.sale.entity.contract.po.ContractProduct;
 import com.fjhx.sale.entity.contract.po.ContractProject;
 import com.fjhx.sale.entity.contract.po.ContractShipment;
+import com.fjhx.sale.entity.sample.vo.SampleShipmentVo;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -149,5 +150,16 @@ public class ContractVo extends Contract {
      */
     private Integer dataType;
 
+    /**
+     * 合同模板名称
+     */
+    private String contractTemplateName;
+
+    /**
+     * 收款账号
+     */
+    private String shroffAccountName;
+
+
 }
 

hx-sale/src/main/java/com/fjhx/sale/entity/sample/po/Sample.java

@@ -245,6 +245,11 @@ public class Sample extends BasePo {
      */
     private BigDecimal rate;
 
+    /**
+     * 报价有效期
+     */
+    private String effective;
+
 
     /**
      * 交接单附件列表

hx-sale/src/main/java/com/fjhx/sale/entity/sample/vo/SampleShipmentVo.java

@@ -14,6 +14,14 @@ import lombok.Setter;
 @Setter
 public class SampleShipmentVo extends SampleShipment {
 
+    /**
+     * 商品编号
+     */
     private String productCode;
 
+    /**
+     * 商品名称
+     */
+    private String productName;
+
 }

hx-sale/src/main/java/com/fjhx/sale/service/contract/impl/ContractServiceImpl.java

@@ -21,10 +21,12 @@ import com.fjhx.account.service.account.AccountRequestFundsDetailService;
 import com.fjhx.area.service.SetCustomizeAreaId;
 import com.fjhx.area.utils.CustomizeAreaUtil;
 import com.fjhx.common.constant.SourceConstant;
+import com.fjhx.common.entity.contract.po.ContractTemplate;
 import com.fjhx.common.entity.corporation.po.Corporation;
 import com.fjhx.common.entity.currency.po.CurrencyRate;
 import com.fjhx.common.entity.documentary.bo.DocumentaryData;
 import com.fjhx.common.enums.FlowStatusEnum;
+import com.fjhx.common.service.contract.ContractTemplateService;
 import com.fjhx.common.service.corporation.CorporationService;
 import com.fjhx.common.service.currency.CurrencyRateService;
 import com.fjhx.common.service.documentary.GetDocumentaryBusinessTemplate;
@@ -170,6 +172,9 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
     @Autowired
     private DictTenantDataService dictTenantDataService;
 
+    @Autowired
+    private ContractTemplateService contractTemplateService;
+
     /**
      * 合同和样品单 下拉分页
      */
@@ -493,6 +498,28 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
         Assert.notEmpty(contract, "查询不到合同信息");
         ContractVo result = BeanUtil.toBean(contract, ContractVo.class);
 
+        //赋值模板名称
+        ContractTemplate contractTemplate = contractTemplateService.getById(result.getContractTemplateId());
+        if(ObjectUtil.isNotEmpty(contractTemplate)) {
+            result.setContractTemplateName(contractTemplate.getTemplateName());
+        }
+        // 卖方信息
+        Corporation corporation = corporationService.getById(result.getSellCorporationId());
+        if (ObjectUtil.isNotEmpty(corporation)) {
+            result.setSellCorporationName(corporation.getName());
+        }
+        //买方信息
+        Customer customer = customerService.getById(result.getBuyCorporationId());
+        if (ObjectUtil.isNotEmpty(corporation)) {
+            result.setSellCorporationName(corporation.getName());
+            result.setBuyCorporationName(customer.getName());
+        }
+        //赋值收款账号
+        AccountManagement accountManagement = accountManagementService.getById(result.getShroffAccountId());
+        if(ObjectUtil.isNotEmpty(accountManagement)){
+            result.setShroffAccountName(accountManagement.getName());
+        }
+
         List<ContractProduct> contractProductList = contractProductService.list(q -> q.eq(ContractProduct::getContractId, id));
         productInfoService.attributeAssign(contractProductList, ContractProduct::getProductId, (item, product) -> {
             item.setProductCnName(product.getName());

hx-sale/src/main/java/com/fjhx/sale/service/sample/impl/SampleServiceImpl.java

@@ -220,6 +220,7 @@ public class SampleServiceImpl extends ServiceImpl<SampleMapper, Sample> impleme
         List<SampleShipmentVo> sampleShipmentVos = BeanUtil.copyToList(sampleShipmentList, SampleShipmentVo.class);
         productInfoService.attributeAssign(sampleShipmentVos,SampleShipmentVo::getProductId, (item, productInfo) -> {
             item.setProductCode(productInfo.getCode());
+            item.setProductName(productInfo.getName());
         });
         result.setSampleShipmentLists(sampleShipmentVos);
         return result;