生成新车买卖合同增加客户联系电话

存放地点增加省市县

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java

@@ -821,6 +821,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
             map.put("carSaleCustomerName",crmCustomerTempVo.getName());
             map.put("carSaleIdNo",idNo);
             map.put("carSaleAddr",crmCustomerTempVo.getAddress());
+            map.put("phone",crmCustomerTempVo.getMobile());
         }
         //车架号集合
         List<String> stringList = new ArrayList<>();
@@ -1003,6 +1004,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
             map.put("carSaleCustomerName",crmCustomerTempVo.getName());
             map.put("carSaleIdNo",idNo);
             map.put("carSaleAddr",crmCustomerTempVo.getAddress());
+            map.put("phone",crmCustomerTempVo.getMobile());
         }
         //车架号集合
         List<String> stringList = new ArrayList<>();
@@ -1835,6 +1837,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
             map.put("carSaleCustomerName",crmCustomerTempVo.getName());
             map.put("carSaleIdNo",idNo);
             map.put("carSaleAddr",crmCustomerTempVo.getAddress());
+            map.put("phone",crmCustomerTempVo.getMobile());
         }
         //车架号集合
         List<String> stringList = new ArrayList<>();
@@ -1996,6 +1999,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
             map.put("carSaleCustomerName",crmCustomerTempVo.getName());
             map.put("carSaleIdNo",idNo);
             map.put("carSaleAddr",crmCustomerTempVo.getAddress());
+            map.put("phone",crmCustomerTempVo.getMobile());
         }
         //车架号集合
         List<String> stringList = new ArrayList<>();

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouse.java

@@ -59,7 +59,20 @@ public class ScmWarehouse extends BaseEntity {
     
 	@ApiModelProperty("名称")
     private String warehouseName; // 名称
-    
+
+    @ApiModelProperty("省sid")
+    private String provinceSid; // 省sid
+    @ApiModelProperty("province")
+    private String province; //
+    @ApiModelProperty("市sid")
+    private String citySid; // 市sid
+    @ApiModelProperty("city")
+    private String city; //
+    @ApiModelProperty("收货县区sid")
+    private String countySid; // 收货县区sid
+    @ApiModelProperty("county")
+    private String county; //
+
 	@ApiModelProperty("仓库属性")
     private String warehouseAttribute; // 仓库属性
     

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseDto.java

@@ -58,7 +58,20 @@ public class ScmWarehouseDto implements Dto {
     
 	@ApiModelProperty("名称")
     private String warehouseName; // 名称
-    
+
+	@ApiModelProperty("省sid")
+	private String provinceSid; // 省sid
+	@ApiModelProperty("province")
+	private String province; //
+	@ApiModelProperty("市sid")
+	private String citySid; // 市sid
+	@ApiModelProperty("city")
+	private String city; //
+	@ApiModelProperty("收货县区sid")
+	private String countySid; // 收货县区sid
+	@ApiModelProperty("county")
+	private String county; //
+
 	@ApiModelProperty("仓库属性")
     private String warehouseAttribute; // 仓库属性
     

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseVo.java

@@ -60,6 +60,19 @@ public class ScmWarehouseVo implements Vo {
     
 	@ApiModelProperty("名称")
     private String warehouseName; // 名称
+
+	@ApiModelProperty("省sid")
+	private String provinceSid; // 省sid
+	@ApiModelProperty("province")
+	private String province; //
+	@ApiModelProperty("市sid")
+	private String citySid; // 市sid
+	@ApiModelProperty("city")
+	private String city; //
+	@ApiModelProperty("收货县区sid")
+	private String countySid; // 收货县区sid
+	@ApiModelProperty("county")
+	private String county; //
     
 	@ApiModelProperty("仓库属性")
     private String warehouseAttribute; // 仓库属性