Merge branch 'test' into dev

hx-sale/src/main/java/com/fjhx/sale/entity/documents/po/DocumentsProduct.java

@@ -85,5 +85,10 @@ public class DocumentsProduct extends BasePo {
     @TableField(exist = false)
     private String productSpec;
 
+    /**
+     * 产品ID
+     */
+    @TableField(exist = false)
+    private Long productId;
 
 }

hx-sale/src/main/java/com/fjhx/sale/entity/documents/vo/DocumentsProductVo.java

@@ -13,5 +13,4 @@ import lombok.Setter;
 @Getter
 @Setter
 public class DocumentsProductVo extends DocumentsProduct {
-
 }

hx-sale/src/main/java/com/fjhx/sale/mapper/documents/DocumentsProductMapper.java

@@ -7,6 +7,8 @@ import com.fjhx.sale.entity.documents.vo.DocumentsProductVo;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 
 /**
  * <p>
@@ -23,4 +25,9 @@ public interface DocumentsProductMapper extends BaseMapper<DocumentsProduct> {
      */
     Page<DocumentsProductVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<DocumentsProduct> wrapper);
 
+    /**
+     * documentId 单证ID
+     * @return
+     */
+    List<DocumentsProduct> getDpList(@Param("documentId") Long documentId);
 }

hx-sale/src/main/java/com/fjhx/sale/service/documents/DocumentsProductService.java

@@ -5,6 +5,9 @@ import com.ruoyi.common.core.service.BaseService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.sale.entity.documents.vo.DocumentsProductVo;
 import com.fjhx.sale.entity.documents.dto.DocumentsProductSelectDto;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 
 /**
@@ -22,4 +25,9 @@ public interface DocumentsProductService extends BaseService<DocumentsProduct> {
      */
     Page<DocumentsProductVo> getPage(DocumentsProductSelectDto dto);
 
+    /**
+     * documentId 单证ID
+     * @return
+     */
+    List<DocumentsProduct> getDpList(Long documentId);
 }

hx-sale/src/main/java/com/fjhx/sale/service/documents/impl/DocumentsProductServiceImpl.java

@@ -10,6 +10,8 @@ import com.fjhx.sale.entity.documents.vo.DocumentsProductVo;
 import com.fjhx.sale.entity.documents.dto.DocumentsProductSelectDto;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 
+import java.util.List;
+
 
 /**
  * <p>
@@ -30,4 +32,14 @@ public class DocumentsProductServiceImpl extends ServiceImpl<DocumentsProductMap
         return page;
     }
 
+    /**
+     * 获取单证产品
+     * @param documentId
+     * @return
+     */
+    @Override
+    public List<DocumentsProduct> getDpList(Long documentId) {
+        return baseMapper.getDpList(documentId);
+    }
+
 }

hx-sale/src/main/java/com/fjhx/sale/service/documents/impl/DocumentsServiceImpl.java

@@ -203,9 +203,9 @@ public class DocumentsServiceImpl extends ServiceImpl<DocumentsMapper, Documents
         //查询卖方
         Corporation corporation = corporationService.getById(contractVo.getSellCorporationId());
         //查询单证货物
-        List<DocumentsProduct> documentsProducts = documentsProductService.list(Wrappers.<DocumentsProduct>query().lambda().eq(DocumentsProduct::getDocumentsId, documents.getId()));
+        List<DocumentsProduct> documentsProducts = documentsProductService.getDpList(documents.getId());
         // 赋值产品属性
-        productInfoService.attributeAssign(documentsProducts, DocumentsProduct::getBusinessId, (item, product) -> {
+        productInfoService.attributeAssign(documentsProducts, DocumentsProduct::getProductId, (item, product) -> {
             item.setProductCode(product.getCode());
             item.setProductUnit(product.getUnit());
             item.setProductName(product.getName());
@@ -344,7 +344,7 @@ public class DocumentsServiceImpl extends ServiceImpl<DocumentsMapper, Documents
             //总体积 立方米
             data.put("sumBomVolume", dataMap.get("sumBomVolume"));
             //成交方式
-            data.put("tradeModeName", contract.getPaymentMethod());
+            data.put("tradeModeName", contract.getTradeMethods());
             //运费
             data.put("freightPrice", BigDecimal.ZERO);//暂无
             // 保费
@@ -385,7 +385,7 @@ public class DocumentsServiceImpl extends ServiceImpl<DocumentsMapper, Documents
                     //成交单位
                     object.put("unit", product.getProductUnit());
                     //原产国（地区）
-                    object.put("countryChinese", corporation.getName());
+                    object.put("countryChinese", contract.getSellCountryName());
                     //总价与币制
                     object.put("sumPrice", "");
                     //成交单价

hx-sale/src/main/resources/mapper/documents/DocumentsProductMapper.xml

@@ -21,4 +21,13 @@
             ${ew.customSqlSegment}
     </select>
 
+    <select id="getDpList" resultType="com.fjhx.sale.entity.documents.po.DocumentsProduct">
+        SELECT
+            t1.*,
+            t2.product_id AS productId
+        FROM
+            documents_product t1
+        LEFT JOIN pack_detail_product t2 ON t1.business_id = t2.id
+        WHERE t1.documents_id = #{documentId}
+    </select>
 </mapper>