销售合同 样品单问题处理

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

@@ -86,6 +86,25 @@ public class ContractPdfInfoVo {
      */
     private String sellDetailedAddress;
 
+    /**
+     * 卖方公司国家
+     */
+    private String sellCountryNameEn;
+
+    /**
+     * 卖方公司省
+     */
+    private String sellProvinceNameEn;
+
+    /**
+     * 卖方公司市
+     */
+    private String sellCityNameEn;
+    /**
+     * 卖方公司详细地址
+     */
+    private String sellDetailedAddressEn;
+
 
     /**
      * 买方公司ID
@@ -244,6 +263,11 @@ public class ContractPdfInfoVo {
          */
         private String packMethod;
 
+        /**
+         * 商品型号
+         */
+        private String productModel;
+
 
 
     }

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

@@ -82,6 +82,26 @@ public class SamplePdfInfoVo {
      */
     private String sellCityName;
 
+
+    /**
+     * 卖方公司国家
+     */
+    private String sellCountryNameEn;
+
+    /**
+     * 卖方公司省
+     */
+    private String sellProvinceNameEn;
+
+    /**
+     * 卖方公司市
+     */
+    private String sellCityNameEn;
+    /**
+     * 卖方公司详细地址
+     */
+    private String sellDetailedAddressEn;
+
     /**
      * 卖方公司详细地址
      */
@@ -199,6 +219,10 @@ public class SamplePdfInfoVo {
      * 创建人名称
      */
     private String createUserName;
+    /**
+     * 创建人名称英文
+     */
+    private String createUserNameEn;
 
     /**
      * 创建人邮箱
@@ -256,6 +280,11 @@ public class SamplePdfInfoVo {
         private String packMethod;
 
 
+        /**
+         * 商品型号
+         */
+        private String productModel;
+
 
     }
 

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

@@ -1205,6 +1205,12 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
         contractPdfInfoVo.setSellCorporationName(corporation.getName());
         contractPdfInfoVo.setSellContactName(contract.getSellContactName());
         contractPdfInfoVo.setSellContactNumber(contract.getSellContactNumber());
+
+        //赋值英文名地址信息
+        contractPdfInfoVo.setSellCountryNameEn(corporation.getCountryEnStr());
+        contractPdfInfoVo.setSellProvinceNameEn(corporation.getProvinceEnStr());
+        contractPdfInfoVo.setSellCityNameEn(corporation.getCityEnStr());
+        contractPdfInfoVo.setSellDetailedAddressEn(corporation.getAddressEn());
     }
 
     /**
@@ -1289,13 +1295,16 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
             productIndo.setAmount(item.getAmount());
             productIndo.setProductName(item.getProductName());
 
+            productIndo.setProductModel(item.getProductModel());
+
+            JSONObject ehsdJson = JSONObject.parseObject(item.getEhsdJson());
+            if (ObjectUtil.isNotEmpty(ehsdJson)) {
+                productIndo.setPackMethod(ehsdJson.getString("packMethod"));
+            }
+
             if (ObjectUtil.isNotEmpty(productInfo)) {
                 productIndo.setProductRemark(productInfo.getRemark());
                 productIndo.setProductSpec(productInfo.getSpec());
-                JSONObject ehsdJson = JSONObject.parseObject(productInfo.getEhsdJson());
-                if (ObjectUtil.isNotEmpty(ehsdJson)) {
-                    productIndo.setPackMethod(ehsdJson.getString("packMethod"));
-                }
             }
 
             return productIndo;

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

@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.account.entity.account.po.AccountManagement;
 import com.fjhx.account.service.account.AccountManagementService;
+import com.fjhx.area.entity.po.CustomizeArea;
 import com.fjhx.area.utils.CustomizeAreaUtil;
 import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.common.entity.contract.po.ContractTemplate;
@@ -375,6 +376,12 @@ public class SampleServiceImpl extends ServiceImpl<SampleMapper, Sample> impleme
         contractPdfInfoVo.setSellCorporationName(corporation.getName());
         contractPdfInfoVo.setSellContactName(sample.getSellContactName());
         contractPdfInfoVo.setSellContactNumber(sample.getSellContactNumber());
+
+        //赋值英文名地址信息
+        contractPdfInfoVo.setSellCountryNameEn(corporation.getCountryEnStr());
+        contractPdfInfoVo.setSellProvinceNameEn(corporation.getProvinceEnStr());
+        contractPdfInfoVo.setSellCityNameEn(corporation.getCityEnStr());
+        contractPdfInfoVo.setSellDetailedAddressEn(corporation.getAddressEn());
     }
 
     /**
@@ -404,6 +411,7 @@ public class SampleServiceImpl extends ServiceImpl<SampleMapper, Sample> impleme
 
         Map<Long, String> areaMap = CustomizeAreaUtil.getAreaMapByIds(areaIdList);
 
+
         contractPdfInfoVo.setSellCountryName(sample.getSellCountryName());
         contractPdfInfoVo.setSellProvinceName(sample.getSellProvinceName());
         contractPdfInfoVo.setSellCityName(sample.getSellCityName());
@@ -433,8 +441,10 @@ public class SampleServiceImpl extends ServiceImpl<SampleMapper, Sample> impleme
         contractPdfInfoVo.setAdvanceRatio(sample.getAdvanceRatio());
 
         //赋值创建人名称
-        Map<Long, String> nickNameMapByIds = UserUtil.getNickNameMapByIds(Arrays.asList(sample.getCreateUser()));
-        contractPdfInfoVo.setCreateUserName(nickNameMapByIds.get(sample.getCreateUser()));
+        Map<Long, SysUser> nickNameMapByIds = UserUtil.getMapByIds(Arrays.asList(sample.getCreateUser()));
+        SysUser sysUser = nickNameMapByIds.get(sample.getCreateUser());
+        contractPdfInfoVo.setCreateUserName(sysUser.getNickName());//中文名
+        contractPdfInfoVo.setCreateUserName(sysUser.getNickNameEn());//英文名
         //赋值创建人邮箱地址
         List<EnterpriseMailbox> enterpriseMailboxList = enterpriseMailboxService.list(q -> q.eq(EnterpriseMailbox::getUserId, sample.getCreateUser()));
         String eMailAddress = "";
@@ -480,6 +490,7 @@ public class SampleServiceImpl extends ServiceImpl<SampleMapper, Sample> impleme
             productIndo.setProductPrice(item.getPrice());
             productIndo.setAmount(item.getAmount());
             productIndo.setProductName(item.getProductName());
+            productIndo.setProductModel(item.getProductModel());
 
             if (ObjectUtil.isNotEmpty(productInfo)) {
                 productIndo.setProductRemark(productInfo.getRemark());