导出完善

srm-module-code/src/main/java/org/jeecg/modules/b2bCode/entity/PurOrderB2b.java

@@ -55,17 +55,17 @@ public class    PurOrderB2b implements Serializable {
     @Dict(dicCode = "customer_confirm")
     private java.lang.Integer status;
     /**提交(submit)1是0否*/
-    @Excel(name = "提交(submit)1是0否", width = 15)
+    @Excel(name = "提交(submit)", width = 15,dicCode = "yes_or_no")
     @ApiModelProperty(value = "提交(submit)1是0否")
     @Dict(dicCode = "yes_or_no")
     private java.lang.String submit;
     /**关闭(close)1是0否*/
-    @Excel(name = "关闭(close)1是0否", width = 15)
+    @Excel(name = "关闭(close)", width = 15,dicCode = "yes_or_no")
     @ApiModelProperty(value = "关闭(close)1是0否")
     @Dict(dicCode = "yes_or_no")
     private java.lang.String close;
     /**删除状态(0-正常,1-已删除)*/
-    @Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+    //@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private java.lang.Integer delFlag;
@@ -80,7 +80,7 @@ public class    PurOrderB2b implements Serializable {
     @ApiModelProperty(value = "单据编码")
     private java.lang.String billCode;
     /**项目(project)*/
-    @Excel(name = "项目(project)", width = 15)
+    //@Excel(name = "项目(project)", width = 15)
     @ApiModelProperty(value = "项目(project)")
     private java.lang.String project;
     /**项目名称*/
@@ -100,12 +100,12 @@ public class    PurOrderB2b implements Serializable {
     @ApiModelProperty(value = "业务类型(busyness type)")
     private java.lang.String busynessType;
     /**优先级(priority)*/
-    @Excel(name = "优先级(priority)", width = 15)
+    @Excel(name = "优先级(priority)", width = 15,dicCode = "priority")
     @ApiModelProperty(value = "优先级(priority)")
     @Dict(dicCode = "priority")
     private java.lang.String priority;
     /**产品分类(production class)*/
-    @Excel(name = "产品分类(production class)", width = 15)
+    @Excel(name = "产品分类(production class)", width = 15,dictTable = "base_product_class", dicCode = "id", dicText = "name")
     @ApiModelProperty(value = "产品分类(production class)")
     @Dict(dictTable = "base_product_class", dicCode = "id", dicText = "name")
     private java.lang.String productionClass;

srm-module-code/src/main/java/org/jeecg/modules/b2bCode/entity/SaleOrderB2b.java

@@ -54,17 +54,17 @@ public class SaleOrderB2b implements Serializable {
     @Dict(dicCode = "yes_or_no")
     private java.lang.Integer status;
     /**提交(submit)1是0否*/
-    @Excel(name = "提交(submit)1是0否", width = 15)
+    @Excel(name = "提交(submit)", width = 15,dicCode = "yes_or_no")
     @ApiModelProperty(value = "提交(submit)1是0否")
     @Dict(dicCode = "yes_or_no")
     private java.lang.String submit;
     /**关闭(close)1是0否*/
-    @Excel(name = "关闭(close)1是0否", width = 15)
+    @Excel(name = "关闭(close)", width = 15,dicCode = "yes_or_no")
     @ApiModelProperty(value = "关闭(close)1是0否")
     @Dict(dicCode = "yes_or_no")
     private java.lang.String close;
     /**删除状态(0-正常,1-已删除)*/
-    @Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+    //@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private java.lang.Integer delFlag;
@@ -79,7 +79,7 @@ public class SaleOrderB2b implements Serializable {
     @ApiModelProperty(value = "单据编码")
     private java.lang.String billCode;
     /**项目(project)*/
-    @Excel(name = "项目(project)", width = 15)
+    //@Excel(name = "项目(project)", width = 15)
     @ApiModelProperty(value = "项目(project)")
     private java.lang.String project;
     /**项目名称*/
@@ -87,7 +87,7 @@ public class SaleOrderB2b implements Serializable {
     @ApiModelProperty(value = "项目名称")
     private java.lang.String projectName;
     /**客户(customer)*/
-    @Excel(name = "客户(customer)", width = 15)
+    //@Excel(name = "客户(customer)", width = 15)
     @ApiModelProperty(value = "客户(customer)")
     private java.lang.String customer;
     /**客户名称*/
@@ -107,12 +107,12 @@ public class SaleOrderB2b implements Serializable {
     @ApiModelProperty(value = "中间人名称")
     private java.lang.String intermediatorName;
     /**优先级(priority)*/
-    @Excel(name = "优先级(priority)", width = 15)
+    @Excel(name = "优先级(priority)", width = 15,dicCode = "priority")
     @ApiModelProperty(value = "优先级(priority)")
     @Dict(dicCode = "priority")
     private java.lang.String priority;
     /**产品分类(production class)*/
-    @Excel(name = "产品分类(production class)", width = 15)
+    @Excel(name = "产品分类(production class)", width = 15,dictTable = "base_product_class", dicCode = "id", dicText = "name")
     @ApiModelProperty(value = "产品分类(production class)")
     @Dict(dictTable = "base_product_class", dicCode = "id", dicText = "name")
     private java.lang.String productionClass;
@@ -167,7 +167,7 @@ public class SaleOrderB2b implements Serializable {
     @ApiModelProperty(value = "质保期(warranty period)")
     private java.lang.String warrantyPeriod;
     /**是否出口(export) 1是0否*/
-    @Excel(name = "是否出口(export) 1是0否", width = 15)
+    @Excel(name = "是否出口(export)", width = 15,dicCode = "yes_or_no")
     @ApiModelProperty(value = "是否出口(export) 1是0否")
     private java.lang.String isExport;
     /**包装要求(packageb requirement)*/
@@ -175,11 +175,11 @@ public class SaleOrderB2b implements Serializable {
     @ApiModelProperty(value = "包装要求(packageb requirement)")
     private java.lang.String packagebRequirement;
     /**销售部门(sale department)*/
-    @Excel(name = "销售部门(sale department)", width = 15)
+    //@Excel(name = "销售部门(sale department)", width = 15)
     @ApiModelProperty(value = "销售部门(sale department)")
     private java.lang.String saleDepartment;
     /**业务员(salesman)*/
-    @Excel(name = "业务员(salesman)", width = 15)
+    //@Excel(name = "业务员(salesman)", width = 15)
     @ApiModelProperty(value = "业务员(salesman)")
     private java.lang.String salesman;
     /**销售部门(sale department)名称*/

srm-module-code/src/main/java/org/jeecg/modules/b2bCode/vo/PurOrderB2bPage.java

@@ -58,7 +58,7 @@ public class PurOrderB2bPage {
 	@ApiModelProperty(value = "关闭(close)1是0否")
 	private java.lang.String close;
 	/**删除状态(0-正常,1-已删除)*/
-//	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+//	//@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
 	@ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
 	private java.lang.Integer delFlag;
 	/**单据日期*/
@@ -90,7 +90,7 @@ public class PurOrderB2bPage {
 	@ApiModelProperty(value = "业务类型(busyness type)")
 	private java.lang.String busynessType;
 	/**优先级(priority)*/
-	@Excel(name = "优先级(priority)", width = 15, dicCode = "priority")
+	@Excel(name = "优先级(priority)", width = 15,dicCode = "priority")
 	@ApiModelProperty(value = "优先级(priority)")
 	private java.lang.String priority;
 	/**产品分类(production class)*/

srm-module-code/src/main/java/org/jeecg/modules/b2bCode/vo/SaleOrderB2bPage.java

@@ -97,7 +97,7 @@ public class SaleOrderB2bPage {
 	@ApiModelProperty(value = "中间人名称")
 	private java.lang.String intermediatorName;
 	/**优先级(priority)*/
-	@Excel(name = "优先级(priority)", width = 15, dicCode = "priority")
+	@Excel(name = "优先级(priority)", width = 15,dicCode = "priority")
 	@ApiModelProperty(value = "优先级(priority)")
 	private java.lang.String priority;
 	/**产品分类(production class)*/

srm-module-code/src/main/java/org/jeecg/modules/baseCode/entity/BaseApproverDetails.java

@@ -76,7 +76,7 @@ public class BaseApproverDetails implements Serializable {
     /**
      * 删除状态(0-正常,1-已删除)
      */
-    @Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+    //@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;

srm-module-code/src/main/java/org/jeecg/modules/baseCode/entity/BaseApproverHead.java

@@ -50,7 +50,7 @@ public class BaseApproverHead implements Serializable {
     @ApiModelProperty(value = "更新时间")
     private Date updateTime;
 	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+	//@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;

srm-module-code/src/main/java/org/jeecg/modules/baseCode/entity/BaseApproverSet.java

@@ -55,7 +55,7 @@ public class BaseApproverSet implements Serializable {
     @Dict(dicCode = "yes_or_no")
     private Integer status;
 	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+	//@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;

srm-module-code/src/main/java/org/jeecg/modules/baseCode/entity/BaseApproverSetInfo.java

@@ -53,7 +53,7 @@ public class BaseApproverSetInfo implements Serializable {
     @ApiModelProperty(value = "状态(1-启用,0-停用)")
     private Integer status;
 	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+	//@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;

srm-module-code/src/main/java/org/jeecg/modules/baseCode/entity/BaseCompanyInformation.java

@@ -62,7 +62,7 @@ public class BaseCompanyInformation implements Serializable {
     @Dict(dicCode = "valid_status")
     private Integer status;
 	/**删除状态(0-正常,1-已删除)*/
-//	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+//	//@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;

srm-module-code/src/main/java/org/jeecg/modules/baseCode/entity/BaseExchangeRate.java

@@ -61,7 +61,7 @@ public class BaseExchangeRate implements Serializable {
     @ApiModelProperty(value = "状态(1-启用,0-停用)")
     private Integer status;
 	/**删除状态(0-正常,1-已删除)*/
-//	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+//	//@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;

srm-module-code/src/main/java/org/jeecg/modules/baseCode/entity/BaseProductArchive.java

@@ -62,7 +62,7 @@ public class BaseProductArchive implements Serializable {
     @Dict(dicCode = "valid_status")
     private Integer status;
 	/**删除状态(0-正常,1-已删除)*/
-//	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+//	//@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;

srm-module-code/src/main/java/org/jeecg/modules/baseCode/entity/BaseProductClass.java

@@ -61,7 +61,7 @@ public class BaseProductClass implements Serializable {
     @ApiModelProperty(value = "状态(1-正常,2-冻结)")
     private Integer status;
 	/**删除状态(0-正常,1-已删除)*/
-//	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+//	//@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;

srm-module-code/src/main/java/org/jeecg/modules/baseCode/entity/BaseProjectArchive.java

@@ -65,7 +65,7 @@ public class BaseProjectArchive implements Serializable {
     @ApiModelProperty(value = "状态(1-启用,0-停用)")
     private Integer status;
 	/**删除状态(0-正常,1-已删除)*/
-//	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+//	//@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;
@@ -78,7 +78,7 @@ public class BaseProjectArchive implements Serializable {
     @ApiModelProperty(value = "编码")
     private String code;
 	/**客户*/
-	@Excel(name = "客户(customer)", width = 15)
+	//@Excel(name = "客户(customer)", width = 15)
     @ApiModelProperty(value = "客户")
     @Dict(dictTable = "cusp_customer_profile", dicCode = "id", dicText = "name")
     private String customerId;

srm-module-code/src/main/java/org/jeecg/modules/baseCode/entity/BaseShipArchive.java

@@ -60,7 +60,7 @@ public class BaseShipArchive implements Serializable {
     @Dict(dicCode = "valid_status")
     private Integer status;
 	/**删除状态(0-正常,1-已删除)*/
-//	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+//	//@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;

srm-module-code/src/main/java/org/jeecg/modules/baseCode/entity/BaseShipArchiveAccessories.java

@@ -61,7 +61,7 @@ public class BaseShipArchiveAccessories implements Serializable {
     @ApiModelProperty(value = "状态(1-启用,0-停用)")
     private Integer status;
 	/**删除状态(0-正常,1-已删除)*/
-//	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+//	//@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;

srm-module-code/src/main/java/org/jeecg/modules/baseCode/entity/BaseShipArchiveRelateCustomer.java

@@ -61,7 +61,7 @@ public class BaseShipArchiveRelateCustomer implements Serializable {
     @ApiModelProperty(value = "状态(1-启用,0-停用)")
     private Integer status;
 	/**删除状态(0-正常,1-已删除)*/
-//	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+//	//@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;

srm-module-code/src/main/java/org/jeecg/modules/baseCode/entity/BaseTemplates.java

@@ -61,7 +61,7 @@ public class BaseTemplates implements Serializable {
     @ApiModelProperty(value = "状态(1-启用,0-停用)")
     private Integer status;
 	/**删除状态(0-正常,1-已删除)*/
-//	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+//	//@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;

srm-module-code/src/main/java/org/jeecg/modules/baseCode/entity/SerialPattern.java

@@ -77,7 +77,7 @@ public class SerialPattern implements Serializable {
     @ApiModelProperty(value = "状态(1-启用,0-停用)")
     private Integer status;
 	/**删除状态(0-正常,1-已删除)*/
-//	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+//	//@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;

srm-module-code/src/main/java/org/jeecg/modules/baseCode/vo/BaseApproverHeadPage.java

@@ -46,7 +46,7 @@ public class BaseApproverHeadPage {
 	@ApiModelProperty(value = "更新时间")
     private Date updateTime;
 	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+	//@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
 	@ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     private Integer delFlag;
 	/**审批状态(0-审批中,1-审批通过，-1 驳回)*/

srm-module-code/src/main/java/org/jeecg/modules/baseCode/vo/BaseApproverSetPage.java

@@ -50,7 +50,7 @@ public class BaseApproverSetPage {
 	@ApiModelProperty(value = "状态(1-启用,0-停用)")
     private Integer status;
 	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+	//@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
 	@ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     private Integer delFlag;
 	/**表单全称*/

srm-module-code/src/main/java/org/jeecg/modules/cuspCode/entity/CuspCustomerProfile.java

@@ -38,6 +38,11 @@ public class CuspCustomerProfile implements Serializable {
     private String createBy;
     private String sysOrgCode;
 
+    //隶属部门
+    @Excel(name = "隶属部门(Subordinate depart)", width = 15,dictTable = "sys_depart", dicCode = "id", dicText = "depart_name")
+    @Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name")
+    private String subordinateDepart;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@@ -56,7 +61,7 @@ public class CuspCustomerProfile implements Serializable {
     @ApiModelProperty(value = "状态(1-启用,0-停用)")
     private Integer status;
 	/**删除状态(0-正常,1-已删除)*/
-//	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+//	//@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;
@@ -145,7 +150,7 @@ public class CuspCustomerProfile implements Serializable {
     @ApiModelProperty(value = "中间人佣金")
     private java.math.BigDecimal intermediatorCommission;
 	/**优先级*/
-	@Excel(name = "优先级(priority)", width = 15)
+	@Excel(name = "优先级(priority)", width = 15,dicCode = "priority")
     @ApiModelProperty(value = "优先级")
     private String priority;
 	/**备注*/

srm-module-code/src/main/java/org/jeecg/modules/cuspCode/entity/CuspCustomerProfileMan.java

@@ -55,7 +55,7 @@ public class CuspCustomerProfileMan implements Serializable {
     @ApiModelProperty(value = "状态(1-启用,0-停用)")
     private Integer status;
 	/**删除状态(0-正常,1-已删除)*/
-//	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+//	//@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;

srm-module-code/src/main/java/org/jeecg/modules/cuspCode/entity/CuspIntermediator.java

@@ -62,7 +62,7 @@ public class CuspIntermediator implements Serializable {
     @Dict(dicCode = "valid_status")
     private Integer status;
 	/**删除状态(0-正常,1-已删除)*/
-//	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+//	//@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;

srm-module-code/src/main/java/org/jeecg/modules/cuspCode/entity/CuspSupplierEvaluation.java

@@ -57,7 +57,7 @@ public class CuspSupplierEvaluation implements Serializable {
 //    @Dict(dicCode = "valid_status")
     private Integer status;
 	/**删除状态(0-正常,1-已删除)*/
-//	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+//	//@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;
@@ -90,7 +90,7 @@ public class CuspSupplierEvaluation implements Serializable {
     @ApiModelProperty(value = "备注")
     private String notes;
 	/**提交(1-是 ，0-否)*/
-	@Excel(name = "提交(submit)", width = 15)
+	@Excel(name = "提交(submit)", width = 15,dicCode = "yes_or_no")
     @ApiModelProperty(value = "提交(1-是 ，0-否)")
     private Integer submit;
     /**价格得分*/

srm-module-code/src/main/java/org/jeecg/modules/cuspCode/entity/CuspSupplierEvaluationScore.java

@@ -55,7 +55,7 @@ public class CuspSupplierEvaluationScore implements Serializable {
     @ApiModelProperty(value = "状态(1-启用,0-停用)")
     private Integer status;
 	/**删除状态(0-正常,1-已删除)*/
-	// @Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+	// //@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;

srm-module-code/src/main/java/org/jeecg/modules/cuspCode/entity/CuspSupplierProfile.java

@@ -43,6 +43,12 @@ public class CuspSupplierProfile implements Serializable {
     private String createBy;
     private String sysOrgCode;
 
+    //隶属部门
+    @Excel(name = "隶属部门(Subordinate depart)", width = 15,dictTable = "sys_depart", dicCode = "id", dicText = "depart_name")
+    @Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name")
+    private String subordinateDepart;
+
+
     /**
      * 创建时间
      */
@@ -72,7 +78,7 @@ public class CuspSupplierProfile implements Serializable {
     /**
      * 删除状态(0-正常,1-已删除)
      */
-//	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+//	//@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;

srm-module-code/src/main/java/org/jeecg/modules/cuspCode/entity/CuspSupplierProfileCatalog.java

@@ -59,7 +59,7 @@ public class CuspSupplierProfileCatalog implements Serializable {
     @ApiModelProperty(value = "状态(1-启用,0-停用)")
     private Integer status;
 	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+	//@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;

srm-module-code/src/main/java/org/jeecg/modules/cuspCode/entity/CuspSupplierProfileMan.java

@@ -55,7 +55,7 @@ public class CuspSupplierProfileMan implements Serializable {
     @ApiModelProperty(value = "状态(1-启用,0-停用)")
     private Integer status;
 	/**删除状态(0-正常,1-已删除)*/
-	// @Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+	// //@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;

srm-module-code/src/main/java/org/jeecg/modules/cuspCode/entity/CuspSupplierProfileQualification.java

@@ -74,7 +74,7 @@ public class CuspSupplierProfileQualification implements Serializable {
     /**
      * 删除状态(0-正常,1-已删除)
      */
-    //  @Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+    //  //@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;

srm-module-code/src/main/java/org/jeecg/modules/cuspCode/vo/CuspCustomerProfilePage.java

@@ -2,6 +2,7 @@ package org.jeecg.modules.cuspCode.vo;
 
 import java.util.List;
 
+import org.jeecg.common.aspect.annotation.Dict;
 import org.jeecg.modules.cuspCode.entity.CuspCustomerProfileMan;
 import lombok.Data;
 import org.jeecgframework.poi.excel.annotation.Excel;
@@ -44,9 +45,16 @@ public class CuspCustomerProfilePage {
 	@ApiModelProperty(value = "更新时间")
     private Date updateTime;
 	/**删除状态(0-正常,1-已删除)*/
-//	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+//	//@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
 	@ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     private Integer delFlag;
+
+	//隶属部门
+	@Excel(name = "隶属部门(Subordinate depart)", width = 15,dictTable = "sys_depart", dicCode = "id", dicText = "depart_name")
+	@Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name")
+	private String subordinateDepart;
+
+
 	/**编码*/
 	@Excel(name = "编码(code)", width = 15)
 	@ApiModelProperty(value = "编码")
@@ -128,7 +136,7 @@ public class CuspCustomerProfilePage {
 	@ApiModelProperty(value = "中间人佣金")
     private java.math.BigDecimal intermediatorCommission;
 	/**优先级*/
-	@Excel(name = "优先级(priority)", width = 15)
+	@Excel(name = "优先级(priority)", width = 15,dicCode = "priority")
 	@ApiModelProperty(value = "优先级")
     private String priority;
 	/**备注*/

srm-module-code/src/main/java/org/jeecg/modules/cuspCode/vo/CuspSupplierEvaluationPage.java

@@ -48,7 +48,7 @@ public class CuspSupplierEvaluationPage {
 	@ApiModelProperty(value = "状态(1-启用,0-停用)")
     private Integer status;
 	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+	//@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
 	@ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     private Integer delFlag;
 	/**单据日期*/
@@ -78,7 +78,7 @@ public class CuspSupplierEvaluationPage {
 	@ApiModelProperty(value = "备注")
     private String notes;
 	/**提交(1-是 ，0-否)*/
-	@Excel(name = "提交(submit)", width = 15)
+	@Excel(name = "提交(submit)", width = 15,dicCode = "yes_or_no")
 	@ApiModelProperty(value = "提交(1-是 ，0-否)")
     private Integer submit;
 	/**价格得分*/

srm-module-code/src/main/java/org/jeecg/modules/cuspCode/vo/CuspSupplierProfilePage.java

@@ -2,6 +2,7 @@ package org.jeecg.modules.cuspCode.vo;
 
 import java.util.List;
 
+import org.jeecg.common.aspect.annotation.Dict;
 import org.jeecg.modules.cuspCode.entity.CuspSupplierProfileCatalog;
 import org.jeecg.modules.cuspCode.entity.CuspSupplierProfileMan;
 import org.jeecg.modules.cuspCode.entity.CuspSupplierProfileQualification;
@@ -45,12 +46,19 @@ public class CuspSupplierProfilePage {
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
 	@ApiModelProperty(value = "更新时间")
     private Date updateTime;
+
+	//隶属部门
+	@Excel(name = "隶属部门(Subordinate depart)", width = 15,dictTable = "sys_depart", dicCode = "id", dicText = "depart_name")
+	@Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name")
+	private String subordinateDepart;
+
+
 	/**状态(1-启用,0-停用)*/
 	@Excel(name = "状态(status)", width = 15)
 	@ApiModelProperty(value = "状态(1-启用,0-停用)")
     private Integer status;
 	/**删除状态(0-正常,1-已删除)*/
-//	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+//	//@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
 	@ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     private Integer delFlag;
 	/**编码*/

srm-module-code/src/main/java/org/jeecg/modules/platCode/entity/PlatCommissionContract.java

@@ -58,12 +58,12 @@ public class PlatCommissionContract implements Serializable {
     @Dict(dicCode = "yes_or_no")
     private Integer status;
 	/**提交(submit)1是0否*/
-	@Excel(name = "提交(submit)1是0否", width = 15)
+	@Excel(name = "提交(submit)", width = 15,dicCode = "yes_or_no")
     @ApiModelProperty(value = "提交(submit)1是0否")
     @Dict(dicCode = "yes_or_no")
     private String submit;
 	/**关闭(close)1是0否*/
-	@Excel(name = "关闭(close)1是0否", width = 15)
+	@Excel(name = "关闭(close)", width = 15,dicCode = "yes_or_no")
     @ApiModelProperty(value = "关闭(close)1是0否")
     @Dict(dicCode = "yes_or_no")
     private String close;
@@ -72,7 +72,7 @@ public class PlatCommissionContract implements Serializable {
     @Dict(dicCode = "yes_or_no")
     private Integer isUsed;
 	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+	//@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;
@@ -99,7 +99,7 @@ public class PlatCommissionContract implements Serializable {
     @ApiModelProperty(value = "币种(currency)")
     private String currency;
 	/**销售部门(sale department)*/
-	@Excel(name = "销售部门(sale department)", width = 15)
+	//@Excel(name = "销售部门(sale department)", width = 15)
     @ApiModelProperty(value = "销售部门(sale department)")
     private String saleDepartmen;
 	/**销售部门名称*/
@@ -107,7 +107,7 @@ public class PlatCommissionContract implements Serializable {
     @ApiModelProperty(value = "销售部门名称")
     private String saleDepartmenName;
 	/**业务员(salesman)*/
-	@Excel(name = "业务员(salesman)", width = 15)
+	//@Excel(name = "业务员(salesman)", width = 15)
     @ApiModelProperty(value = "业务员(salesman)")
     private String salesman;
 	/**业务员名称*/

srm-module-code/src/main/java/org/jeecg/modules/platCode/entity/PlatCommissionContractProduct.java

@@ -54,7 +54,7 @@ public class PlatCommissionContractProduct implements Serializable {
     @ApiModelProperty(value = "状态(1-启用,0-停用)")
     private Integer status;
 	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+	//@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;

srm-module-code/src/main/java/org/jeecg/modules/platCode/entity/PlatCommissionOrder.java

@@ -60,12 +60,12 @@ public class PlatCommissionOrder implements Serializable {
     @Dict(dicCode = "yes_or_no")
     private Integer status;
 	/**提交(submit)1是0否*/
-	@Excel(name = "提交(submit)1是0否", width = 15)
+	@Excel(name = "提交(submit)", width = 15,dicCode = "yes_or_no")
     @ApiModelProperty(value = "提交(submit)1是0否")
     @Dict(dicCode = "yes_or_no")
     private String submit;
 	/**关闭(close)1是0否*/
-	@Excel(name = "关闭(close)1是0否", width = 15)
+	@Excel(name = "关闭(close)", width = 15,dicCode = "yes_or_no")
     @ApiModelProperty(value = "关闭(close)1是0否")
     @Dict(dicCode = "yes_or_no")
     private String close;
@@ -80,7 +80,7 @@ public class PlatCommissionOrder implements Serializable {
     @Dict(dicCode = "yes_or_no")
     private String applyInvoice;
 	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+	//@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;
@@ -107,7 +107,7 @@ public class PlatCommissionOrder implements Serializable {
     @ApiModelProperty(value = "币种(currency)")
     private String currency;
 	/**客户(customer)*/
-	@Excel(name = "客户(customer)", width = 15)
+	//@Excel(name = "客户(customer)", width = 15)
     @ApiModelProperty(value = "客户(customer)")
     private String customerId;
 	/**客户名称*/
@@ -127,7 +127,7 @@ public class PlatCommissionOrder implements Serializable {
     @ApiModelProperty(value = "佣金(commission)")
     private java.math.BigDecimal commission;
 	/**销售部门(sale department)*/
-	@Excel(name = "销售部门(sale department)", width = 15)
+	//@Excel(name = "销售部门(sale department)", width = 15)
     @ApiModelProperty(value = "销售部门(sale department)")
     private String saleDepartmen;
 	/**销售部门名称*/
@@ -135,7 +135,7 @@ public class PlatCommissionOrder implements Serializable {
     @ApiModelProperty(value = "销售部门名称")
     private String saleDepartmenName;
 	/**业务员(salesman)*/
-	@Excel(name = "业务员(salesman)", width = 15)
+	//@Excel(name = "业务员(salesman)", width = 15)
     @ApiModelProperty(value = "业务员(salesman)")
     private String salesman;
 	/**业务员名称*/

srm-module-code/src/main/java/org/jeecg/modules/platCode/entity/PlatCommissionOrderProduct.java

@@ -54,7 +54,7 @@ public class PlatCommissionOrderProduct implements Serializable {
     @ApiModelProperty(value = "状态(1-启用,0-停用)")
     private Integer status;
 	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+	//@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;

srm-module-code/src/main/java/org/jeecg/modules/platCode/vo/PlatCommissionContractPage.java

@@ -53,17 +53,17 @@ public class PlatCommissionContractPage {
 	@ApiModelProperty(value = "状态(1-启用,0-停用)")
     private Integer status;
 	/**提交(submit)1是0否*/
-	@Excel(name = "提交(submit)1是0否", width = 15)
+	@Excel(name = "提交(submit)", width = 15,dicCode = "yes_or_no")
 	@ApiModelProperty(value = "提交(submit)1是0否")
     private String submit;
 	/**关闭(close)1是0否*/
-	@Excel(name = "关闭(close)1是0否", width = 15)
+	@Excel(name = "关闭(close)", width = 15,dicCode = "yes_or_no")
 	@ApiModelProperty(value = "关闭(close)1是0否")
     private String close;
 	@ApiModelProperty(value = "是否被佣金订单使用 1是0否")
 	private Integer isUsed;
 	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+	//@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
 	@ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     private Integer delFlag;
 	/**单据日期*/
@@ -89,7 +89,7 @@ public class PlatCommissionContractPage {
 	@ApiModelProperty(value = "币种(currency)")
     private String currency;
 	/**销售部门(sale department)*/
-	@Excel(name = "销售部门(sale department)", width = 15)
+	//@Excel(name = "销售部门(sale department)", width = 15)
 	@ApiModelProperty(value = "销售部门(sale department)")
     private String saleDepartmen;
 	/**销售部门名称*/
@@ -97,7 +97,7 @@ public class PlatCommissionContractPage {
 	@ApiModelProperty(value = "销售部门名称")
     private String saleDepartmenName;
 	/**业务员(salesman)*/
-	@Excel(name = "业务员(salesman)", width = 15)
+	//@Excel(name = "业务员(salesman)", width = 15)
 	@ApiModelProperty(value = "业务员(salesman)")
     private String salesman;
 	/**业务员名称*/

srm-module-code/src/main/java/org/jeecg/modules/platCode/vo/PlatCommissionOrderPage.java

@@ -55,11 +55,11 @@ public class PlatCommissionOrderPage {
 	@ApiModelProperty(value = "状态(1-启用,0-停用)")
     private Integer status;
 	/**提交(submit)1是0否*/
-	@Excel(name = "提交(submit)1是0否", width = 15)
+	@Excel(name = "提交(submit)", width = 15,dicCode = "yes_or_no")
 	@ApiModelProperty(value = "提交(submit)1是0否")
     private String submit;
 	/**关闭(close)1是0否*/
-	@Excel(name = "关闭(close)1是0否", width = 15)
+	@Excel(name = "关闭(close)", width = 15,dicCode = "yes_or_no")
 	@ApiModelProperty(value = "关闭(close)1是0否")
     private String close;
 	/**供应商回款(supplier payment)1是0否*/
@@ -71,7 +71,7 @@ public class PlatCommissionOrderPage {
 	@ApiModelProperty(value = "开票申请(apply invoice)1是0否")
     private String applyInvoice;
 	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+	//@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
 	@ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     private Integer delFlag;
 	/**单据日期*/
@@ -97,7 +97,7 @@ public class PlatCommissionOrderPage {
 	@ApiModelProperty(value = "币种(currency)")
     private String currency;
 	/**客户(customer)*/
-	@Excel(name = "客户(customer)", width = 15)
+	//@Excel(name = "客户(customer)", width = 15)
 	@ApiModelProperty(value = "客户(customer)")
     private String customerId;
 	/**客户名称*/
@@ -117,7 +117,7 @@ public class PlatCommissionOrderPage {
 	@ApiModelProperty(value = "佣金(commission)")
     private java.math.BigDecimal commission;
 	/**销售部门(sale department)*/
-	@Excel(name = "销售部门(sale department)", width = 15)
+	//@Excel(name = "销售部门(sale department)", width = 15)
 	@ApiModelProperty(value = "销售部门(sale department)")
     private String saleDepartmen;
 	/**销售部门名称*/
@@ -125,7 +125,7 @@ public class PlatCommissionOrderPage {
 	@ApiModelProperty(value = "销售部门名称")
     private String saleDepartmenName;
 	/**业务员(salesman)*/
-	@Excel(name = "业务员(salesman)", width = 15)
+	//@Excel(name = "业务员(salesman)", width = 15)
 	@ApiModelProperty(value = "业务员(salesman)")
     private String salesman;
 	/**业务员名称*/

srm-module-code/src/main/java/org/jeecg/modules/purCode/controller/PurDeliveryNoteController.java

@@ -19,7 +19,9 @@ import org.jeecg.modules.baseCode.service.ISerialPatternService;
 import org.jeecg.modules.purCode.entity.*;
 import org.jeecg.modules.purCode.vo.PurDeliveryNoteAlert;
 import org.jeecg.modules.purCode.vo.PurOrderAlert;
+import org.jeecg.modules.saleCode.entity.SaleDelivery;
 import org.jeecg.modules.saleCode.entity.SaleOrder;
+import org.jeecg.modules.saleCode.vo.SaleDeliveryAlert;
 import org.jeecg.modules.storeCode.entity.StorePurchaseIn;
 import org.jeecg.modules.storeCode.service.IStorePurchaseInService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
@@ -112,13 +114,31 @@ public class PurDeliveryNoteController {
 	 */
 	@ApiOperation(value="到货单(delivery note)-分页列表到货单弹框主表", notes="到货单(delivery note)-分页列表到货单弹框主表")
 	@GetMapping(value = "/listHead")
-	public Result<IPage<PurDeliveryNote>> listHead(PurDeliveryNote purDeliveryNote,
+	public Result<IPage<PurDeliveryNote>> listHead(PurDeliveryNoteAlert purDeliveryNote,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
-        QueryWrapper<PurDeliveryNote> queryWrapper = QueryGenerator.initQueryWrapper(purDeliveryNote, req.getParameterMap());
-		Page<PurDeliveryNote> page = new Page<PurDeliveryNote>(pageNo, pageSize);
-		IPage<PurDeliveryNote> pageList = purDeliveryNoteService.page(page, queryWrapper);
+
+		QueryWrapper<PurDeliveryNoteAlert> queryWrapper1 = QueryGenerator.initQueryWrapper(purDeliveryNote, req.getParameterMap());
+		Page<PurDeliveryNote> page = new Page<>(pageNo, pageSize);
+
+		Page<PurDeliveryNoteAlert> page2 = new Page<>(-1, -1);
+
+		IPage<PurDeliveryNoteAlert> pageList2 = purDeliveryNoteArrivalService.purDeliveryNoteArrivalAlert(page2, queryWrapper1);
+
+		IPage<PurDeliveryNote> pageList = new Page<>();
+
+		QueryWrapper<PurDeliveryNote> queryWrapper = new QueryWrapper<>();
+
+		if (pageList2.getRecords().size() > 0) {
+			List<String> codeList = pageList2.getRecords().stream().map(PurDeliveryNoteAlert::getHeadId).collect(Collectors.toList());
+			queryWrapper.in("id", codeList);
+		} else {
+			return Result.OK(pageList);
+		}
+
+//		queryWrapper.orderByDesc("create_time");
+		pageList = purDeliveryNoteService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
 //

srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurAdvanceCommission.java

@@ -70,7 +70,7 @@ public class PurAdvanceCommission implements Serializable {
     @Dict(dicCode = "yes_or_no")
     private String payment;
 	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+	//@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;

srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurAdvancePayment.java

@@ -55,7 +55,7 @@ public class PurAdvancePayment implements Serializable {
     @Dict(dicCode = "yes_or_no")
     private String approve;
 	/**提交(submit)1是0否*/
-	@Excel(name = "提交(submit)1是0否", width = 15)
+	@Excel(name = "提交(submit)", width = 15,dicCode = "yes_or_no")
     @ApiModelProperty(value = "提交(submit)1是0否")
     @Dict(dicCode = "yes_or_no")
     private String submit;

srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurCommissionRequest.java

@@ -57,7 +57,7 @@ public class PurCommissionRequest implements Serializable {
     @Dict(dicCode = "yes_or_no")
     private String approve;
 	/**提交(submit)1是0否*/
-	@Excel(name = "提交(submit)1是0否", width = 15)
+	@Excel(name = "提交(submit)", width = 15,dicCode = "yes_or_no")
     @ApiModelProperty(value = "提交(submit)1是0否")
     @Dict(dicCode = "yes_or_no")
     private String submit;
@@ -67,7 +67,7 @@ public class PurCommissionRequest implements Serializable {
     @Dict(dicCode = "yes_or_no")
     private String payment;
 	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+	//@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;

srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurDeliveryNodeShip.java

@@ -55,7 +55,7 @@ public class PurDeliveryNodeShip implements Serializable {
     @ApiModelProperty(value = "状态(1-启用,0-停用)")
     private Integer status;
 	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+	//@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;

srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurDeliveryNote.java

@@ -59,17 +59,17 @@ public class PurDeliveryNote implements Serializable {
     @ApiModelProperty(value = "状态(1-启用,0-停用)")
     private Integer status;
 	/**提交(submit)1是0否*/
-	@Excel(name = "提交(submit)1是0否", width = 15)
+	@Excel(name = "提交(submit)", width = 15,dicCode = "yes_or_no")
     @ApiModelProperty(value = "提交(submit)1是0否")
     @Dict(dicCode = "yes_or_no")
     private String submit;
 	/**关闭(close)1是0否*/
-	@Excel(name = "关闭(close)1是0否", width = 15)
+	@Excel(name = "关闭(close)", width = 15,dicCode = "yes_or_no")
     @ApiModelProperty(value = "关闭(close)1是0否")
     @Dict(dicCode = "yes_or_no")
     private String close;
 	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+	//@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;
@@ -84,7 +84,7 @@ public class PurDeliveryNote implements Serializable {
     @ApiModelProperty(value = "到货单号")
     private String billCode;
 	/**项目(project)*/
-	@Excel(name = "项目(project)", width = 15)
+	//@Excel(name = "项目(project)", width = 15)
     @ApiModelProperty(value = "项目(project)")
     private String project;
 	/**项目名称*/
@@ -104,12 +104,12 @@ public class PurDeliveryNote implements Serializable {
     @ApiModelProperty(value = "业务类型(busyness type)")
     private String busynessType;
 	/**优先级(priority)*/
-	@Excel(name = "优先级(priority)", width = 15)
+	@Excel(name = "优先级(priority)", width = 15,dicCode = "priority")
     @ApiModelProperty(value = "优先级(priority)")
     @Dict(dicCode = "priority")
     private String priority;
 	/**产品分类(production class)*/
-	@Excel(name = "产品分类(production class)", width = 15)
+	@Excel(name = "产品分类(production class)", width = 15,dictTable = "base_product_class", dicCode = "id", dicText = "name")
     @ApiModelProperty(value = "产品分类(production class)")
     @Dict(dictTable = "base_product_class", dicCode = "id", dicText = "name")
     private String productionClass;

srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurDeliveryNoteArrival.java

@@ -55,7 +55,7 @@ public class PurDeliveryNoteArrival implements Serializable {
     @ApiModelProperty(value = "状态(1-启用,0-停用)")
     private Integer status;
 	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+	//@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;

srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurInquiryForm.java

@@ -56,7 +56,7 @@ public class PurInquiryForm implements Serializable {
     @Dict(dicCode = "purchase_inquiry_status")
     private Integer status;
 	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+	//@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;
@@ -108,12 +108,12 @@ public class PurInquiryForm implements Serializable {
     @ApiModelProperty(value = "业务类型(busyness type)")
     private String busynessType;
 	/**优先级(priority)*/
-	@Excel(name = "优先级(priority)", width = 15)
+	@Excel(name = "优先级(priority)", width = 15,dicCode = "priority")
     @ApiModelProperty(value = "优先级(priority)")
     @Dict(dicCode = "priority")
     private String priority;
 	/**产品分类(production class)*/
-	@Excel(name = "产品分类(production class)", width = 15)
+	@Excel(name = "产品分类(production class)", width = 15,dictTable = "base_product_class", dicCode = "id", dicText = "name")
     @ApiModelProperty(value = "产品分类(production class)")
     @Dict(dictTable = "base_product_class", dicCode = "id", dicText = "name")
     private String productionClass;

srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurInquiryFormProduct.java

@@ -60,7 +60,7 @@ public class PurInquiryFormProduct implements Serializable {
     @ApiModelProperty(value = "状态(1-启用,0-停用)")
     private Integer status;
 	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+	//@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;

srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurInquiryFormShip.java

@@ -55,7 +55,7 @@ public class PurInquiryFormShip implements Serializable {
     @ApiModelProperty(value = "状态(1-启用,0-停用)")
     private Integer status;
 	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+	//@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;

srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurOrder.java

@@ -74,17 +74,17 @@ public class PurOrder implements Serializable {
     @Dict(dicCode = "customer_confirm")
     private Integer status;
 	/**提交(submit)1是0否*/
-	@Excel(name = "提交(submit)1是0否", width = 15)
+	@Excel(name = "提交(submit)", width = 15,dicCode = "yes_or_no")
     @ApiModelProperty(value = "提交(submit)1是0否")
     @Dict(dicCode = "yes_or_no")
     private String submit;
 	/**关闭(close)1是0否*/
-	@Excel(name = "关闭(close)1是0否", width = 15)
+	@Excel(name = "关闭(close)", width = 15,dicCode = "yes_or_no")
     @ApiModelProperty(value = "关闭(close)1是0否")
     @Dict(dicCode = "yes_or_no")
     private String close;
 	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+	//@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;
@@ -99,7 +99,7 @@ public class PurOrder implements Serializable {
     @ApiModelProperty(value = "单据编码")
     private String billCode;
 	/**项目(project)*/
-	@Excel(name = "项目(project)", width = 15)
+	//@Excel(name = "项目(project)", width = 15)
     @ApiModelProperty(value = "项目(project)")
     private String project;
 	/**项目名称*/
@@ -119,12 +119,12 @@ public class PurOrder implements Serializable {
     @ApiModelProperty(value = "业务类型(busyness type)")
     private String busynessType;
 	/**优先级(priority)*/
-	@Excel(name = "优先级(priority)", width = 15)
+	@Excel(name = "优先级(priority)", width = 15,dicCode = "priority")
     @ApiModelProperty(value = "优先级(priority)")
     @Dict(dicCode = "priority")
     private String priority;
 	/**产品分类(production class)*/
-	@Excel(name = "产品分类(production class)", width = 15)
+	@Excel(name = "产品分类(production class)", width = 15,dictTable = "base_product_class", dicCode = "id", dicText = "name")
     @ApiModelProperty(value = "产品分类(production class)")
     @Dict(dictTable = "base_product_class", dicCode = "id", dicText = "name")
     private String productionClass;

srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurOrderHis.java

@@ -77,15 +77,15 @@ public class PurOrderHis implements Serializable {
     @ApiModelProperty(value = "客户确认(1-已确认,0-未确认)")
     private Integer status;
 	/**提交(submit)1是0否*/
-	@Excel(name = "提交(submit)1是0否", width = 15)
+	@Excel(name = "提交(submit)", width = 15,dicCode = "yes_or_no")
     @ApiModelProperty(value = "提交(submit)1是0否")
     private String submit;
 	/**关闭(close)1是0否*/
-	@Excel(name = "关闭(close)1是0否", width = 15)
+	@Excel(name = "关闭(close)", width = 15,dicCode = "yes_or_no")
     @ApiModelProperty(value = "关闭(close)1是0否")
     private String close;
 	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+	//@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;
@@ -100,7 +100,7 @@ public class PurOrderHis implements Serializable {
     @ApiModelProperty(value = "单据编码")
     private String billCode;
 	/**项目(project)*/
-	@Excel(name = "项目(project)", width = 15)
+	//@Excel(name = "项目(project)", width = 15)
     @ApiModelProperty(value = "项目(project)")
     private String project;
 	/**项目名称*/
@@ -120,11 +120,11 @@ public class PurOrderHis implements Serializable {
     @ApiModelProperty(value = "业务类型(busyness type)")
     private String busynessType;
 	/**优先级(priority)*/
-	@Excel(name = "优先级(priority)", width = 15)
+	@Excel(name = "优先级(priority)", width = 15,dicCode = "priority")
     @ApiModelProperty(value = "优先级(priority)")
     private String priority;
 	/**产品分类(production class)*/
-	@Excel(name = "产品分类(production class)", width = 15)
+	@Excel(name = "产品分类(production class)", width = 15,dictTable = "base_product_class", dicCode = "id", dicText = "name")
     @ApiModelProperty(value = "产品分类(production class)")
     private String productionClass;
 	/**机型(model)*/

srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurOrderProductHis.java

@@ -57,7 +57,7 @@ public class PurOrderProductHis implements Serializable {
     @ApiModelProperty(value = "状态(1-启用,0-停用)")
     private Integer status;
 	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+	//@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;

srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurOrderShipHis.java

@@ -55,7 +55,7 @@ public class PurOrderShipHis implements Serializable {
     @ApiModelProperty(value = "状态(1-启用,0-停用)")
     private Integer status;
 	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+	//@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;

srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurPayment.java

@@ -57,12 +57,12 @@ public class PurPayment implements Serializable {
     @ApiModelProperty(value = "更新时间")
     private Date updateTime;
 	/**提交(submit)1是0否*/
-	@Excel(name = "提交(submit)1是0否", width = 15)
+	@Excel(name = "提交(submit)", width = 15,dicCode = "yes_or_no")
     @ApiModelProperty(value = "提交(submit)1是0否")
     @Dict(dicCode = "yes_or_no")
     private String submit;
 	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+	//@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;

srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurPurchaseQuotation.java

@@ -58,7 +58,7 @@ public class PurPurchaseQuotation implements Serializable {
     @Dict(dicCode = "yes_or_no")
     private Integer status;
 	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+	//@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;
@@ -104,12 +104,12 @@ public class PurPurchaseQuotation implements Serializable {
     @ApiModelProperty(value = "业务类型(busyness type)")
     private String busynessType;
 	/**优先级(priority)*/
-	@Excel(name = "优先级(priority)", width = 15)
+	@Excel(name = "优先级(priority)", width = 15,dicCode = "priority")
     @ApiModelProperty(value = "优先级(priority)")
     @Dict(dicCode = "priority")
     private String priority;
 	/**产品分类(production class)*/
-	@Excel(name = "产品分类(production class)", width = 15)
+	@Excel(name = "产品分类(production class)", width = 15,dictTable = "base_product_class", dicCode = "id", dicText = "name")
     @ApiModelProperty(value = "产品分类(production class)")
     @Dict(dictTable = "base_product_class", dicCode = "id", dicText = "name")
     private String productionClass;

srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurPurchaseQuotationProduct.java

@@ -55,7 +55,7 @@ public class PurPurchaseQuotationProduct implements Serializable {
     @ApiModelProperty(value = "状态(1-启用,0-停用)")
     private Integer status;
 	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+	//@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;

srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurPurchaseQuotationShip.java

@@ -55,7 +55,7 @@ public class PurPurchaseQuotationShip implements Serializable {
     @ApiModelProperty(value = "状态(1-启用,0-停用)")
     private Integer status;
 	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+	//@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;

srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurQuotationSelection.java

@@ -53,7 +53,7 @@ public class PurQuotationSelection implements Serializable {
     @ApiModelProperty(value = "更新时间")
     private Date updateTime;
 	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+	//@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;
@@ -85,12 +85,12 @@ public class PurQuotationSelection implements Serializable {
     @ApiModelProperty(value = "业务类型(busyness type)")
     private String busynessType;
 	/**优先级(priority)*/
-	@Excel(name = "优先级(priority)", width = 15)
+	@Excel(name = "优先级(priority)", width = 15,dicCode = "priority")
     @ApiModelProperty(value = "优先级(priority)")
     @Dict(dicCode = "priority")
     private String priority;
 	/**产品分类(production class)*/
-	@Excel(name = "产品分类(production class)", width = 15)
+	@Excel(name = "产品分类(production class)", width = 15,dictTable = "base_product_class", dicCode = "id", dicText = "name")
     @ApiModelProperty(value = "产品分类(production class)")
     @Dict(dictTable = "base_product_class", dicCode = "id", dicText = "name")
     private String productionClass;

srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurQuotationSelectionProduct.java

@@ -55,7 +55,7 @@ public class PurQuotationSelectionProduct implements Serializable {
     @ApiModelProperty(value = "状态(1-启用,0-停用)")
     private Integer status;
 	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+	//@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;

srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurQuotationSelectionShip.java

@@ -55,7 +55,7 @@ public class PurQuotationSelectionShip implements Serializable {
     @ApiModelProperty(value = "状态(1-启用,0-停用)")
     private Integer status;
 	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+	//@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;

srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurShippingFee.java

@@ -67,17 +67,17 @@ public class PurShippingFee implements Serializable {
     @Dict(dicCode = "yes_or_no")
     private Integer status;
 	/**提交(submit)1是0否*/
-	@Excel(name = "提交(submit)1是0否", width = 15)
+	@Excel(name = "提交(submit)", width = 15,dicCode = "yes_or_no")
     @ApiModelProperty(value = "提交(submit)1是0否")
     @Dict(dicCode = "yes_or_no")
     private String submit;
 	/**关闭(close)1是0否*/
-	@Excel(name = "关闭(close)1是0否", width = 15)
+	@Excel(name = "关闭(close)", width = 15,dicCode = "yes_or_no")
     @ApiModelProperty(value = "关闭(close)1是0否")
     @Dict(dicCode = "yes_or_no")
     private String close;
 	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+	//@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;

srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurShippingFeeNotice.java

@@ -69,7 +69,7 @@ public class PurShippingFeeNotice implements Serializable {
     @ApiModelProperty(value = "发货通知单编号(bill code)")
     private String billCode;
 	/**项目(project)*/
-	@Excel(name = "项目(project)", width = 15)
+	//@Excel(name = "项目(project)", width = 15)
     @ApiModelProperty(value = "项目(project)")
     private String project;
 	/**项目名称*/
@@ -77,7 +77,7 @@ public class PurShippingFeeNotice implements Serializable {
     @ApiModelProperty(value = "项目名称")
     private String projectName;
 	/**客户(customer)*/
-	@Excel(name = "客户(customer)", width = 15)
+	//@Excel(name = "客户(customer)", width = 15)
     @ApiModelProperty(value = "客户(customer)")
     private String customer;
 	/**客户(customer)名称*/
@@ -89,11 +89,11 @@ public class PurShippingFeeNotice implements Serializable {
     @ApiModelProperty(value = "业务类型(busyness type)")
     private String busynessType;
 	/**优先级(priority)*/
-	@Excel(name = "优先级(priority)", width = 15)
+	@Excel(name = "优先级(priority)", width = 15,dicCode = "priority")
     @ApiModelProperty(value = "优先级(priority)")
     private String priority;
 	/**产品分类(production class)*/
-	@Excel(name = "产品分类(production class)", width = 15)
+	@Excel(name = "产品分类(production class)", width = 15,dictTable = "base_product_class", dicCode = "id", dicText = "name")
     @ApiModelProperty(value = "产品分类(production class)")
     private String productionClass;
 	/**机型(model)*/
@@ -125,7 +125,7 @@ public class PurShippingFeeNotice implements Serializable {
     @ApiModelProperty(value = "质保期(warranty period)月(month)")
     private String warrantyPeriod;
 	/**销售部门(sale department)*/
-	@Excel(name = "销售部门(sale department)", width = 15)
+	//@Excel(name = "销售部门(sale department)", width = 15)
     @ApiModelProperty(value = "销售部门(sale department)")
     private String saleDepartment;
 	/**包装要求(packageb requirement)*/
@@ -137,7 +137,7 @@ public class PurShippingFeeNotice implements Serializable {
     @ApiModelProperty(value = "联系人(linkman)")
     private String linkman;
 	/**业务员(salesman)*/
-	@Excel(name = "业务员(salesman)", width = 15)
+	//@Excel(name = "业务员(salesman)", width = 15)
     @ApiModelProperty(value = "业务员(salesman)")
     private String salesman;
 	/**收货地址(address)*/

srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurShippingFeeProdeuct.java

@@ -51,7 +51,7 @@ public class PurShippingFeeProdeuct implements Serializable {
     @ApiModelProperty(value = "更新时间")
     private Date updateTime;
 	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+	//@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;

srm-module-code/src/main/java/org/jeecg/modules/purCode/vo/PurDeliveryNoteAlert.java

@@ -53,17 +53,17 @@ public class PurDeliveryNoteAlert implements Serializable {
 //    @ApiModelProperty(value = "状态(1-启用,0-停用)")
 //    private Integer status;
 //	/**提交(submit)1是0否*/
-//	@Excel(name = "提交(submit)1是0否", width = 15)
+//	@Excel(name = "提交(submit)", width = 15,dicCode = "yes_or_no")
 //    @ApiModelProperty(value = "提交(submit)1是0否")
 //    @Dict(dicCode = "yes_or_no")
 //    private String submit;
 //	/**关闭(close)1是0否*/
-//	@Excel(name = "关闭(close)1是0否", width = 15)
+//	@Excel(name = "关闭(close)", width = 15,dicCode = "yes_or_no")
 //    @ApiModelProperty(value = "关闭(close)1是0否")
 //    @Dict(dicCode = "yes_or_no")
 //    private String close;
 //	/**删除状态(0-正常,1-已删除)*/
-//	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+//	//@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
 //    @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
 //    @TableLogic
 //    private Integer delFlag;
@@ -78,7 +78,7 @@ public class PurDeliveryNoteAlert implements Serializable {
     @ApiModelProperty(value = "到货单号")
     private String billCode;
 	/**项目(project)*/
-	@Excel(name = "项目(project)", width = 15)
+	//@Excel(name = "项目(project)", width = 15)
     @ApiModelProperty(value = "项目(project)")
     private String project;
 	/**项目名称*/
@@ -98,12 +98,12 @@ public class PurDeliveryNoteAlert implements Serializable {
     @ApiModelProperty(value = "业务类型(busyness type)")
     private String busynessType;
 	/**优先级(priority)*/
-	@Excel(name = "优先级(priority)", width = 15)
+	@Excel(name = "优先级(priority)", width = 15,dicCode = "priority")
     @ApiModelProperty(value = "优先级(priority)")
     @Dict(dicCode = "priority")
     private String priority;
 	/**产品分类(production class)*/
-	@Excel(name = "产品分类(production class)", width = 15)
+	@Excel(name = "产品分类(production class)", width = 15,dictTable = "base_product_class", dicCode = "id", dicText = "name")
     @ApiModelProperty(value = "产品分类(production class)")
     @Dict(dictTable = "base_product_class", dicCode = "id", dicText = "name")
     private String productionClass;

srm-module-code/src/main/java/org/jeecg/modules/purCode/vo/PurDeliveryNotePage.java

@@ -57,15 +57,15 @@ public class PurDeliveryNotePage {
 	@ApiModelProperty(value = "状态(1-启用,0-停用)")
     private Integer status;
 	/**提交(submit)1是0否*/
-	@Excel(name = "提交(submit)1是0否", width = 15)
+	@Excel(name = "提交(submit)", width = 15,dicCode = "yes_or_no")
 	@ApiModelProperty(value = "提交(submit)1是0否")
     private String submit;
 	/**关闭(close)1是0否*/
-	@Excel(name = "关闭(close)1是0否", width = 15)
+	@Excel(name = "关闭(close)", width = 15,dicCode = "yes_or_no")
 	@ApiModelProperty(value = "关闭(close)1是0否")
     private String close;
 	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+	//@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
 	@ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     private Integer delFlag;
 	/**到货日期(arrival date)*/
@@ -79,7 +79,7 @@ public class PurDeliveryNotePage {
 	@ApiModelProperty(value = "到货单号")
     private String billCode;
 	/**项目(project)*/
-	@Excel(name = "项目(project)", width = 15)
+	//@Excel(name = "项目(project)", width = 15)
 	@ApiModelProperty(value = "项目(project)")
     private String project;
 	/**项目名称*/
@@ -99,11 +99,11 @@ public class PurDeliveryNotePage {
 	@ApiModelProperty(value = "业务类型(busyness type)")
     private String busynessType;
 	/**优先级(priority)*/
-	@Excel(name = "优先级(priority)", width = 15)
+	@Excel(name = "优先级(priority)", width = 15,dicCode = "priority")
 	@ApiModelProperty(value = "优先级(priority)")
     private String priority;
 	/**产品分类(production class)*/
-	@Excel(name = "产品分类(production class)", width = 15)
+	@Excel(name = "产品分类(production class)", width = 15,dictTable = "base_product_class", dicCode = "id", dicText = "name")
 	@ApiModelProperty(value = "产品分类(production class)")
     private String productionClass;
 	/**机型(model)*/

srm-module-code/src/main/java/org/jeecg/modules/purCode/vo/PurInquiryFormAlert.java

@@ -23,7 +23,7 @@ public class PurInquiryFormAlert {
 //    @Dict(dicCode = "purchase_inquiry_status")
 //    private Integer status;
 //    /**删除状态(0-正常,1-已删除)*/
-//    @Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+//    //@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
 //    @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
 //    @TableLogic
 //    private Integer delFlag;
@@ -75,12 +75,12 @@ public class PurInquiryFormAlert {
     @ApiModelProperty(value = "业务类型(busyness type)")
     private String busynessType;
     /**优先级(priority)*/
-    @Excel(name = "优先级(priority)", width = 15)
+    @Excel(name = "优先级(priority)", width = 15,dicCode = "priority")
     @ApiModelProperty(value = "优先级(priority)")
     @Dict(dicCode = "priority")
     private String priority;
     /**产品分类(production class)*/
-    @Excel(name = "产品分类(production class)", width = 15)
+    @Excel(name = "产品分类(production class)", width = 15,dictTable = "base_product_class", dicCode = "id", dicText = "name")
     @ApiModelProperty(value = "产品分类(production class)")
     @Dict(dictTable = "base_product_class", dicCode = "id", dicText = "name")
     private String productionClass;

srm-module-code/src/main/java/org/jeecg/modules/purCode/vo/PurInquiryFormPage.java

@@ -56,7 +56,7 @@ public class PurInquiryFormPage {
 	@Dict(dicCode = "purchase_inquiry_status")
     private Integer status;
 	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+	//@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
 	@ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     private Integer delFlag;
 	/**提交(1是 0否)*/
@@ -107,11 +107,11 @@ public class PurInquiryFormPage {
 	@ApiModelProperty(value = "业务类型(busyness type)")
     private String busynessType;
 	/**优先级(priority)*/
-	@Excel(name = "优先级(priority)", width = 15)
+	@Excel(name = "优先级(priority)", width = 15,dicCode = "priority")
 	@ApiModelProperty(value = "优先级(priority)")
     private String priority;
 	/**产品分类(production class)*/
-	@Excel(name = "产品分类(production class)", width = 15)
+	@Excel(name = "产品分类(production class)", width = 15,dictTable = "base_product_class", dicCode = "id", dicText = "name")
 	@ApiModelProperty(value = "产品分类(production class)")
     private String productionClass;
 	/**机型(model)*/

srm-module-code/src/main/java/org/jeecg/modules/purCode/vo/PurOrderAlert.java

@@ -68,17 +68,17 @@ public class PurOrderAlert implements Serializable {
 //    @Dict(dicCode = "customer_confirm")
 //    private Integer status;
 //	/**提交(submit)1是0否*/
-//	@Excel(name = "提交(submit)1是0否", width = 15)
+//	@Excel(name = "提交(submit)", width = 15,dicCode = "yes_or_no")
 //    @ApiModelProperty(value = "提交(submit)1是0否")
 //    @Dict(dicCode = "yes_or_no")
 //    private String submit;
 //	/**关闭(close)1是0否*/
-//	@Excel(name = "关闭(close)1是0否", width = 15)
+//	@Excel(name = "关闭(close)", width = 15,dicCode = "yes_or_no")
 //    @ApiModelProperty(value = "关闭(close)1是0否")
 //    @Dict(dicCode = "yes_or_no")
 //    private String close;
 //	/**删除状态(0-正常,1-已删除)*/
-//	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+//	//@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
 //    @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
 //    @TableLogic
 //    private Integer delFlag;
@@ -93,7 +93,7 @@ public class PurOrderAlert implements Serializable {
     @ApiModelProperty(value = "单据编码")
     private String billCode;
 	/**项目(project)*/
-	@Excel(name = "项目(project)", width = 15)
+	//@Excel(name = "项目(project)", width = 15)
     @ApiModelProperty(value = "项目(project)")
     private String project;
 	/**项目名称*/
@@ -113,12 +113,12 @@ public class PurOrderAlert implements Serializable {
     @ApiModelProperty(value = "业务类型(busyness type)")
     private String busynessType;
 	/**优先级(priority)*/
-	@Excel(name = "优先级(priority)", width = 15)
+	@Excel(name = "优先级(priority)", width = 15,dicCode = "priority")
     @ApiModelProperty(value = "优先级(priority)")
     @Dict(dicCode = "priority")
     private String priority;
 	/**产品分类(production class)*/
-	@Excel(name = "产品分类(production class)", width = 15)
+	@Excel(name = "产品分类(production class)", width = 15,dictTable = "base_product_class", dicCode = "id", dicText = "name")
     @ApiModelProperty(value = "产品分类(production class)")
     @Dict(dictTable = "base_product_class", dicCode = "id", dicText = "name")
     private String productionClass;

srm-module-code/src/main/java/org/jeecg/modules/purCode/vo/PurOrderHisPage.java

@@ -86,15 +86,15 @@ public class PurOrderHisPage {
 	@ApiModelProperty(value = "客户确认(1-已确认,0-未确认)")
     private Integer status;
 	/**提交(submit)1是0否*/
-	@Excel(name = "提交(submit)1是0否", width = 15)
+	@Excel(name = "提交(submit)", width = 15,dicCode = "yes_or_no")
 	@ApiModelProperty(value = "提交(submit)1是0否")
     private String submit;
 	/**关闭(close)1是0否*/
-	@Excel(name = "关闭(close)1是0否", width = 15)
+	@Excel(name = "关闭(close)", width = 15,dicCode = "yes_or_no")
 	@ApiModelProperty(value = "关闭(close)1是0否")
     private String close;
 	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+	//@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
 	@ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     private Integer delFlag;
 	/**单据日期*/
@@ -108,7 +108,7 @@ public class PurOrderHisPage {
 	@ApiModelProperty(value = "单据编码")
     private String billCode;
 	/**项目(project)*/
-	@Excel(name = "项目(project)", width = 15)
+	//@Excel(name = "项目(project)", width = 15)
 	@ApiModelProperty(value = "项目(project)")
     private String project;
 	/**项目名称*/
@@ -128,11 +128,11 @@ public class PurOrderHisPage {
 	@ApiModelProperty(value = "业务类型(busyness type)")
     private String busynessType;
 	/**优先级(priority)*/
-	@Excel(name = "优先级(priority)", width = 15)
+	@Excel(name = "优先级(priority)", width = 15,dicCode = "priority")
 	@ApiModelProperty(value = "优先级(priority)")
     private String priority;
 	/**产品分类(production class)*/
-	@Excel(name = "产品分类(production class)", width = 15)
+	@Excel(name = "产品分类(production class)", width = 15,dictTable = "base_product_class", dicCode = "id", dicText = "name")
 	@ApiModelProperty(value = "产品分类(production class)")
     private String productionClass;
 	/**机型(model)*/

srm-module-code/src/main/java/org/jeecg/modules/purCode/vo/PurOrderPage.java

@@ -118,7 +118,7 @@ public class PurOrderPage {
 	@ApiModelProperty(value = "业务类型(busyness type)")
     private String busynessType;
 	/**优先级(priority)*/
-	@Excel(name = "优先级(priority)", width = 15)
+	@Excel(name = "优先级(priority)", width = 15,dicCode = "priority")
 	@ApiModelProperty(value = "优先级(priority)")
     private String priority;
 	/**产品分类(production class)*/
@@ -138,7 +138,7 @@ public class PurOrderPage {
 	@ApiModelProperty(value = "贸易条款(trade Terms)")
     private String tradeTerms;
 	/**是否出口(export)*/
-	@Excel(name = "是否出口(export)", width = 15)
+	@Excel(name = "是否出口(export)", width = 15,dicCode = "yes_or_no")
 	@ApiModelProperty(value = "是否出口(export)")
     private String isExport;
 	/**包装要求(packageb requirement)*/

srm-module-code/src/main/java/org/jeecg/modules/purCode/vo/PurPurchaseQuotationPage.java

@@ -50,7 +50,7 @@ public class PurPurchaseQuotationPage {
 	@ApiModelProperty(value = "状态(1-结束,0-报价中)")
 	private Integer status;
 	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+	//@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
 	@ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
 	@TableLogic
 	private Integer delFlag;
@@ -95,11 +95,11 @@ public class PurPurchaseQuotationPage {
 	@ApiModelProperty(value = "业务类型(busyness type)")
 	private String busynessType;
 	/**优先级(priority)*/
-	@Excel(name = "优先级(priority)", width = 15)
+	@Excel(name = "优先级(priority)", width = 15,dicCode = "priority")
 	@ApiModelProperty(value = "优先级(priority)")
 	private String priority;
 	/**产品分类(production class)*/
-	@Excel(name = "产品分类(production class)", width = 15)
+	@Excel(name = "产品分类(production class)", width = 15,dictTable = "base_product_class", dicCode = "id", dicText = "name")
 	@ApiModelProperty(value = "产品分类(production class)")
 	private String productionClass;
 	/**机型(model)*/

srm-module-code/src/main/java/org/jeecg/modules/purCode/vo/PurQuotationSelectionAlert.java

@@ -51,7 +51,7 @@ public class PurQuotationSelectionAlert implements Serializable {
 //    @ApiModelProperty(value = "更新时间")
 //    private Date updateTime;
 //	/**删除状态(0-正常,1-已删除)*/
-//	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+//	//@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
 //    @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
 //    @TableLogic
 //    private Integer delFlag;
@@ -82,12 +82,12 @@ public class PurQuotationSelectionAlert implements Serializable {
     @ApiModelProperty(value = "业务类型(busyness type)")
     private String busynessType;
 	/**优先级(priority)*/
-	@Excel(name = "优先级(priority)", width = 15)
+	@Excel(name = "优先级(priority)", width = 15,dicCode = "priority")
     @ApiModelProperty(value = "优先级(priority)")
     @Dict(dicCode = "priority")
     private String priority;
 	/**产品分类(production class)*/
-	@Excel(name = "产品分类(production class)", width = 15)
+	@Excel(name = "产品分类(production class)", width = 15,dictTable = "base_product_class", dicCode = "id", dicText = "name")
     @ApiModelProperty(value = "产品分类(production class)")
     @Dict(dictTable = "base_product_class", dicCode = "id", dicText = "name")
     private String productionClass;

srm-module-code/src/main/java/org/jeecg/modules/purCode/vo/PurQuotationSelectionPage.java

@@ -50,7 +50,7 @@ public class PurQuotationSelectionPage {
 	@ApiModelProperty(value = "更新时间")
     private Date updateTime;
 	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+	//@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
 	@ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     private Integer delFlag;
 	/**提交(1是 0否)*/
@@ -80,11 +80,11 @@ public class PurQuotationSelectionPage {
 	@ApiModelProperty(value = "业务类型(busyness type)")
     private String busynessType;
 	/**优先级(priority)*/
-	@Excel(name = "优先级(priority)", width = 15)
+	@Excel(name = "优先级(priority)", width = 15,dicCode = "priority")
 	@ApiModelProperty(value = "优先级(priority)")
     private String priority;
 	/**产品分类(production class)*/
-	@Excel(name = "产品分类(production class)", width = 15)
+	@Excel(name = "产品分类(production class)", width = 15,dictTable = "base_product_class", dicCode = "id", dicText = "name")
 	@ApiModelProperty(value = "产品分类(production class)")
     private String productionClass;
 	/**机型(model)*/

srm-module-code/src/main/java/org/jeecg/modules/purCode/vo/PurShippingFeePage.java

@@ -63,15 +63,15 @@ public class PurShippingFeePage {
 	@ApiModelProperty(value = "客户确认(1-已确认,0-未确认)")
     private Integer status;
 	/**提交(submit)1是0否*/
-	@Excel(name = "提交(submit)1是0否", width = 15)
+	@Excel(name = "提交(submit)", width = 15,dicCode = "yes_or_no")
 	@ApiModelProperty(value = "提交(submit)1是0否")
     private String submit;
 	/**关闭(close)1是0否*/
-	@Excel(name = "关闭(close)1是0否", width = 15)
+	@Excel(name = "关闭(close)", width = 15,dicCode = "yes_or_no")
 	@ApiModelProperty(value = "关闭(close)1是0否")
     private String close;
 	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+	//@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
 	@ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     private Integer delFlag;
 	/**单据日期*/

srm-module-code/src/main/java/org/jeecg/modules/purCode/vo/SupplierQuotationDetails.java

@@ -43,7 +43,7 @@ public class SupplierQuotationDetails {
     @ApiModelProperty(value = "状态(1-结束,0-报价中)")
     private Integer status;
     /**删除状态(0-正常,1-已删除)*/
-    @Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+    //@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;
@@ -88,11 +88,11 @@ public class SupplierQuotationDetails {
     @ApiModelProperty(value = "业务类型(busyness type)")
     private String busynessType;
     /**优先级(priority)*/
-    @Excel(name = "优先级(priority)", width = 15)
+    @Excel(name = "优先级(priority)", width = 15,dicCode = "priority")
     @ApiModelProperty(value = "优先级(priority)")
     private String priority;
     /**产品分类(production class)*/
-    @Excel(name = "产品分类(production class)", width = 15)
+    @Excel(name = "产品分类(production class)", width = 15,dictTable = "base_product_class", dicCode = "id", dicText = "name")
     @ApiModelProperty(value = "产品分类(production class)")
     private String productionClass;
     /**机型(model)*/

srm-module-code/src/main/java/org/jeecg/modules/saleCode/controller/SaleDeliveryController.java

@@ -668,6 +668,37 @@ public class SaleDeliveryController {
         //Step.2 获取导出数据
         List<SaleDelivery> saleDeliveryList = saleDeliveryService.list(queryWrapper);
 
+        // Step.4 AutoPoi 导出Excel
+        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+        mv.addObject(NormalExcelConstants.FILE_NAME, "发货通知单(delivery notice)列表");
+        mv.addObject(NormalExcelConstants.CLASS, SaleDelivery.class);
+        mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("发货通知单(delivery notice)数据", "导出人:" + sysUser.getRealname(), "发货通知单(delivery notice)"));
+        mv.addObject(NormalExcelConstants.DATA_LIST, saleDeliveryList);
+        return mv;
+    }
+
+    /**
+     * 导出excel
+     *
+     * @param request
+     * @param saleDelivery
+     */
+    @RequiresPermissions("saleCode:sale_delivery:exportXls")
+    @RequestMapping(value = "/exportXlsDetail")
+    public ModelAndView exportXlsDetail(HttpServletRequest request, SaleDelivery saleDelivery) {
+        // Step.1 组装查询条件查询数据
+        QueryWrapper<SaleDelivery> queryWrapper = QueryGenerator.initQueryWrapper(saleDelivery, request.getParameterMap());
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+
+        //配置选中数据查询条件
+        String selections = request.getParameter("selections");
+        if (oConvertUtils.isNotEmpty(selections)) {
+            List<String> selectionList = Arrays.asList(selections.split(","));
+            queryWrapper.in("id", selectionList);
+        }
+        //Step.2 获取导出数据
+        List<SaleDelivery> saleDeliveryList = saleDeliveryService.list(queryWrapper);
+
         // Step.3 组装pageList
         List<SaleDeliveryPage> pageList = new ArrayList<SaleDeliveryPage>();
         for (SaleDelivery main : saleDeliveryList) {

srm-module-code/src/main/java/org/jeecg/modules/saleCode/controller/SaleInquiryFormController.java

@@ -503,7 +503,7 @@ public class SaleInquiryFormController {
      * @param saleInquiryForm
      */
     @RequiresPermissions("saleCode:sale_inquiry_form:exportXls")
-    @RequestMapping(value = "/exportXls")
+    @RequestMapping(value = "/exportXls2")
     public ModelAndView exportXls(HttpServletRequest request, SaleInquiryForm saleInquiryForm) {
         // Step.1 组装查询条件查询数据
         QueryWrapper<SaleInquiryForm> queryWrapper = QueryGenerator.initQueryWrapper(saleInquiryForm, request.getParameterMap());
@@ -539,6 +539,37 @@ public class SaleInquiryFormController {
         return mv;
     }
 
+    /**
+     * 导出excel
+     *
+     * @param request
+     * @param saleInquiryForm
+     */
+    @RequiresPermissions("saleCode:sale_inquiry_form:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls2(HttpServletRequest request, SaleInquiryForm saleInquiryForm) {
+        // Step.1 组装查询条件查询数据
+        QueryWrapper<SaleInquiryForm> queryWrapper = QueryGenerator.initQueryWrapper(saleInquiryForm, request.getParameterMap());
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+
+        //配置选中数据查询条件
+        String selections = request.getParameter("selections");
+        if (oConvertUtils.isNotEmpty(selections)) {
+            List<String> selectionList = Arrays.asList(selections.split(","));
+            queryWrapper.in("id", selectionList);
+        }
+        //Step.2 获取导出数据
+        List<SaleInquiryForm> saleInquiryFormList = saleInquiryFormService.list(queryWrapper);
+
+        // Step.4 AutoPoi 导出Excel
+        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+        mv.addObject(NormalExcelConstants.FILE_NAME, "销售询价单列表");
+        mv.addObject(NormalExcelConstants.CLASS, SaleInquiryForm.class);
+        mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("销售询价单数据", "导出人:" + sysUser.getRealname(), "销售询价单"));
+        mv.addObject(NormalExcelConstants.DATA_LIST, saleInquiryFormList);
+        return mv;
+    }
+
     /**
      * 通过excel导入数据
      *

srm-module-code/src/main/java/org/jeecg/modules/saleCode/controller/SaleOrderController.java

@@ -292,6 +292,9 @@ public class SaleOrderController {
                 if (quotationSelectionProduct !=null && oConvertUtils.isNotEmpty(quotationSelectionProduct.getTaxPriceOriginal())) {
                     product.setTaxPriceOriginal(quotationSelectionProduct.getTaxPriceOriginal());
                 }
+                if (quotationSelectionProduct !=null && oConvertUtils.isNotEmpty(quotationSelectionProduct.getPaymentTerm())) {
+                    product.setPaymentTerms(quotationSelectionProduct.getPaymentTerm());
+                }
             }
 
 
@@ -1043,6 +1046,38 @@ public class SaleOrderController {
         //Step.2 获取导出数据
         List<SaleOrder> saleOrderList = saleOrderService.list(queryWrapper);
 
+        // Step.4 AutoPoi 导出Excel
+        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+        mv.addObject(NormalExcelConstants.FILE_NAME, "销售订单列表");
+        mv.addObject(NormalExcelConstants.CLASS, SaleOrder.class);
+        mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("销售订单数据", "导出人:" + sysUser.getRealname(), "销售订单"));
+        mv.addObject(NormalExcelConstants.DATA_LIST, saleOrderList);
+        return mv;
+    }
+
+    /**
+     * 导出excel
+     *
+     * @param request
+     * @param saleOrder
+     */
+    @RequiresPermissions("saleCode:sale_order:exportXls")
+    @RequestMapping(value = "/exportXlsDetail")
+    @PermissionData(pageComponent = "saleCode/salesOrder/SaleOrderFormList")
+    public ModelAndView exportXlsDetail(HttpServletRequest request, SaleOrder saleOrder) {
+        // Step.1 组装查询条件查询数据
+        QueryWrapper<SaleOrder> queryWrapper = QueryGenerator.initQueryWrapper(saleOrder, request.getParameterMap());
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+
+        //配置选中数据查询条件
+        String selections = request.getParameter("selections");
+        if (oConvertUtils.isNotEmpty(selections)) {
+            List<String> selectionList = Arrays.asList(selections.split(","));
+            queryWrapper.in("id", selectionList);
+        }
+        //Step.2 获取导出数据
+        List<SaleOrder> saleOrderList = saleOrderService.list(queryWrapper);
+
         // Step.3 组装pageList
         List<SaleOrderPage> pageList = new ArrayList<SaleOrderPage>();
         for (SaleOrder main : saleOrderList) {

srm-module-code/src/main/java/org/jeecg/modules/saleCode/controller/SaleQuotationController.java

@@ -843,18 +843,6 @@ public class SaleQuotationController {
         }
         //Step.2 获取导出数据
         List<SaleQuotation> saleQuotationList = saleQuotationService.list(queryWrapper);
-//
-//        // Step.3 组装pageList
-//        List<SaleQuotationPage> pageList = new ArrayList<SaleQuotationPage>();
-//        for (SaleQuotation main : saleQuotationList) {
-//            SaleQuotationPage vo = new SaleQuotationPage();
-//            BeanUtils.copyProperties(main, vo);
-//            List<SaleQuotationShip> saleQuotationShipList = saleQuotationShipService.selectByMainId(main.getId());
-//            vo.setSaleQuotationShipList(saleQuotationShipList);
-//            List<SaleQuotationProduct> saleQuotationProductList = saleQuotationProductService.selectByMainId(main.getId());
-//            vo.setSaleQuotationProductList(saleQuotationProductList);
-//            pageList.add(vo);
-//        }
 
         // Step.4 AutoPoi 导出Excel
         ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
@@ -872,8 +860,8 @@ public class SaleQuotationController {
      * @param saleQuotation
      */
     @RequiresPermissions("saleCode:sale_quotation:exportXls")
-    @RequestMapping(value = "/exportXls22222")
-    public ModelAndView exportXls22222(HttpServletRequest request, SaleQuotation saleQuotation) {
+    @RequestMapping(value = "/exportXlsDetail")
+    public ModelAndView exportXlsDetail(HttpServletRequest request, SaleQuotation saleQuotation) {
         // Step.1 组装查询条件查询数据
         QueryWrapper<SaleQuotation> queryWrapper = QueryGenerator.initQueryWrapper(saleQuotation, request.getParameterMap());
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();

srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleAdvancePayment.java

@@ -57,17 +57,17 @@ public class SaleAdvancePayment implements Serializable {
     @ApiModelProperty(value = "更新时间")
     private Date updateTime;
 	/**提交(submit)1是0否*/
-	@Excel(name = "提交(submit)1是0否", width = 15)
+	@Excel(name = "提交(submit)", width = 15,dicCode = "yes_or_no")
     @ApiModelProperty(value = "提交(submit)1是0否")
     @Dict(dicCode = "yes_or_no")
     private String submit;
 	/**关闭(close)1是0否*/
-	@Excel(name = "关闭(close)1是0否", width = 15)
+	@Excel(name = "关闭(close)", width = 15,dicCode = "yes_or_no")
     @ApiModelProperty(value = "关闭(close)1是0否")
     @Dict(dicCode = "yes_or_no")
     private String close;
 	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+	//@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;
@@ -82,7 +82,7 @@ public class SaleAdvancePayment implements Serializable {
     @ApiModelProperty(value = "预收款编号(bill code)")
     private String billCode;
 	/**项目(project)*/
-	@Excel(name = "项目(project)", width = 15)
+	//@Excel(name = "项目(project)", width = 15)
     @ApiModelProperty(value = "项目(project)")
     private String project;
 	/**项目名称*/
@@ -98,11 +98,11 @@ public class SaleAdvancePayment implements Serializable {
     @ApiModelProperty(value = "销售订单(sale order)")
     private String saleOrderId;
 	/**客户(customer)*/
-	@Excel(name = "客户(customer)", width = 15)
+	//@Excel(name = "客户(customer)", width = 15)
     @ApiModelProperty(value = "客户(customer)")
     private String customer;
 	/**客户(customer)*/
-	@Excel(name = "客户(customer)", width = 15)
+	//@Excel(name = "客户(customer)", width = 15)
     @ApiModelProperty(value = "客户(customer)")
     private String customerName;
 	/**预收金额(advance payment amount)*/

srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleContract.java

@@ -59,7 +59,7 @@ public class SaleContract implements Serializable {
     @Dict(dicCode = "yes_or_no")
     private Integer status;
 	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+	//@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;
@@ -94,12 +94,12 @@ public class SaleContract implements Serializable {
     @ApiModelProperty(value = "业务类型(busyness type)")
     private String busynessType;
 	/**优先级(priority)*/
-	@Excel(name = "优先级(priority)", width = 15)
+	@Excel(name = "优先级(priority)", width = 15,dicCode = "priority")
     @ApiModelProperty(value = "优先级(priority)")
     @Dict(dicCode = "priority")
     private String priority;
 	/**产品分类(production class)*/
-	@Excel(name = "产品分类(production class)", width = 15)
+	@Excel(name = "产品分类(production class)", width = 15,dictTable = "base_product_class", dicCode = "id", dicText = "name")
     @ApiModelProperty(value = "产品分类(production class)")
     @Dict(dictTable = "base_product_class", dicCode = "id", dicText = "name")
     private String productionClass;

srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleContractHis.java

@@ -59,7 +59,7 @@ public class SaleContractHis implements Serializable {
     @Dict(dicCode = "yes_or_no")
     private Integer status;
 	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+	//@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;
@@ -94,11 +94,11 @@ public class SaleContractHis implements Serializable {
     @ApiModelProperty(value = "业务类型(busyness type)")
     private String busynessType;
 	/**优先级(priority)*/
-	@Excel(name = "优先级(priority)", width = 15)
+	@Excel(name = "优先级(priority)", width = 15,dicCode = "priority")
     @ApiModelProperty(value = "优先级(priority)")
     private String priority;
 	/**产品分类(production class)*/
-	@Excel(name = "产品分类(production class)", width = 15)
+	@Excel(name = "产品分类(production class)", width = 15,dictTable = "base_product_class", dicCode = "id", dicText = "name")
     @ApiModelProperty(value = "产品分类(production class)")
     @Dict(dictTable = "base_product_class", dicCode = "id", dicText = "name")
     private String productionClass;
@@ -127,11 +127,11 @@ public class SaleContractHis implements Serializable {
     @ApiModelProperty(value = "付款条件2")
     private String paymentInfo;
 	/**销售部门(sale department)*/
-	@Excel(name = "销售部门(sale department)", width = 15)
+	//@Excel(name = "销售部门(sale department)", width = 15)
     @ApiModelProperty(value = "销售部门(sale department)")
     private String saleDepartment;
 	/**业务员(salesman)*/
-	@Excel(name = "业务员(salesman)", width = 15)
+	//@Excel(name = "业务员(salesman)", width = 15)
     @ApiModelProperty(value = "业务员(salesman)")
     private String salesman;
 	/**汇率(exchange rate)*/

srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleContractProductHis.java

@@ -59,7 +59,7 @@ public class SaleContractProductHis implements Serializable {
     @ApiModelProperty(value = "状态(1-启用,0-停用)")
     private Integer status;
 	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+	//@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;

srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleContractShipHis.java

@@ -59,7 +59,7 @@ public class SaleContractShipHis implements Serializable {
     @ApiModelProperty(value = "状态(1-启用,0-停用)")
     private Integer status;
 	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+	//@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;

srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleDelivery.java

@@ -58,17 +58,17 @@ public class SaleDelivery implements Serializable {
     @ApiModelProperty(value = "更新时间")
     private Date updateTime;
 	/**提交(submit)1是0否*/
-	@Excel(name = "提交(submit)1是0否", width = 15)
+	@Excel(name = "提交(submit)", width = 15,dicCode = "yes_or_no")
     @ApiModelProperty(value = "提交(submit)1是0否")
     @Dict(dicCode = "yes_or_no")
     private String submit;
 	/**关闭(close)1是0否*/
-	@Excel(name = "关闭(close)1是0否", width = 15)
+	@Excel(name = "关闭(close)", width = 15,dicCode = "yes_or_no")
     @ApiModelProperty(value = "关闭(close)1是0否")
     @Dict(dicCode = "yes_or_no")
     private String close;
 	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+	//@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;
@@ -83,7 +83,7 @@ public class SaleDelivery implements Serializable {
     @ApiModelProperty(value = "单据编码")
     private String billCode;
 	/**项目(project)*/
-	@Excel(name = "项目(project)", width = 15)
+	//@Excel(name = "项目(project)", width = 15)
     @ApiModelProperty(value = "项目(project)")
     private String project;
 	/**项目名称*/
@@ -91,7 +91,7 @@ public class SaleDelivery implements Serializable {
     @ApiModelProperty(value = "项目名称")
     private String projectName;
 	/**客户(customer)*/
-	@Excel(name = "客户(customer)", width = 15)
+	//@Excel(name = "客户(customer)", width = 15)
     @ApiModelProperty(value = "客户(customer)")
     private String customer;
 	/**客户名称*/
@@ -103,12 +103,12 @@ public class SaleDelivery implements Serializable {
     @ApiModelProperty(value = "业务类型(busyness type)")
     private String busynessType;
 	/**优先级(priority)*/
-	@Excel(name = "优先级(priority)", width = 15)
+	@Excel(name = "优先级(priority)", width = 15,dicCode = "priority")
     @ApiModelProperty(value = "优先级(priority)")
     @Dict(dicCode = "priority")
     private String priority;
 	/**产品分类(production class)*/
-	@Excel(name = "产品分类(production class)", width = 15)
+	@Excel(name = "产品分类(production class)", width = 15,dictTable = "base_product_class", dicCode = "id", dicText = "name")
     @ApiModelProperty(value = "产品分类(production class)")
     @Dict(dictTable = "base_product_class", dicCode = "id", dicText = "name")
     private String productionClass;
@@ -141,15 +141,15 @@ public class SaleDelivery implements Serializable {
     @ApiModelProperty(value = "质保期(warranty period)")
     private String warrantyPeriod;
 	/**是否出口(export) 1是0否*/
-	@Excel(name = "是否出口(export) 1是0否", width = 15)
+	@Excel(name = "是否出口(export)", width = 15,dicCode = "yes_or_no")
     @ApiModelProperty(value = "是否出口(export) 1是0否")
     private String isExport;
 	/**销售部门(sale department)*/
-	@Excel(name = "销售部门(sale department)", width = 15)
+	//@Excel(name = "销售部门(sale department)", width = 15)
     @ApiModelProperty(value = "销售部门(sale department)")
     private String saleDepartment;
 	/**业务员(salesman)*/
-	@Excel(name = "业务员(salesman)", width = 15)
+	//@Excel(name = "业务员(salesman)", width = 15)
     @ApiModelProperty(value = "业务员(salesman)")
     private String salesman;
 	/**销售部门(sale department)名称*/

srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleDeliveryDetails.java

@@ -53,7 +53,7 @@ public class SaleDeliveryDetails implements Serializable {
     @ApiModelProperty(value = "状态(1-启用,0-停用)")
     private Integer status;
 	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+	//@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;

srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleDeliveryShip.java

@@ -55,7 +55,7 @@ public class SaleDeliveryShip implements Serializable {
     @ApiModelProperty(value = "状态(1-启用,0-停用)")
     private Integer status;
 	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+	//@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;

srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleInquiryForm.java

@@ -50,11 +50,10 @@ public class SaleInquiryForm implements Serializable {
     @ApiModelProperty(value = "更新时间")
     private Date updateTime;
 	/**状态(1-已报价,0-已报价)*/
-	@Excel(name = "状态(1-已报价,0-未报价)", width = 15)
+	@Excel(name = "是否报价", width = 15,dicCode = "yes_or_no")
     @ApiModelProperty(value = "状态(1-已报价,0-未报价)")
     private Integer status;
 	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;
@@ -63,7 +62,7 @@ public class SaleInquiryForm implements Serializable {
     @ApiModelProperty(value = "其他状态(other status)")
     private String otherStatus;
 	/**提交(1是 0否)*/
-	@Excel(name = "提交(1是 0否)", width = 15)
+	@Excel(name = "提交", width = 15,dicCode = "yes_or_no")
     @ApiModelProperty(value = "提交(1是 0否)")
     private String submit;
 	/**单据日期(bill date)*/
@@ -83,17 +82,17 @@ public class SaleInquiryForm implements Serializable {
     @ApiModelProperty(value = "询价单号(bill code)")
     private String billCode;
 	/**询价项目(inquiry project)*/
-	@Excel(name = "询价项目(inquiry project)", width = 15)
     @ApiModelProperty(value = "询价项目(inquiry project)")
     @Dict(dictTable = "base_project_archive", dicCode = "id", dicText = "name")
     private String inquiryProject;
 	/**询价客户(inquiry customer)*/
-	@Excel(name = "询价客户(inquiry customer)", width = 15)
     @ApiModelProperty(value = "询价客户(inquiry customer)")
     @Dict(dictTable = "cusp_customer_profile", dicCode = "id", dicText = "abbreviation")
     private String inquiryCustomer;
 
+    @Excel(name = "询价项目(inquiry project)", width = 15)
     private String projectName;
+    @Excel(name = "询价客户(inquiry customer)", width = 15)
     private String customerName;
 	/**询价平台(inquiry platform)*/
 	@Excel(name = "询价平台(inquiry platform)", width = 15)
@@ -120,12 +119,12 @@ public class SaleInquiryForm implements Serializable {
     @ApiModelProperty(value = "业务类型(busyness type)")
     private String busynessType;
 	/**优先级(priority)*/
-	@Excel(name = "优先级(priority)", width = 15)
+	@Excel(name = "优先级(priority)", width = 15,dicCode = "priority")
     @ApiModelProperty(value = "优先级(priority)")
     @Dict(dicCode = "priority")
     private String priority;
 	/**产品分类(production class)*/
-	@Excel(name = "产品分类(production class)", width = 15)
+	@Excel(name = "产品分类(production class)", width = 15,dictTable = "base_product_class", dicCode = "id", dicText = "name")
     @ApiModelProperty(value = "产品分类(production class)")
     @Dict(dictTable = "base_product_class", dicCode = "id", dicText = "name")
     private String productionClass;
@@ -138,20 +137,20 @@ public class SaleInquiryForm implements Serializable {
     @ApiModelProperty(value = "厂家(maker)")
     private String maker;
 	/**销售部门(sale department)*/
-	@Excel(name = "销售部门(sale department)", width = 15)
     @ApiModelProperty(value = "销售部门(sale department)")
     private String saleDepartment;
+    //@Excel(name = "销售部门(sale department)", width = 15)
     private String saleDepartmentName;
 	/**业务员(salesman)*/
-	@Excel(name = "业务员(salesman)", width = 15)
     @ApiModelProperty(value = "业务员(salesman)")
     private String salesman;
+    //@Excel(name = "业务员(salesman)", width = 15)
     private String salesmanName;
 	/**采购询价组(procurement inquiry team)*/
-	@Excel(name = "采购询价组(procurement inquiry team)", width = 15)
     @ApiModelProperty(value = "采购询价组(procurement inquiry team)")
     @Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name")
     private String inquiryTeam;
+    @Excel(name = "采购询价组(procurement inquiry team)", width = 15)
     private String inquiryTeamName;
 	/**交期(delivery time)*/
 	@Excel(name = "交期(delivery time)", width = 20, format = "yyyy-MM-dd")
@@ -160,7 +159,6 @@ public class SaleInquiryForm implements Serializable {
     @ApiModelProperty(value = "交期(delivery time)")
     private Date deliveryTime;
 	/**附件(attachs)*/
-	@Excel(name = "附件(attachs)", width = 15)
     @ApiModelProperty(value = "附件(attachs)")
     private String attachs;
 	/**询价备注(inquiry notes)*/
@@ -172,14 +170,17 @@ public class SaleInquiryForm implements Serializable {
 
 
     //船名称 新增字段
+    @Excel(name = "船名称", width = 15)
     private String shipName;
 
     //船imo 新增字段
+    @Excel(name = "船imo", width = 15)
     private String imo;
 
     //联系人主键
     private String liaisonId;
     //联系人信息
+    @Excel(name = "联系人", width = 15)
     private String liaisonInfo;
 
 }

srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleInquiryFormProduct.java

@@ -55,7 +55,7 @@ public class SaleInquiryFormProduct implements Serializable {
     @ApiModelProperty(value = "状态(1-启用,0-停用)")
     private Integer status;
 	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+	//@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;

srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleInquiryFormShip.java

@@ -55,7 +55,7 @@ public class SaleInquiryFormShip implements Serializable {
     @ApiModelProperty(value = "状态(1-启用,0-停用)")
     private Integer status;
 	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+	//@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;

srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleInvoice.java

@@ -59,7 +59,7 @@ public class SaleInvoice implements Serializable {
     @ApiModelProperty(value = "更新时间")
     private Date updateTime;
 	/**提交(submit)1是0否*/
-	@Excel(name = "提交(submit)1是0否", width = 15)
+	@Excel(name = "提交(submit)", width = 15,dicCode = "yes_or_no")
     @ApiModelProperty(value = "提交(submit)1是0否")
     @Dict(dicCode = "yes_or_no")
     private String submit;
@@ -69,7 +69,7 @@ public class SaleInvoice implements Serializable {
     @Dict(dicCode = "yes_or_no")
     private String close;
 	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+	//@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;
@@ -84,7 +84,7 @@ public class SaleInvoice implements Serializable {
     @ApiModelProperty(value = "单据编码")
     private String invoiceCode;
 	/**项目(project)*/
-	@Excel(name = "项目(project)", width = 15)
+	//@Excel(name = "项目(project)", width = 15)
     @ApiModelProperty(value = "项目(project)")
     private String project;
 	/**项目名称*/
@@ -92,7 +92,7 @@ public class SaleInvoice implements Serializable {
     @ApiModelProperty(value = "项目名称")
     private String projectName;
 	/**客户(customer)*/
-	@Excel(name = "客户(customer)", width = 15)
+	//@Excel(name = "客户(customer)", width = 15)
     @ApiModelProperty(value = "客户(customer)")
     private String customer;
 	/**客户名称*/

srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleOrder.java

@@ -72,22 +72,21 @@ public class SaleOrder implements Serializable {
     @ApiModelProperty(value = "更新时间")
     private Date updateTime;
 	/**客户确认(1-已确认,0-未确认)*/
-	@Excel(name = "客户确认(1-已确认,0-未确认)", width = 15)
+	@Excel(name = "客户确认", width = 15,dicCode = "yes_or_no")
     @ApiModelProperty(value = "客户确认(1-已确认,0-未确认)")
     @Dict(dicCode = "customer_confirm")
     private Integer status;
 	/**提交(submit)1是0否*/
-	@Excel(name = "提交(submit)1是0否", width = 15)
+	@Excel(name = "提交", width = 15,dicCode = "yes_or_no")
     @ApiModelProperty(value = "提交(submit)1是0否")
     @Dict(dicCode = "yes_or_no")
     private String submit;
 	/**关闭(close)1是0否*/
-	@Excel(name = "关闭(close)1是0否", width = 15)
+	@Excel(name = "关闭(close)", width = 15,dicCode = "yes_or_no")
     @ApiModelProperty(value = "关闭(close)1是0否")
     @Dict(dicCode = "yes_or_no")
     private String close;
 	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;
@@ -102,7 +101,6 @@ public class SaleOrder implements Serializable {
     @ApiModelProperty(value = "单据编码")
     private String billCode;
 	/**项目(project)*/
-	@Excel(name = "项目(project)", width = 15)
     @ApiModelProperty(value = "项目(project)")
     private String project;
 	/**项目名称*/
@@ -110,7 +108,6 @@ public class SaleOrder implements Serializable {
     @ApiModelProperty(value = "项目名称")
     private String projectName;
 	/**客户(customer)*/
-	@Excel(name = "客户(customer)", width = 15)
     @ApiModelProperty(value = "客户(customer)")
     @Dict(dictTable = "cusp_customer_profile", dicCode = "id", dicText = "abbreviation")
     private String customer;
@@ -123,7 +120,6 @@ public class SaleOrder implements Serializable {
     @ApiModelProperty(value = "业务类型(busyness type)")
     private String busynessType;
 	/**中间人(intermediator)*/
-	@Excel(name = "中间人(intermediator)", width = 15)
     @ApiModelProperty(value = "中间人(intermediator)")
     private String intermediator;
 	/**中间人名称*/
@@ -131,12 +127,12 @@ public class SaleOrder implements Serializable {
     @ApiModelProperty(value = "中间人名称")
     private String intermediatorName;
 	/**优先级(priority)*/
-	@Excel(name = "优先级(priority)", width = 15)
+	@Excel(name = "优先级(priority)", width = 15,dicCode = "priority")
     @ApiModelProperty(value = "优先级(priority)")
     @Dict(dicCode = "priority")
     private String priority;
 	/**产品分类(production class)*/
-	@Excel(name = "产品分类(production class)", width = 15)
+	@Excel(name = "产品分类(production class)", width = 15,dictTable = "base_product_class", dicCode = "id", dicText = "name")
     @ApiModelProperty(value = "产品分类(production class)")
     @Dict(dictTable = "base_product_class", dicCode = "id", dicText = "name")
     private String productionClass;
@@ -190,11 +186,11 @@ public class SaleOrder implements Serializable {
     @ApiModelProperty(value = "开票地址(Invoice Address)")
     private String invoiceAddress;
 	/**质保期(warranty period)*/
-	@Excel(name = "质保期(warranty period)", width = 15)
+	@Excel(name = "质保期/月(warranty period)", width = 15)
     @ApiModelProperty(value = "质保期(warranty period)")
     private String warrantyPeriod;
 	/**是否出口(export) 1是0否*/
-	@Excel(name = "是否出口(export) 1是0否", width = 15)
+	@Excel(name = "是否出口(export)", width = 15,dicCode = "yes_or_no")
     @ApiModelProperty(value = "是否出口(export) 1是0否")
     private String isExport;
 	/**包装要求(packageb requirement)*/
@@ -202,23 +198,20 @@ public class SaleOrder implements Serializable {
     @ApiModelProperty(value = "包装要求(packageb requirement)")
     private String packagebRequirement;
 	/**销售部门(sale department)*/
-	@Excel(name = "销售部门(sale department)", width = 15)
     @ApiModelProperty(value = "销售部门(sale department)")
     private String saleDepartment;
 	/**业务员(salesman)*/
-	@Excel(name = "业务员(salesman)", width = 15)
     @ApiModelProperty(value = "业务员(salesman)")
     private String salesman;
 	/**销售部门(sale department)名称*/
-	@Excel(name = "销售部门(sale department)名称", width = 15)
-    @ApiModelProperty(value = "销售部门(sale department)名称")
+	//@Excel(name = "销售部门(sale department)", width = 15)
+    @ApiModelProperty(value = "销售部门(sale department)")
     private String saleDepartmentName;
 	/**业务员(salesman)名称*/
-	@Excel(name = "业务员(salesman)名称", width = 15)
-    @ApiModelProperty(value = "业务员(salesman)名称")
+	//@Excel(name = "业务员(salesman)", width = 15)
+    @ApiModelProperty(value = "业务员(salesman)")
     private String salesmanName;
 	/**附件(attachs)*/
-	@Excel(name = "附件(attachs)", width = 15)
     @ApiModelProperty(value = "附件(attachs)")
     private String attachs;
 	/**备注(notes)*/
@@ -246,10 +239,11 @@ public class SaleOrder implements Serializable {
     @ApiModelProperty(value = "预付比例(advance ratio)")
     private String advanceRatio;
 	/**版本号*/
-	@Excel(name = "版本号", width = 15)
     @ApiModelProperty(value = "版本号")
     private String version;
+    @Excel(name = "销售报价单来源", width = 15)
     private String sourceCode;//销售报价单
+    @Excel(name = "销售合同来源", width = 15)
     private String sourceCode2;//销售合同
 
     //协议条款

srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleOrderHis.java

@@ -75,15 +75,15 @@ public class SaleOrderHis implements Serializable {
     @ApiModelProperty(value = "客户确认(1-已确认,0-未确认)")
     private Integer status;
 	/**提交(submit)1是0否*/
-	@Excel(name = "提交(submit)1是0否", width = 15)
+	@Excel(name = "提交(submit)", width = 15,dicCode = "yes_or_no")
     @ApiModelProperty(value = "提交(submit)1是0否")
     private String submit;
 	/**关闭(close)1是0否*/
-	@Excel(name = "关闭(close)1是0否", width = 15)
+	@Excel(name = "关闭(close)", width = 15,dicCode = "yes_or_no")
     @ApiModelProperty(value = "关闭(close)1是0否")
     private String close;
 	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+	//@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;
@@ -98,7 +98,7 @@ public class SaleOrderHis implements Serializable {
     @ApiModelProperty(value = "单据编码")
     private String billCode;
 	/**项目(project)*/
-	@Excel(name = "项目(project)", width = 15)
+	//@Excel(name = "项目(project)", width = 15)
     @ApiModelProperty(value = "项目(project)")
     private String project;
 	/**项目名称*/
@@ -106,7 +106,7 @@ public class SaleOrderHis implements Serializable {
     @ApiModelProperty(value = "项目名称")
     private String projectName;
 	/**客户(customer)*/
-	@Excel(name = "客户(customer)", width = 15)
+	//@Excel(name = "客户(customer)", width = 15)
     @ApiModelProperty(value = "客户(customer)")
     private String customer;
 	/**客户名称*/
@@ -126,11 +126,11 @@ public class SaleOrderHis implements Serializable {
     @ApiModelProperty(value = "中间人名称")
     private String intermediatorName;
 	/**优先级(priority)*/
-	@Excel(name = "优先级(priority)", width = 15)
+	@Excel(name = "优先级(priority)", width = 15,dicCode = "priority")
     @ApiModelProperty(value = "优先级(priority)")
     private String priority;
 	/**产品分类(production class)*/
-	@Excel(name = "产品分类(production class)", width = 15)
+	@Excel(name = "产品分类(production class)", width = 15,dictTable = "base_product_class", dicCode = "id", dicText = "name")
     @ApiModelProperty(value = "产品分类(production class)")
     @Dict(dictTable = "base_product_class", dicCode = "id", dicText = "name")
     private String productionClass;
@@ -189,7 +189,7 @@ public class SaleOrderHis implements Serializable {
     @ApiModelProperty(value = "质保期(warranty period)")
     private String warrantyPeriod;
 	/**是否出口(export) 1是0否*/
-	@Excel(name = "是否出口(export) 1是0否", width = 15)
+	@Excel(name = "是否出口(export)", width = 15,dicCode = "yes_or_no")
     @ApiModelProperty(value = "是否出口(export) 1是0否")
     private String isExport;
 	/**包装要求(packageb requirement)*/
@@ -197,11 +197,11 @@ public class SaleOrderHis implements Serializable {
     @ApiModelProperty(value = "包装要求(packageb requirement)")
     private String packagebRequirement;
 	/**销售部门(sale department)*/
-	@Excel(name = "销售部门(sale department)", width = 15)
+	//@Excel(name = "销售部门(sale department)", width = 15)
     @ApiModelProperty(value = "销售部门(sale department)")
     private String saleDepartment;
 	/**业务员(salesman)*/
-	@Excel(name = "业务员(salesman)", width = 15)
+	//@Excel(name = "业务员(salesman)", width = 15)
     @ApiModelProperty(value = "业务员(salesman)")
     private String salesman;
 	/**销售部门(sale department)名称*/

srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleOrderProductHis.java

@@ -55,7 +55,7 @@ public class SaleOrderProductHis implements Serializable {
     @ApiModelProperty(value = "状态(1-启用,0-停用)")
     private Integer status;
 	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+	//@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;

srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleOrderShipHis.java

@@ -55,7 +55,7 @@ public class SaleOrderShipHis implements Serializable {
     @ApiModelProperty(value = "状态(1-启用,0-停用)")
     private Integer status;
 	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+	//@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;

srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleQuotation.java

@@ -110,7 +110,7 @@ public class SaleQuotation implements Serializable {
     @ApiModelProperty(value = "业务类型(busyness type)")
     private String busynessType;
 	/**优先级(priority)*/
-	@Excel(name = "优先级(priority)", width = 15)
+	@Excel(name = "优先级(priority)", width = 15,dicCode = "priority")
     @ApiModelProperty(value = "优先级(priority)")
     @Dict(dicCode = "priority")
     private String priority;
@@ -160,12 +160,12 @@ public class SaleQuotation implements Serializable {
 	/**销售部门(sale department)*/
     @ApiModelProperty(value = "销售部门(sale department)")
     private String saleDepartment;
-    @Excel(name = "销售部门(sale department)", width = 15)
+    //@Excel(name = "销售部门(sale department)", width = 15)
     private String saleDepartmentName;
 	/**业务员(salesman)*/
     @ApiModelProperty(value = "业务员(salesman)")
     private String salesman;
-    @Excel(name = "业务员(salesman)", width = 15)
+    //@Excel(name = "业务员(salesman)", width = 15)
     private String salesmanName;
 	/**报价备注(quotation notes)*/
 	@Excel(name = "报价备注(quotation notes)", width = 15)
@@ -178,7 +178,7 @@ public class SaleQuotation implements Serializable {
     @ApiModelProperty(value = "供应商技术资料(supplier quotation attachs)")
     private String supplierAttachs;
 	/**版本号*/
-	@Excel(name = "版本号", width = 15)
+//	@Excel(name = "版本号", width = 15)
     @ApiModelProperty(value = "版本号")
     private String version;
 	/**邮箱发送*/

srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleQuotationHis.java

@@ -71,7 +71,7 @@ public class SaleQuotationHis implements Serializable {
     @ApiModelProperty(value = "状态(1-已确认,0-未确认)")
     private Integer status;
 	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+	//@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;
@@ -117,11 +117,11 @@ public class SaleQuotationHis implements Serializable {
     @ApiModelProperty(value = "业务类型(busyness type)")
     private String busynessType;
 	/**优先级(priority)*/
-	@Excel(name = "优先级(priority)", width = 15)
+	@Excel(name = "优先级(priority)", width = 15,dicCode = "priority")
     @ApiModelProperty(value = "优先级(priority)")
     private String priority;
 	/**产品分类(production class)*/
-	@Excel(name = "产品分类(production class)", width = 15)
+	@Excel(name = "产品分类(production class)", width = 15,dictTable = "base_product_class", dicCode = "id", dicText = "name")
     @ApiModelProperty(value = "产品分类(production class)")
     private String productionClass;
 	/**机型(model)*/
@@ -163,11 +163,11 @@ public class SaleQuotationHis implements Serializable {
     @ApiModelProperty(value = "包装方式(packaging method)")
     private String packagingMethod;
 	/**销售部门(sale department)*/
-	@Excel(name = "销售部门(sale department)", width = 15)
+	//@Excel(name = "销售部门(sale department)", width = 15)
     @ApiModelProperty(value = "销售部门(sale department)")
     private String saleDepartment;
 	/**业务员(salesman)*/
-	@Excel(name = "业务员(salesman)", width = 15)
+	//@Excel(name = "业务员(salesman)", width = 15)
     @ApiModelProperty(value = "业务员(salesman)")
     private String salesman;
 	/**报价备注(quotation notes)*/

srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleQuotationProductHis.java

@@ -59,7 +59,7 @@ public class SaleQuotationProductHis implements Serializable {
     @ApiModelProperty(value = "状态(1-启用,0-停用)")
     private Integer status;
 	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+	//@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;

srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleQuotationShipHis.java

@@ -59,7 +59,7 @@ public class SaleQuotationShipHis implements Serializable {
     @ApiModelProperty(value = "状态(1-启用,0-停用)")
     private Integer status;
 	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+	//@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;

srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleReceipt.java

@@ -57,17 +57,17 @@ public class SaleReceipt implements Serializable {
     @ApiModelProperty(value = "更新时间")
     private Date updateTime;
 	/**提交(submit)1是0否*/
-	@Excel(name = "提交(submit)1是0否", width = 15)
+	@Excel(name = "提交(submit)", width = 15,dicCode = "yes_or_no")
     @ApiModelProperty(value = "提交(submit)1是0否")
     @Dict(dicCode = "yes_or_no")
     private String submit;
 	/**关闭(close)1是0否*/
-	@Excel(name = "关闭(close)1是0否", width = 15)
+	@Excel(name = "关闭(close)", width = 15,dicCode = "yes_or_no")
     @ApiModelProperty(value = "关闭(close)1是0否")
     @Dict(dicCode = "yes_or_no")
     private String close;
 	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+	//@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;
@@ -90,7 +90,7 @@ public class SaleReceipt implements Serializable {
     @ApiModelProperty(value = "发票(invoice)")
     private String invoiceId;
 	/**项目(project)*/
-	@Excel(name = "项目(project)", width = 15)
+	//@Excel(name = "项目(project)", width = 15)
     @ApiModelProperty(value = "项目(project)")
     private String project;
 	/**项目名称*/
@@ -106,11 +106,11 @@ public class SaleReceipt implements Serializable {
     @ApiModelProperty(value = "销售订单(sale order)")
     private String saleOrderId;
 	/**客户(customer)*/
-	@Excel(name = "客户(customer)", width = 15)
+	//@Excel(name = "客户(customer)", width = 15)
     @ApiModelProperty(value = "客户(customer)")
     private String customer;
 	/**客户(customer)*/
-	@Excel(name = "客户(customer)", width = 15)
+	//@Excel(name = "客户(customer)", width = 15)
     @ApiModelProperty(value = "客户(customer)")
     private String customerName;
 	/**发票金额(invoice money)*/

srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleRfp.java

@@ -61,7 +61,7 @@ public class SaleRfp implements Serializable {
     @ApiModelProperty(value = "状态(1-启用,0-停用)")
     private Integer status;
 	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+	//@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;