完善代码

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

@@ -26,166 +26,223 @@ import io.swagger.annotations.ApiModelProperty;
 @ApiModel(value="pur_order_b2b对象", description="采购订单b2b")
 @Data
 @TableName("pur_order_b2b")
-public class PurOrderB2b implements Serializable {
+public class    PurOrderB2b implements Serializable {
     private static final long serialVersionUID = 1L;
 
-	/**主键id*/
-	@TableId(type = IdType.ASSIGN_ID)
+    /**主键id*/
+    @TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "主键id")
-    private String id;
-	/**创建人*/
+    private java.lang.String id;
+    /**创建人*/
     @ApiModelProperty(value = "创建人")
-    private String createBy;
-	/**创建时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    private java.lang.String createBy;
+    /**创建时间*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-	/**更新人*/
+    private java.util.Date createTime;
+    /**更新人*/
     @ApiModelProperty(value = "更新人")
-    private String updateBy;
-	/**更新时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    private java.lang.String updateBy;
+    /**更新时间*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-	/**客户确认(1-已确认,0-未确认)*/
-	@Excel(name = "客户确认(1-已确认,0-未确认)", width = 15)
+    private java.util.Date updateTime;
+    /**客户确认(1-已确认,0-未确认)*/
+    @Excel(name = "客户确认(1-已确认,0-未确认)", width = 15)
     @ApiModelProperty(value = "客户确认(1-已确认,0-未确认)")
-    private Integer status;
-	/**提交(submit)1是0否*/
-	@Excel(name = "提交(submit)1是0否", width = 15)
+    private java.lang.Integer status;
+    /**提交(submit)1是0否*/
+    @Excel(name = "提交(submit)1是0否", width = 15)
     @ApiModelProperty(value = "提交(submit)1是0否")
-    private String submit;
-	/**关闭(close)1是0否*/
-	@Excel(name = "关闭(close)1是0否", width = 15)
+    private java.lang.String submit;
+    /**关闭(close)1是0否*/
+    @Excel(name = "关闭(close)1是0否", width = 15)
     @ApiModelProperty(value = "关闭(close)1是0否")
-    private String close;
-	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+    private java.lang.String close;
+    /**删除状态(0-正常,1-已删除)*/
+    @Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
-    private Integer delFlag;
-	/**单据日期*/
-	@Excel(name = "单据日期", width = 15, format = "yyyy-MM-dd")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private java.lang.Integer delFlag;
+    /**单据日期*/
+    @Excel(name = "单据日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "单据日期")
-    private Date billDate;
-	/**单据编码*/
-	@Excel(name = "单据编码", width = 15)
+    private java.util.Date billDate;
+    /**单据编码*/
+    @Excel(name = "单据编码", width = 15)
     @ApiModelProperty(value = "单据编码")
-    private String billCode;
-	/**项目(project)*/
-	@Excel(name = "项目(project)", width = 15)
+    private java.lang.String billCode;
+    /**项目(project)*/
+    @Excel(name = "项目(project)", width = 15)
     @ApiModelProperty(value = "项目(project)")
-    private String project;
-	/**项目名称*/
-	@Excel(name = "项目名称", width = 15)
+    private java.lang.String project;
+    /**项目名称*/
+    @Excel(name = "项目名称", width = 15)
     @ApiModelProperty(value = "项目名称")
-    private String projectName;
-	/**供应商(supplier)*/
-	@Excel(name = "供应商(supplier)", width = 15)
+    private java.lang.String projectName;
+    /**供应商(supplier)*/
+    @Excel(name = "供应商(supplier)", width = 15)
     @ApiModelProperty(value = "供应商(supplier)")
-    private String supplier;
-	/**供应商名称*/
-	@Excel(name = "供应商名称", width = 15)
+    private java.lang.String supplier;
+    /**供应商名称*/
+    @Excel(name = "供应商名称", width = 15)
     @ApiModelProperty(value = "供应商名称")
-    private String supplierName;
-	/**业务类型(busyness type)*/
-	@Excel(name = "业务类型(busyness type)", width = 15)
+    private java.lang.String supplierName;
+    /**业务类型(busyness type)*/
+    @Excel(name = "业务类型(busyness type)", width = 15)
     @ApiModelProperty(value = "业务类型(busyness type)")
-    private String busynessType;
-	/**优先级(priority)*/
-	@Excel(name = "优先级(priority)", width = 15)
+    private java.lang.String busynessType;
+    /**优先级(priority)*/
+    @Excel(name = "优先级(priority)", width = 15)
     @ApiModelProperty(value = "优先级(priority)")
-    private String priority;
-	/**产品分类(production class)*/
-	@Excel(name = "产品分类(production class)", width = 15)
+    private java.lang.String priority;
+    /**产品分类(production class)*/
+    @Excel(name = "产品分类(production class)", width = 15)
     @ApiModelProperty(value = "产品分类(production class)")
-    private String productionClass;
-	/**机型(model)*/
-	@Excel(name = "机型(model)", width = 15)
+    private java.lang.String productionClass;
+    /**机型(model)*/
+    @Excel(name = "机型(model)", width = 15)
     @ApiModelProperty(value = "机型(model)")
-    private String model;
-	/**厂家(maker)*/
-	@Excel(name = "厂家(maker)", width = 15)
+    private java.lang.String model;
+    /**厂家(maker)*/
+    @Excel(name = "厂家(maker)", width = 15)
     @ApiModelProperty(value = "厂家(maker)")
-    private String maker;
-	/**贸易条款(trade Terms)*/
-	@Excel(name = "贸易条款(trade Terms)", width = 15)
+    private java.lang.String maker;
+    /**贸易条款(trade Terms)*/
+    @Excel(name = "贸易条款(trade Terms)", width = 15)
     @ApiModelProperty(value = "贸易条款(trade Terms)")
-    private String tradeTerms;
-	/**是否出口(export)*/
-	@Excel(name = "是否出口(export)", width = 15)
+    private java.lang.String tradeTerms;
+    /**是否出口(export)*/
+    @Excel(name = "是否出口(export)", width = 15)
     @ApiModelProperty(value = "是否出口(export)")
-    private String isExport;
-	/**包装要求(packageb requirement)*/
-	@Excel(name = "包装要求(packageb requirement)", width = 15)
+    private java.lang.String isExport;
+    /**包装要求(packageb requirement)*/
+    @Excel(name = "包装要求(packageb requirement)", width = 15)
     @ApiModelProperty(value = "包装要求(packageb requirement)")
-    private String packagebRequirement;
-	/**收件人(recipient)*/
-	@Excel(name = "收件人(recipient)", width = 15)
+    private java.lang.String packagebRequirement;
+    /**收件人(recipient)*/
+    @Excel(name = "收件人(recipient)", width = 15)
     @ApiModelProperty(value = "收件人(recipient)")
-    private String recipient;
-	/**收件人电话(recipient tel)*/
-	@Excel(name = "收件人电话(recipient tel)", width = 15)
+    private java.lang.String recipient;
+    /**收件人电话(recipient tel)*/
+    @Excel(name = "收件人电话(recipient tel)", width = 15)
     @ApiModelProperty(value = "收件人电话(recipient tel)")
-    private String recipientTel;
-	/**收件人地址(recipient address)*/
-	@Excel(name = "收件人地址(recipient address)", width = 15)
+    private java.lang.String recipientTel;
+    /**收件人地址(recipient address)*/
+    @Excel(name = "收件人地址(recipient address)", width = 15)
     @ApiModelProperty(value = "收件人地址(recipient address)")
-    private String recipientAddress;
-	/**付款条件(payment terms)*/
-	@Excel(name = "付款条件(payment terms)", width = 15)
+    private java.lang.String recipientAddress;
+    /**付款条件(payment terms)*/
+    @Excel(name = "付款条件(payment terms)", width = 15)
     @ApiModelProperty(value = "付款条件(payment terms)")
-    private String paymentTerms;
-	/**发货方式(delivery)*/
-	@Excel(name = "发货方式(delivery)", width = 15)
+    private java.lang.String paymentTerms;
+    /**运输方式（transport）*/
+    @Excel(name = "运输方式（transport）", width = 15)
+    @ApiModelProperty(value = "运输方式（transport）")
+    private java.lang.String transport;
+    /**发货方式(delivery)*/
+    @Excel(name = "发货方式(delivery)", width = 15)
     @ApiModelProperty(value = "发货方式(delivery)")
-    private String delivery;
-	/**质保期(warranty period)/月*/
-	@Excel(name = "质保期(warranty period)/月", width = 15)
+    private java.lang.String delivery;
+    /**质保期(warranty period)/月*/
+    @Excel(name = "质保期(warranty period)/月", width = 15)
     @ApiModelProperty(value = "质保期(warranty period)/月")
-    private String warrantyPeriod;
-	/**质保条款(warranty terms)*/
-	@Excel(name = "质保条款(warranty terms)", width = 15)
+    private java.lang.String warrantyPeriod;
+    /**质保条款(warranty terms)*/
+    @Excel(name = "质保条款(warranty terms)", width = 15)
     @ApiModelProperty(value = "质保条款(warranty terms)")
-    private String warrantyTerms;
-	/**汇率(exchange rate)*/
-	@Excel(name = "汇率(exchange rate)", width = 15)
+    private java.lang.String warrantyTerms;
+    /**汇率(exchange rate)*/
+    @Excel(name = "汇率(exchange rate)", width = 15)
     @ApiModelProperty(value = "汇率(exchange rate)")
     private java.math.BigDecimal exchangeRate;
-	/**采购员(purchaseman)*/
-	@Excel(name = "采购员(purchaseman)", width = 15)
+    /**采购员(purchaseman)*/
+    @Excel(name = "采购员(purchaseman)", width = 15)
     @ApiModelProperty(value = "采购员(purchaseman)")
-    private String purchaseman;
-	/**采购部门(purchase department)*/
-	@Excel(name = "采购部门(purchase department)", width = 15)
+    private java.lang.String purchaseman;
+    /**采购部门(purchase department)*/
+    @Excel(name = "采购部门(purchase department)", width = 15)
     @ApiModelProperty(value = "采购部门(purchase department)")
-    private String purchaseDepartment;
-	/**币种(currency)*/
-	@Excel(name = "币种(currency)", width = 15)
+    private java.lang.String purchaseDepartment;
+    /**币种(currency)*/
+    @Excel(name = "币种(currency)", width = 15)
     @ApiModelProperty(value = "币种(currency)")
-    private String currency;
-	/**备注(notes)*/
-	@Excel(name = "备注(notes)", width = 15)
+    private java.lang.String currency;
+    /**备注(notes)*/
+    @Excel(name = "备注(notes)", width = 15)
     @ApiModelProperty(value = "备注(notes)")
-    private String notes;
-	/**附件(attachs)*/
-	@Excel(name = "附件(attachs)", width = 15)
+    private java.lang.String notes;
+    /**附件(attachs)*/
+    @Excel(name = "附件(attachs)", width = 15)
     @ApiModelProperty(value = "附件(attachs)")
-    private String attachs;
-	/**版本号*/
-	@Excel(name = "版本号", width = 15)
+    private java.lang.String attachs;
+    /**版本号*/
+    @Excel(name = "版本号", width = 15)
     @ApiModelProperty(value = "版本号")
-    private String version;
-	/**来源*/
-	@Excel(name = "来源", width = 15)
+    private java.lang.String version;
+    /**来源*/
+    @Excel(name = "来源", width = 15)
     @ApiModelProperty(value = "来源")
-    private String sourceCode;
-	/**来源2*/
-	@Excel(name = "来源2", width = 15)
+    private java.lang.String sourceCode;
+    /**来源2*/
+    @Excel(name = "来源2", width = 15)
     @ApiModelProperty(value = "来源2")
-    private String sourceCode2;
+    private java.lang.String sourceCode2;
+    /**确认人*/
+    @Excel(name = "确认人", width = 15)
+    @ApiModelProperty(value = "确认人")
+    private java.lang.String confirmBy;
+    /**确认时间*/
+    @Excel(name = "确认时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "确认时间")
+    private java.util.Date confirmTime;
+    /**采购员(purchaseman)*/
+    @Excel(name = "采购员(purchaseman)", width = 15)
+    @ApiModelProperty(value = "采购员(purchaseman)")
+    private java.lang.String purchasemanName;
+    /**采购部门(purchase department)*/
+    @Excel(name = "采购部门(purchase department)", width = 15)
+    @ApiModelProperty(value = "采购部门(purchase department)")
+    private java.lang.String purchaseDepartmentName;
+    /**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private java.lang.String sysOrgCode;
+    /**上海/香港*/
+    @Excel(name = "上海/香港", width = 15)
+    @ApiModelProperty(value = "上海/香港")
+    private java.lang.String organize;
+    /**协议条款*/
+    @Excel(name = "协议条款", width = 15)
+    @ApiModelProperty(value = "协议条款")
+    private java.lang.String agreementTerms;
+    /**订单总金额*/
+    @Excel(name = "订单总金额", width = 15)
+    @ApiModelProperty(value = "订单总金额")
+    private java.math.BigDecimal totalAmount;
+    /**订单总金额(已被付款申请参照金额)*/
+    @Excel(name = "订单总金额(已被付款申请参照金额)", width = 15)
+    @ApiModelProperty(value = "订单总金额(已被付款申请参照金额)")
+    private java.math.BigDecimal totalAmountUsed;
+    /**1是 0否*/
+    @Excel(name = "1是 0否", width = 15)
+    @ApiModelProperty(value = "1是 0否")
+    private java.lang.Integer b2b;
+    /**整单折扣*/
+    @Excel(name = "整单折扣", width = 15)
+    @ApiModelProperty(value = "整单折扣")
+    private java.math.BigDecimal discountHead;
+    /**折后金额*/
+    @Excel(name = "折后金额", width = 15)
+    @ApiModelProperty(value = "折后金额")
+    private java.lang.String discountAmount;
+    /**关闭原因*/
+    @Excel(name = "关闭原因", width = 15)
+    @ApiModelProperty(value = "关闭原因")
+    private java.lang.String closeReason;
 }

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

@@ -29,132 +29,146 @@ import java.io.UnsupportedEncodingException;
 @TableName("pur_order_product_b2b")
 public class PurOrderProductB2b implements Serializable {
     private static final long serialVersionUID = 1L;
-
-	/**主键id*/
-	@TableId(type = IdType.ASSIGN_ID)
+    /**主键id*/
+    @TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "主键id")
-    private String id;
-	/**创建人*/
+    private java.lang.String id;
+    /**创建人*/
     @ApiModelProperty(value = "创建人")
-    private String createBy;
-	/**创建时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    private java.lang.String createBy;
+    /**创建时间*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-	/**更新人*/
+    private java.util.Date createTime;
+    /**更新人*/
     @ApiModelProperty(value = "更新人")
-    private String updateBy;
-	/**更新时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    private java.lang.String updateBy;
+    /**更新时间*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-	/**状态(1-启用,0-停用)*/
-	@Excel(name = "状态(1-启用,0-停用)", width = 15)
+    private java.util.Date updateTime;
+    /**状态(1-启用,0-停用)*/
+    @Excel(name = "状态(1-启用,0-停用)", width = 15)
     @ApiModelProperty(value = "状态(1-启用,0-停用)")
-    private Integer status;
-	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+    private java.lang.Integer status;
+    /**删除状态(0-正常,1-已删除)*/
+    @Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
-    private Integer delFlag;
-	/**表头主键（销售订单）*/
+    private java.lang.Integer delFlag;
+    /**表头主键（销售订单）*/
+    @Excel(name = "表头主键（销售订单）", width = 15)
     @ApiModelProperty(value = "表头主键（销售订单）")
-    private String headId;
-	/**交期*/
-	@Excel(name = "交期", width = 15, format = "yyyy-MM-dd")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private java.lang.String headId;
+    /**交期*/
+    @Excel(name = "交期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "交期")
-    private Date deliveryTime;
-	/**最早发货日期(earliest delivery date)*/
-	@Excel(name = "最早发货日期(earliest delivery date)", width = 15, format = "yyyy-MM-dd")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private java.util.Date deliveryTime;
+    /**最早发货日期(earliest delivery date)*/
+    @Excel(name = "最早发货日期(earliest delivery date)", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "最早发货日期(earliest delivery date)")
-    private Date earliestDeliveryDate;
-	/**最晚发货日期(latest delivery date)*/
-	@Excel(name = "最晚发货日期(latest delivery date)", width = 15, format = "yyyy-MM-dd")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private java.util.Date earliestDeliveryDate;
+    /**最晚发货日期(latest delivery date)*/
+    @Excel(name = "最晚发货日期(latest delivery date)", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "最晚发货日期(latest delivery date)")
-    private Date latestDeliveryDate;
-	/**产品id*/
-	@Excel(name = "产品id", width = 15)
+    private java.util.Date latestDeliveryDate;
+    /**产品id*/
+    @Excel(name = "产品id", width = 15)
     @ApiModelProperty(value = "产品id")
-    private String productId;
-	/**产品中文名(chinese name)*/
-	@Excel(name = "产品中文名(chinese name)", width = 15)
+    private java.lang.String productId;
+    /**产品中文名(chinese name)*/
+    @Excel(name = "产品中文名(chinese name)", width = 15)
     @ApiModelProperty(value = "产品中文名(chinese name)")
-    private String chineseName;
-	/**产品英文名*/
-	@Excel(name = "产品英文名", width = 15)
+    private java.lang.String chineseName;
+    /**产品英文名*/
+    @Excel(name = "产品英文名", width = 15)
     @ApiModelProperty(value = "产品英文名")
-    private String englishName;
-	/**规格*/
-	//	@Excel(name = "规格", width = 15)
+    private java.lang.String englishName;
+    /**规格*/
+    @Excel(name = "规格", width = 15)
     @ApiModelProperty(value = "规格")
-    private String specifications;
-	/**型号*/
-	@Excel(name = "型号", width = 15)
+    private java.lang.String specifications;
+    /**型号*/
+    @Excel(name = "型号", width = 15)
     @ApiModelProperty(value = "型号")
-    private String model;
-	/**备件号*/
-	@Excel(name = "备件号", width = 15)
+    private java.lang.String model;
+    /**备件号*/
+    @Excel(name = "备件号", width = 15)
     @ApiModelProperty(value = "备件号")
-    private String partno;
-	/**图号*/
-	@Excel(name = "图号", width = 15)
+    private java.lang.String partno;
+    /**图号*/
+    @Excel(name = "图号", width = 15)
     @ApiModelProperty(value = "图号")
-    private String drawingno;
-	/**订货号*/
-	@Excel(name = "订货号", width = 15)
+    private java.lang.String drawingno;
+    /**订货号*/
+    @Excel(name = "订货号", width = 15)
     @ApiModelProperty(value = "订货号")
-    private String orderno;
-	/**厂家*/
-	@Excel(name = "厂家", width = 15)
+    private java.lang.String orderno;
+    /**厂家*/
+    @Excel(name = "厂家", width = 15)
     @ApiModelProperty(value = "厂家")
-    private String factory;
-	/**质量等级*/
-	@Excel(name = "质量等级", width = 15)
+    private java.lang.String factory;
+    /**质量等级*/
+    @Excel(name = "质量等级", width = 15)
     @ApiModelProperty(value = "质量等级")
-    private String qualityGrade;
-	/**需要船检证书(need ship inspection certificate)*/
-	@Excel(name = "需要船检证书(need ship inspection certificate)", width = 15)
+    private java.lang.String qualityGrade;
+    /**需要船检证书(need ship inspection certificate)*/
+    @Excel(name = "需要船检证书(need ship inspection certificate)", width = 15)
     @ApiModelProperty(value = "需要船检证书(need ship inspection certificate)")
-    private String needShipInspection;
-	/**船检证书(ship inspection certificate)*/
-	@Excel(name = "船检证书(ship inspection certificate)", width = 15)
+    private java.lang.String needShipInspection;
+    /**船检证书(ship inspection certificate)*/
+    @Excel(name = "船检证书(ship inspection certificate)", width = 15)
     @ApiModelProperty(value = "船检证书(ship inspection certificate)")
-    private String shipInspection;
-	/**数量*/
-	@Excel(name = "数量", width = 15)
+    private java.lang.String shipInspection;
+    /**数量*/
+    @Excel(name = "数量", width = 15)
     @ApiModelProperty(value = "数量")
-    private Double quantity;
-	/**含税单价(tax price)*/
-	@Excel(name = "含税单价(tax price)", width = 15)
+    private java.lang.Double quantity;
+    /**含税单价(tax price)*/
+    @Excel(name = "含税单价(tax price)", width = 15)
     @ApiModelProperty(value = "含税单价(tax price)")
     private java.math.BigDecimal taxPrice;
-	/**含税金额(tax amount)*/
-	@Excel(name = "含税金额(tax amount)", width = 15)
+    /**含税金额(tax amount)*/
+    @Excel(name = "含税金额(tax amount)", width = 15)
     @ApiModelProperty(value = "含税金额(tax amount)")
     private java.math.BigDecimal taxAmount;
-	/**备注(notes)*/
-	@Excel(name = "备注(notes)", width = 15)
+    /**备注(notes)*/
+    @Excel(name = "备注(notes)", width = 15)
     @ApiModelProperty(value = "备注(notes)")
-    private String notes;
-	/**参照来源id*/
-	@Excel(name = "参照来源id", width = 15)
+    private java.lang.String notes;
+    /**参照来源id*/
+    @Excel(name = "参照来源id", width = 15)
     @ApiModelProperty(value = "参照来源id")
-    private String sourceId;
-	/**参照来源*/
-	@Excel(name = "参照来源", width = 15)
+    private java.lang.String sourceId;
+    /**参照来源*/
+    @Excel(name = "参照来源", width = 15)
     @ApiModelProperty(value = "参照来源")
-    private String sourceType;
-    //采购报价折扣
-    private BigDecimal discount;
-
-    //采购报价单价（原价） 折前单价
-    private BigDecimal taxPriceOriginal;
+    private java.lang.String sourceType;
+    /**产品编码*/
+    @Excel(name = "产品编码", width = 15)
+    @ApiModelProperty(value = "产品编码")
+    private java.lang.String productCode;
+    /**产品分类*/
+    @Excel(name = "产品分类", width = 15)
+    @ApiModelProperty(value = "产品分类")
+    private java.lang.String productClass;
+    /**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private java.lang.String sysOrgCode;
+    /**采购报价折扣*/
+    @Excel(name = "采购报价折扣", width = 15)
+    @ApiModelProperty(value = "采购报价折扣")
+    private java.math.BigDecimal discount;
+    /**采购报价单价（原价）*/
+    @Excel(name = "采购报价单价（原价）", width = 15)
+    @ApiModelProperty(value = "采购报价单价（原价）")
+    private java.math.BigDecimal taxPriceOriginal;
 }

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

@@ -28,190 +28,266 @@ import io.swagger.annotations.ApiModelProperty;
 @TableName("sale_order_b2b")
 public class SaleOrderB2b implements Serializable {
     private static final long serialVersionUID = 1L;
-
-	/**主键id*/
-	@TableId(type = IdType.ASSIGN_ID)
+    /**主键id*/
+    @TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "主键id")
-    private String id;
-	/**创建人*/
+    private java.lang.String id;
+    /**创建人*/
     @ApiModelProperty(value = "创建人")
-    private String createBy;
-	/**创建时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    private java.lang.String createBy;
+    /**创建时间*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-	/**更新人*/
+    private java.util.Date createTime;
+    /**更新人*/
     @ApiModelProperty(value = "更新人")
-    private String updateBy;
-	/**更新时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    private java.lang.String updateBy;
+    /**更新时间*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-	/**客户确认(1-已确认,0-未确认)*/
-	@Excel(name = "客户确认(1-已确认,0-未确认)", width = 15)
+    private java.util.Date updateTime;
+    /**客户确认(1-已确认,0-未确认)*/
+    @Excel(name = "客户确认(1-已确认,0-未确认)", width = 15)
     @ApiModelProperty(value = "客户确认(1-已确认,0-未确认)")
-    private Integer status;
-	/**提交(submit)1是0否*/
-	@Excel(name = "提交(submit)1是0否", width = 15)
+    private java.lang.Integer status;
+    /**提交(submit)1是0否*/
+    @Excel(name = "提交(submit)1是0否", width = 15)
     @ApiModelProperty(value = "提交(submit)1是0否")
-    private String submit;
-	/**关闭(close)1是0否*/
-	@Excel(name = "关闭(close)1是0否", width = 15)
+    private java.lang.String submit;
+    /**关闭(close)1是0否*/
+    @Excel(name = "关闭(close)1是0否", width = 15)
     @ApiModelProperty(value = "关闭(close)1是0否")
-    private String close;
-	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+    private java.lang.String close;
+    /**删除状态(0-正常,1-已删除)*/
+    @Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
-    private Integer delFlag;
-	/**单据日期*/
-	@Excel(name = "单据日期", width = 15, format = "yyyy-MM-dd")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private java.lang.Integer delFlag;
+    /**单据日期*/
+    @Excel(name = "单据日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "单据日期")
-    private Date billDate;
-	/**单据编码*/
-	@Excel(name = "单据编码", width = 15)
+    private java.util.Date billDate;
+    /**单据编码*/
+    @Excel(name = "单据编码", width = 15)
     @ApiModelProperty(value = "单据编码")
-    private String billCode;
-	/**项目(project)*/
-	@Excel(name = "项目(project)", width = 15)
+    private java.lang.String billCode;
+    /**项目(project)*/
+    @Excel(name = "项目(project)", width = 15)
     @ApiModelProperty(value = "项目(project)")
-    private String project;
-	/**项目名称*/
-	@Excel(name = "项目名称", width = 15)
+    private java.lang.String project;
+    /**项目名称*/
+    @Excel(name = "项目名称", width = 15)
     @ApiModelProperty(value = "项目名称")
-    private String projectName;
-	/**客户(customer)*/
-	@Excel(name = "客户(customer)", width = 15)
+    private java.lang.String projectName;
+    /**客户(customer)*/
+    @Excel(name = "客户(customer)", width = 15)
     @ApiModelProperty(value = "客户(customer)")
-    private String customer;
-	/**客户名称*/
-	@Excel(name = "客户名称", width = 15)
+    private java.lang.String customer;
+    /**客户名称*/
+    @Excel(name = "客户名称", width = 15)
     @ApiModelProperty(value = "客户名称")
-    private String customerName;
-	/**业务类型(busyness type)*/
-	@Excel(name = "业务类型(busyness type)", width = 15)
+    private java.lang.String customerName;
+    /**业务类型(busyness type)*/
+    @Excel(name = "业务类型(busyness type)", width = 15)
     @ApiModelProperty(value = "业务类型(busyness type)")
-    private String busynessType;
-	/**中间人(intermediator)*/
-	@Excel(name = "中间人(intermediator)", width = 15)
+    private java.lang.String busynessType;
+    /**中间人(intermediator)*/
+    @Excel(name = "中间人(intermediator)", width = 15)
     @ApiModelProperty(value = "中间人(intermediator)")
-    private String intermediator;
-	/**中间人名称*/
-	@Excel(name = "中间人名称", width = 15)
+    private java.lang.String intermediator;
+    /**中间人名称*/
+    @Excel(name = "中间人名称", width = 15)
     @ApiModelProperty(value = "中间人名称")
-    private String intermediatorName;
-	/**优先级(priority)*/
-	@Excel(name = "优先级(priority)", width = 15)
+    private java.lang.String intermediatorName;
+    /**优先级(priority)*/
+    @Excel(name = "优先级(priority)", width = 15)
     @ApiModelProperty(value = "优先级(priority)")
-    private String priority;
-	/**产品分类(production class)*/
-	@Excel(name = "产品分类(production class)", width = 15)
+    private java.lang.String priority;
+    /**产品分类(production class)*/
+    @Excel(name = "产品分类(production class)", width = 15)
     @ApiModelProperty(value = "产品分类(production class)")
-    private String productionClass;
-	/**机型(model)*/
-	@Excel(name = "机型(model)", width = 15)
+    private java.lang.String productionClass;
+    /**机型(model)*/
+    @Excel(name = "机型(model)", width = 15)
     @ApiModelProperty(value = "机型(model)")
-    private String model;
-	/**厂家(maker)*/
-	@Excel(name = "厂家(maker)", width = 15)
+    private java.lang.String model;
+    /**厂家(maker)*/
+    @Excel(name = "厂家(maker)", width = 15)
     @ApiModelProperty(value = "厂家(maker)")
-    private String maker;
-	/**币种(currency)*/
-	@Excel(name = "币种(currency)", width = 15)
+    private java.lang.String maker;
+    /**币种(currency)*/
+    @Excel(name = "币种(currency)", width = 15)
     @ApiModelProperty(value = "币种(currency)")
-    private String currency;
-	/**汇率(exchange rate)*/
-	@Excel(name = "汇率(exchange rate)", width = 15)
+    private java.lang.String currency;
+    /**汇率(exchange rate)*/
+    @Excel(name = "汇率(exchange rate)", width = 15)
     @ApiModelProperty(value = "汇率(exchange rate)")
     private java.math.BigDecimal exchangeRate;
-	/**交货条款(delivery terms)*/
-	@Excel(name = "交货条款(delivery terms)", width = 15)
+    /**交货条款(delivery terms)*/
+    @Excel(name = "交货条款(delivery terms)", width = 15)
     @ApiModelProperty(value = "交货条款(delivery terms)")
-    private String deliveryTerms;
-	/**付款条件(payment terms)*/
-	@Excel(name = "付款条件(payment terms)", width = 15)
+    private java.lang.String deliveryTerms;
+    /**付款条件(payment terms)*/
+    @Excel(name = "付款条件(payment terms)", width = 15)
     @ApiModelProperty(value = "付款条件(payment terms)")
-    private String paymentTerms;
-	/**交期(delivery time)*/
-	@Excel(name = "交期(delivery time)", width = 15, format = "yyyy-MM-dd")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private java.lang.String paymentTerms;
+    /**交期(delivery time)*/
+    @Excel(name = "交期(delivery time)", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "交期(delivery time)")
-    private Date deliveryTime;
-	/**发货方式(delivery)*/
-	@Excel(name = "发货方式(delivery)", width = 15)
+    private java.util.Date deliveryTime;
+    /**发货方式(delivery)*/
+    @Excel(name = "发货方式(delivery)", width = 15)
     @ApiModelProperty(value = "发货方式(delivery)")
-    private String delivery;
-	/**交货地点(delivery address)*/
-	@Excel(name = "交货地点(delivery address)", width = 15)
+    private java.lang.String delivery;
+    /**交货地点(delivery address)*/
+    @Excel(name = "交货地点(delivery address)", width = 15)
     @ApiModelProperty(value = "交货地点(delivery address)")
-    private String deliveryAddress;
-	/**开票抬头(Invoice header)*/
-	@Excel(name = "开票抬头(Invoice header)", width = 15)
+    private java.lang.String deliveryAddress;
+    /**开票抬头(Invoice header)*/
+    @Excel(name = "开票抬头(Invoice header)", width = 15)
     @ApiModelProperty(value = "开票抬头(Invoice header)")
-    private String invoiceHeader;
-	/**质保期(warranty period)*/
-	@Excel(name = "质保期(warranty period)", width = 15)
+    private java.lang.String invoiceHeader;
+    /**开票地址(Invoice address)*/
+    @Excel(name = "开票地址(Invoice address)", width = 15)
+    @ApiModelProperty(value = "开票地址(Invoice address)")
+    private java.lang.String invoiceAddress;
+    /**质保期(warranty period)*/
+    @Excel(name = "质保期(warranty period)", width = 15)
     @ApiModelProperty(value = "质保期(warranty period)")
-    private String warrantyPeriod;
-	/**是否出口(export) 1是0否*/
-	@Excel(name = "是否出口(export) 1是0否", width = 15)
+    private java.lang.String warrantyPeriod;
+    /**是否出口(export) 1是0否*/
+    @Excel(name = "是否出口(export) 1是0否", width = 15)
     @ApiModelProperty(value = "是否出口(export) 1是0否")
-    private String isExport;
-	/**包装要求(packageb requirement)*/
-	@Excel(name = "包装要求(packageb requirement)", width = 15)
+    private java.lang.String isExport;
+    /**包装要求(packageb requirement)*/
+    @Excel(name = "包装要求(packageb requirement)", width = 15)
     @ApiModelProperty(value = "包装要求(packageb requirement)")
-    private String packagebRequirement;
-	/**销售部门(sale department)*/
-	@Excel(name = "销售部门(sale department)", width = 15)
+    private java.lang.String packagebRequirement;
+    /**销售部门(sale department)*/
+    @Excel(name = "销售部门(sale department)", width = 15)
     @ApiModelProperty(value = "销售部门(sale department)")
-    private String saleDepartment;
-	/**业务员(salesman)*/
-	@Excel(name = "业务员(salesman)", width = 15)
+    private java.lang.String saleDepartment;
+    /**业务员(salesman)*/
+    @Excel(name = "业务员(salesman)", width = 15)
     @ApiModelProperty(value = "业务员(salesman)")
-    private String salesman;
-	/**销售部门(sale department)名称*/
-	@Excel(name = "销售部门(sale department)名称", width = 15)
+    private java.lang.String salesman;
+    /**销售部门(sale department)名称*/
+    @Excel(name = "销售部门(sale department)名称", width = 15)
     @ApiModelProperty(value = "销售部门(sale department)名称")
-    private String saleDepartmentName;
-	/**业务员(salesman)名称*/
-	@Excel(name = "业务员(salesman)名称", width = 15)
+    private java.lang.String saleDepartmentName;
+    /**业务员(salesman)名称*/
+    @Excel(name = "业务员(salesman)名称", width = 15)
     @ApiModelProperty(value = "业务员(salesman)名称")
-    private String salesmanName;
-	/**附件(attachs)*/
-	@Excel(name = "附件(attachs)", width = 15)
+    private java.lang.String salesmanName;
+    /**附件(attachs)*/
+    @Excel(name = "附件(attachs)", width = 15)
     @ApiModelProperty(value = "附件(attachs)")
-    private String attachs;
-	/**备注(notes)*/
-	@Excel(name = "备注(notes)", width = 15)
+    private java.lang.String attachs;
+    /**备注(notes)*/
+    @Excel(name = "备注(notes)", width = 15)
     @ApiModelProperty(value = "备注(notes)")
-    private String notes;
-	/**客户订单号(customer order number)*/
-	@Excel(name = "客户订单号(customer order number)", width = 15)
+    private java.lang.String notes;
+    /**客户订单号(customer order number)*/
+    @Excel(name = "客户订单号(customer order number)", width = 15)
     @ApiModelProperty(value = "客户订单号(customer order number)")
-    private String customerOrder;
-	/**折上折(double discount)*/
-	@Excel(name = "折上折(double discount)", width = 15)
+    private java.lang.String customerOrder;
+    /**折上折(double discount)*/
+    @Excel(name = "折上折(double discount)", width = 15)
     @ApiModelProperty(value = "折上折(double discount)")
     private java.math.BigDecimal doubleDiscount;
-	/**折后金额(converted amount)*/
-	@Excel(name = "折后金额(converted amount)", width = 15)
+    /**折后金额(converted amount)*/
+    @Excel(name = "折后金额(converted amount)", width = 15)
     @ApiModelProperty(value = "折后金额(converted amount)")
-    private String convertedAmount;
-	/**质保条款(warranty terms)*/
-	@Excel(name = "质保条款(warranty terms)", width = 15)
+    private java.math.BigDecimal convertedAmount;
+    /**质保条款(warranty terms)*/
+    @Excel(name = "质保条款(warranty terms)", width = 15)
     @ApiModelProperty(value = "质保条款(warranty terms)")
-    private String warrantyTerms;
-	/**预付比例(advance ratio)*/
-	@Excel(name = "预付比例(advance ratio)", width = 15)
+    private java.lang.String warrantyTerms;
+    /**预付比例(advance ratio)*/
+    @Excel(name = "预付比例(advance ratio)", width = 15)
     @ApiModelProperty(value = "预付比例(advance ratio)")
-    private String advanceRatio;
-	/**版本号*/
-	@Excel(name = "版本号", width = 15)
+    private java.lang.String advanceRatio;
+    /**版本号*/
+    @Excel(name = "版本号", width = 15)
     @ApiModelProperty(value = "版本号")
-    private String version;
+    private java.lang.String version;
+    /**订单金额(order money)*/
+    @Excel(name = "订单金额(order money)", width = 15)
+    @ApiModelProperty(value = "订单金额(order money)")
+    private java.math.BigDecimal orderMoney;
+    /**发货金额(delivery money)*/
+    @Excel(name = "发货金额(delivery money)", width = 15)
+    @ApiModelProperty(value = "发货金额(delivery money)")
+    private java.math.BigDecimal deliveryMoney;
+    /**发票金额(invoice money)*/
+    @Excel(name = "发票金额(invoice money)", width = 15)
+    @ApiModelProperty(value = "发票金额(invoice money)")
+    private java.math.BigDecimal invoiceMoney;
+    /**收款金额(collected money)*/
+    @Excel(name = "收款金额(collected money)", width = 15)
+    @ApiModelProperty(value = "收款金额(collected money)")
+    private java.math.BigDecimal collectedMoney;
+    /**来源*/
+    @Excel(name = "来源", width = 15)
+    @ApiModelProperty(value = "来源")
+    private java.lang.String sourceCode;
+    /**来源2*/
+    @Excel(name = "来源2", width = 15)
+    @ApiModelProperty(value = "来源2")
+    private java.lang.String sourceCode2;
+    /**运输方式（transport）*/
+    @Excel(name = "运输方式（transport）", width = 15)
+    @ApiModelProperty(value = "运输方式（transport）")
+    private java.lang.String transport;
+    /**确认人*/
+    @Excel(name = "确认人", width = 15)
+    @ApiModelProperty(value = "确认人")
+    private java.lang.String confirmBy;
+    /**确认时间*/
+    @Excel(name = "确认时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "确认时间")
+    private java.util.Date confirmTime;
+    /**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private java.lang.String sysOrgCode;
+    /**上海/香港*/
+    @Excel(name = "上海/香港", width = 15)
+    @ApiModelProperty(value = "上海/香港")
+    private java.lang.String organize;
+    /**协议条款*/
+    @Excel(name = "协议条款", width = 15)
+    @ApiModelProperty(value = "协议条款")
+    private java.lang.String agreementTerms;
+    /**1是 0否*/
+    @Excel(name = "1是 0否", width = 15)
+    @ApiModelProperty(value = "1是 0否")
+    private java.lang.Integer b2b;
+    /**船名*/
+    @Excel(name = "船名", width = 15)
+    @ApiModelProperty(value = "船名")
+    private java.lang.String shipName;
+    /**imo*/
+    @Excel(name = "imo", width = 15)
+    @ApiModelProperty(value = "imo")
+    private java.lang.String imo;
+    /**联系人主键*/
+    @Excel(name = "联系人主键", width = 15)
+    @ApiModelProperty(value = "联系人主键")
+    private java.lang.String liaisonId;
+    /**联系人信息*/
+    @Excel(name = "联系人信息", width = 15)
+    @ApiModelProperty(value = "联系人信息")
+    private java.lang.String liaisonInfo;
+    /**关闭原因*/
+    @Excel(name = "关闭原因", width = 15)
+    @ApiModelProperty(value = "关闭原因")
+    private java.lang.String closeReason;
 }

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

@@ -28,126 +28,170 @@ import java.io.UnsupportedEncodingException;
 public class SaleOrderProductB2b implements Serializable {
     private static final long serialVersionUID = 1L;
 
-	/**主键id*/
-	@TableId(type = IdType.ASSIGN_ID)
+    /**主键id*/
+    @TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "主键id")
-    private String id;
-	/**创建人*/
+    private java.lang.String id;
+    /**创建人*/
     @ApiModelProperty(value = "创建人")
-    private String createBy;
-	/**创建时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    private java.lang.String createBy;
+    /**创建时间*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-	/**更新人*/
+    private java.util.Date createTime;
+    /**更新人*/
     @ApiModelProperty(value = "更新人")
-    private String updateBy;
-	/**更新时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    private java.lang.String updateBy;
+    /**更新时间*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-	/**状态(1-启用,0-停用)*/
-	@Excel(name = "状态(1-启用,0-停用)", width = 15)
+    private java.util.Date updateTime;
+    /**状态(1-启用,0-停用)*/
+    @Excel(name = "状态(1-启用,0-停用)", width = 15)
     @ApiModelProperty(value = "状态(1-启用,0-停用)")
-    private Integer status;
-	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+    private java.lang.Integer status;
+    /**删除状态(0-正常,1-已删除)*/
+    @Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
-    private Integer delFlag;
-	/**表头主键（销售订单）*/
+    private java.lang.Integer delFlag;
+    /**表头主键（销售订单）*/
+    @Excel(name = "表头主键（销售订单）", width = 15)
     @ApiModelProperty(value = "表头主键（销售订单）")
-    private String headId;
-	/**交期*/
-	@Excel(name = "交期", width = 15, format = "yyyy-MM-dd")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private java.lang.String headId;
+    /**交期*/
+    @Excel(name = "交期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "交期")
-    private Date deliveryTime;
-	/**产品id*/
-	@Excel(name = "产品id", width = 15)
+    private java.util.Date deliveryTime;
+    /**产品id*/
+    @Excel(name = "产品id", width = 15)
     @ApiModelProperty(value = "产品id")
-    private String productId;
-	/**产品分类*/
-	@Excel(name = "产品分类", width = 15)
+    private java.lang.String productId;
+    /**产品分类*/
+    @Excel(name = "产品分类", width = 15)
     @ApiModelProperty(value = "产品分类")
-    private String productClass;
-	/**产品编码*/
-	@Excel(name = "产品编码", width = 15)
+    private java.lang.String productClass;
+    /**产品编码*/
+    @Excel(name = "产品编码", width = 15)
     @ApiModelProperty(value = "产品编码")
-    private String productCode;
-	/**产品中文名*/
-	@Excel(name = "产品中文名", width = 15)
+    private java.lang.String productCode;
+    /**产品中文名*/
+    @Excel(name = "产品中文名", width = 15)
     @ApiModelProperty(value = "产品中文名")
-    private String chineseName;
-	/**产品英文名*/
-	@Excel(name = "产品英文名", width = 15)
+    private java.lang.String chineseName;
+    /**产品英文名*/
+    @Excel(name = "产品英文名", width = 15)
     @ApiModelProperty(value = "产品英文名")
-    private String englishName;
-	/**规格*/
-	//	@Excel(name = "规格", width = 15)
+    private java.lang.String englishName;
+    /**规格*/
+    @Excel(name = "规格", width = 15)
     @ApiModelProperty(value = "规格")
-    private String specifications;
-	/**型号*/
-	@Excel(name = "型号", width = 15)
+    private java.lang.String specifications;
+    /**型号*/
+    @Excel(name = "型号", width = 15)
     @ApiModelProperty(value = "型号")
-    private String model;
-	/**备件号*/
-	@Excel(name = "备件号", width = 15)
+    private java.lang.String model;
+    /**备件号*/
+    @Excel(name = "备件号", width = 15)
     @ApiModelProperty(value = "备件号")
-    private String partno;
-	/**图号*/
-	@Excel(name = "图号", width = 15)
+    private java.lang.String partno;
+    /**图号*/
+    @Excel(name = "图号", width = 15)
     @ApiModelProperty(value = "图号")
-    private String drawingno;
-	/**订货号*/
-	@Excel(name = "订货号", width = 15)
+    private java.lang.String drawingno;
+    /**订货号*/
+    @Excel(name = "订货号", width = 15)
     @ApiModelProperty(value = "订货号")
-    private String orderno;
-	/**厂家*/
-	@Excel(name = "厂家", width = 15)
+    private java.lang.String orderno;
+    /**厂家*/
+    @Excel(name = "厂家", width = 15)
     @ApiModelProperty(value = "厂家")
-    private String factory;
-	/**质量等级*/
-	@Excel(name = "质量等级", width = 15)
+    private java.lang.String factory;
+    /**质量等级*/
+    @Excel(name = "质量等级", width = 15)
     @ApiModelProperty(value = "质量等级")
-    private String qualityGrade;
-	/**数量*/
-	@Excel(name = "数量", width = 15)
+    private java.lang.String qualityGrade;
+    /**数量*/
+    @Excel(name = "数量", width = 15)
     @ApiModelProperty(value = "数量")
-    private Double quantity;
-	/**税率(tax rate)*/
-	@Excel(name = "税率(tax rate)", width = 15)
+    private java.lang.Double quantity;
+    /**税率(tax rate)*/
+    @Excel(name = "税率(tax rate)", width = 15)
     @ApiModelProperty(value = "税率(tax rate)")
     private java.math.BigDecimal taxRate;
-	/**折扣(discount)*/
-	@Excel(name = "折扣(discount)", width = 15)
+    /**折扣(discount)*/
+    @Excel(name = "折扣(discount)", width = 15)
     @ApiModelProperty(value = "折扣(discount)")
     private java.math.BigDecimal discount;
-	/**含税单价(tax price)*/
-	@Excel(name = "含税单价(tax price)", width = 15)
+    /**含税单价(tax price)*/
+    @Excel(name = "含税单价(tax price)", width = 15)
     @ApiModelProperty(value = "含税单价(tax price)")
     private java.math.BigDecimal taxPrice;
-	/**含税金额(tax amount)*/
-	@Excel(name = "含税金额(tax amount)", width = 15)
+    /**含税金额(tax amount)*/
+    @Excel(name = "含税金额(tax amount)", width = 15)
     @ApiModelProperty(value = "含税金额(tax amount)")
     private java.math.BigDecimal taxAmount;
-	/**折后单价(discounted unit price)*/
-	@Excel(name = "折后单价(discounted unit price)", width = 15)
+    /**折后单价(discounted unit price)*/
+    @Excel(name = "折后单价(discounted unit price)", width = 15)
     @ApiModelProperty(value = "折后单价(discounted unit price)")
     private java.math.BigDecimal discountedPrice;
-	/**折后金额(converted amount)*/
-	@Excel(name = "折后金额(converted amount)", width = 15)
+    /**折后金额(converted amount)*/
+    @Excel(name = "折后金额(converted amount)", width = 15)
     @ApiModelProperty(value = "折后金额(converted amount)")
     private java.math.BigDecimal discountedAmount;
-	/**备注(notes)*/
-	@Excel(name = "备注(notes)", width = 15)
+    /**备注(notes)*/
+    @Excel(name = "备注(notes)", width = 15)
     @ApiModelProperty(value = "备注(notes)")
-    private String notes;
-	/**参照来源*/
-	@Excel(name = "参照来源", width = 15)
+    private java.lang.String notes;
+    /**参照来源id*/
+    @Excel(name = "参照来源id", width = 15)
+    @ApiModelProperty(value = "参照来源id")
+    private java.lang.String sourceId;
+    /**参照来源*/
+    @Excel(name = "参照来源", width = 15)
     @ApiModelProperty(value = "参照来源")
-    private String sourceId;
+    private java.lang.String sourceType;
+    /**来源单据供应商*/
+    @Excel(name = "来源单据供应商", width = 15)
+    @ApiModelProperty(value = "来源单据供应商")
+    private java.lang.String supplierId;
+    /**供应商名称*/
+    @Excel(name = "供应商名称", width = 15)
+    @ApiModelProperty(value = "供应商名称")
+    private java.lang.String supplierName;
+    /**采购单价(purchase price)*/
+    @Excel(name = "采购单价(purchase price)", width = 15)
+    @ApiModelProperty(value = "采购单价(purchase price)")
+    private java.math.BigDecimal purchasePrice;
+    /**供应商币种*/
+    @Excel(name = "供应商币种", width = 15)
+    @ApiModelProperty(value = "供应商币种")
+    private java.lang.String currencyGys;
+    /**对美元汇率*/
+    @Excel(name = "对美元汇率", width = 15)
+    @ApiModelProperty(value = "对美元汇率")
+    private java.math.BigDecimal exchangeRateGys;
+    /**供应商采购单价*/
+    @Excel(name = "供应商采购单价", width = 15)
+    @ApiModelProperty(value = "供应商采购单价")
+    private java.math.BigDecimal taxPriceGys;
+    /**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private java.lang.String sysOrgCode;
+    /**已发货数量（发货单参照数量）*/
+    @Excel(name = "已发货数量（发货单参照数量）", width = 15)
+    @ApiModelProperty(value = "已发货数量（发货单参照数量）")
+    private java.math.BigDecimal deliveryQuantity;
+    /**已采购数量（采购单参照数量）*/
+    @Excel(name = "已采购数量（采购单参照数量）", width = 15)
+    @ApiModelProperty(value = "已采购数量（采购单参照数量）")
+    private java.math.BigDecimal purchaseQuantity;
+    /**采购金额*/
+    @Excel(name = "采购金额", width = 15)
+    @ApiModelProperty(value = "采购金额")
+    private java.math.BigDecimal purchaseAmount;
 }

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

@@ -26,164 +26,220 @@ import io.swagger.annotations.ApiModelProperty;
 @Data
 @ApiModel(value="pur_order_b2bPage对象", description="采购订单b2b")
 public class PurOrderB2bPage {
-
 	/**主键id*/
 	@ApiModelProperty(value = "主键id")
-    private String id;
+	private java.lang.String id;
 	/**创建人*/
 	@ApiModelProperty(value = "创建人")
-    private String createBy;
+	private java.lang.String createBy;
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
 	@ApiModelProperty(value = "创建时间")
-    private Date createTime;
+	private java.util.Date createTime;
 	/**更新人*/
 	@ApiModelProperty(value = "更新人")
-    private String updateBy;
+	private java.lang.String updateBy;
 	/**更新时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
 	@ApiModelProperty(value = "更新时间")
-    private Date updateTime;
+	private java.util.Date updateTime;
 	/**客户确认(1-已确认,0-未确认)*/
 	@Excel(name = "客户确认(1-已确认,0-未确认)", width = 15)
 	@ApiModelProperty(value = "客户确认(1-已确认,0-未确认)")
-    private Integer status;
+	private java.lang.Integer status;
 	/**提交(submit)1是0否*/
 	@Excel(name = "提交(submit)1是0否", width = 15)
 	@ApiModelProperty(value = "提交(submit)1是0否")
-    private String submit;
+	private java.lang.String submit;
 	/**关闭(close)1是0否*/
 	@Excel(name = "关闭(close)1是0否", width = 15)
 	@ApiModelProperty(value = "关闭(close)1是0否")
-    private String close;
+	private java.lang.String close;
 	/**删除状态(0-正常,1-已删除)*/
 	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
 	@ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
-    private Integer delFlag;
+	private java.lang.Integer delFlag;
 	/**单据日期*/
-	@Excel(name = "单据日期", width = 15, format = "yyyy-MM-dd")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+	@Excel(name = "单据日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
 	@ApiModelProperty(value = "单据日期")
-    private Date billDate;
+	private java.util.Date billDate;
 	/**单据编码*/
 	@Excel(name = "单据编码", width = 15)
 	@ApiModelProperty(value = "单据编码")
-    private String billCode;
+	private java.lang.String billCode;
 	/**项目(project)*/
 	@Excel(name = "项目(project)", width = 15)
 	@ApiModelProperty(value = "项目(project)")
-    private String project;
+	private java.lang.String project;
 	/**项目名称*/
 	@Excel(name = "项目名称", width = 15)
 	@ApiModelProperty(value = "项目名称")
-    private String projectName;
+	private java.lang.String projectName;
 	/**供应商(supplier)*/
 	@Excel(name = "供应商(supplier)", width = 15)
 	@ApiModelProperty(value = "供应商(supplier)")
-    private String supplier;
+	private java.lang.String supplier;
 	/**供应商名称*/
 	@Excel(name = "供应商名称", width = 15)
 	@ApiModelProperty(value = "供应商名称")
-    private String supplierName;
+	private java.lang.String supplierName;
 	/**业务类型(busyness type)*/
 	@Excel(name = "业务类型(busyness type)", width = 15)
 	@ApiModelProperty(value = "业务类型(busyness type)")
-    private String busynessType;
+	private java.lang.String busynessType;
 	/**优先级(priority)*/
 	@Excel(name = "优先级(priority)", width = 15)
 	@ApiModelProperty(value = "优先级(priority)")
-    private String priority;
+	private java.lang.String priority;
 	/**产品分类(production class)*/
 	@Excel(name = "产品分类(production class)", width = 15)
 	@ApiModelProperty(value = "产品分类(production class)")
-    private String productionClass;
+	private java.lang.String productionClass;
 	/**机型(model)*/
 	@Excel(name = "机型(model)", width = 15)
 	@ApiModelProperty(value = "机型(model)")
-    private String model;
+	private java.lang.String model;
 	/**厂家(maker)*/
 	@Excel(name = "厂家(maker)", width = 15)
 	@ApiModelProperty(value = "厂家(maker)")
-    private String maker;
+	private java.lang.String maker;
 	/**贸易条款(trade Terms)*/
 	@Excel(name = "贸易条款(trade Terms)", width = 15)
 	@ApiModelProperty(value = "贸易条款(trade Terms)")
-    private String tradeTerms;
+	private java.lang.String tradeTerms;
 	/**是否出口(export)*/
 	@Excel(name = "是否出口(export)", width = 15)
 	@ApiModelProperty(value = "是否出口(export)")
-    private String isExport;
+	private java.lang.String isExport;
 	/**包装要求(packageb requirement)*/
 	@Excel(name = "包装要求(packageb requirement)", width = 15)
 	@ApiModelProperty(value = "包装要求(packageb requirement)")
-    private String packagebRequirement;
+	private java.lang.String packagebRequirement;
 	/**收件人(recipient)*/
 	@Excel(name = "收件人(recipient)", width = 15)
 	@ApiModelProperty(value = "收件人(recipient)")
-    private String recipient;
+	private java.lang.String recipient;
 	/**收件人电话(recipient tel)*/
 	@Excel(name = "收件人电话(recipient tel)", width = 15)
 	@ApiModelProperty(value = "收件人电话(recipient tel)")
-    private String recipientTel;
+	private java.lang.String recipientTel;
 	/**收件人地址(recipient address)*/
 	@Excel(name = "收件人地址(recipient address)", width = 15)
 	@ApiModelProperty(value = "收件人地址(recipient address)")
-    private String recipientAddress;
+	private java.lang.String recipientAddress;
 	/**付款条件(payment terms)*/
 	@Excel(name = "付款条件(payment terms)", width = 15)
 	@ApiModelProperty(value = "付款条件(payment terms)")
-    private String paymentTerms;
+	private java.lang.String paymentTerms;
+	/**运输方式（transport）*/
+	@Excel(name = "运输方式（transport）", width = 15)
+	@ApiModelProperty(value = "运输方式（transport）")
+	private java.lang.String transport;
 	/**发货方式(delivery)*/
 	@Excel(name = "发货方式(delivery)", width = 15)
 	@ApiModelProperty(value = "发货方式(delivery)")
-    private String delivery;
+	private java.lang.String delivery;
 	/**质保期(warranty period)/月*/
 	@Excel(name = "质保期(warranty period)/月", width = 15)
 	@ApiModelProperty(value = "质保期(warranty period)/月")
-    private String warrantyPeriod;
+	private java.lang.String warrantyPeriod;
 	/**质保条款(warranty terms)*/
 	@Excel(name = "质保条款(warranty terms)", width = 15)
 	@ApiModelProperty(value = "质保条款(warranty terms)")
-    private String warrantyTerms;
+	private java.lang.String warrantyTerms;
 	/**汇率(exchange rate)*/
 	@Excel(name = "汇率(exchange rate)", width = 15)
 	@ApiModelProperty(value = "汇率(exchange rate)")
-    private java.math.BigDecimal exchangeRate;
+	private java.math.BigDecimal exchangeRate;
 	/**采购员(purchaseman)*/
 	@Excel(name = "采购员(purchaseman)", width = 15)
 	@ApiModelProperty(value = "采购员(purchaseman)")
-    private String purchaseman;
+	private java.lang.String purchaseman;
 	/**采购部门(purchase department)*/
 	@Excel(name = "采购部门(purchase department)", width = 15)
 	@ApiModelProperty(value = "采购部门(purchase department)")
-    private String purchaseDepartment;
+	private java.lang.String purchaseDepartment;
 	/**币种(currency)*/
 	@Excel(name = "币种(currency)", width = 15)
 	@ApiModelProperty(value = "币种(currency)")
-    private String currency;
+	private java.lang.String currency;
 	/**备注(notes)*/
 	@Excel(name = "备注(notes)", width = 15)
 	@ApiModelProperty(value = "备注(notes)")
-    private String notes;
+	private java.lang.String notes;
 	/**附件(attachs)*/
 	@Excel(name = "附件(attachs)", width = 15)
 	@ApiModelProperty(value = "附件(attachs)")
-    private String attachs;
+	private java.lang.String attachs;
 	/**版本号*/
 	@Excel(name = "版本号", width = 15)
 	@ApiModelProperty(value = "版本号")
-    private String version;
+	private java.lang.String version;
 	/**来源*/
 	@Excel(name = "来源", width = 15)
 	@ApiModelProperty(value = "来源")
-    private String sourceCode;
+	private java.lang.String sourceCode;
 	/**来源2*/
 	@Excel(name = "来源2", width = 15)
 	@ApiModelProperty(value = "来源2")
-    private String sourceCode2;
+	private java.lang.String sourceCode2;
+	/**确认人*/
+	@Excel(name = "确认人", width = 15)
+	@ApiModelProperty(value = "确认人")
+	private java.lang.String confirmBy;
+	/**确认时间*/
+	@Excel(name = "确认时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	@ApiModelProperty(value = "确认时间")
+	private java.util.Date confirmTime;
+	/**采购员(purchaseman)*/
+	@Excel(name = "采购员(purchaseman)", width = 15)
+	@ApiModelProperty(value = "采购员(purchaseman)")
+	private java.lang.String purchasemanName;
+	/**采购部门(purchase department)*/
+	@Excel(name = "采购部门(purchase department)", width = 15)
+	@ApiModelProperty(value = "采购部门(purchase department)")
+	private java.lang.String purchaseDepartmentName;
+	/**所属部门*/
+	@ApiModelProperty(value = "所属部门")
+	private java.lang.String sysOrgCode;
+	/**上海/香港*/
+	@Excel(name = "上海/香港", width = 15)
+	@ApiModelProperty(value = "上海/香港")
+	private java.lang.String organize;
+	/**协议条款*/
+	@Excel(name = "协议条款", width = 15)
+	@ApiModelProperty(value = "协议条款")
+	private java.lang.String agreementTerms;
+	/**订单总金额*/
+	@Excel(name = "订单总金额", width = 15)
+	@ApiModelProperty(value = "订单总金额")
+	private java.math.BigDecimal totalAmount;
+	/**订单总金额(已被付款申请参照金额)*/
+	@Excel(name = "订单总金额(已被付款申请参照金额)", width = 15)
+	@ApiModelProperty(value = "订单总金额(已被付款申请参照金额)")
+	private java.math.BigDecimal totalAmountUsed;
+	/**1是 0否*/
+	@Excel(name = "1是 0否", width = 15)
+	@ApiModelProperty(value = "1是 0否")
+	private java.lang.Integer b2b;
+	/**整单折扣*/
+	@Excel(name = "整单折扣", width = 15)
+	@ApiModelProperty(value = "整单折扣")
+	private java.math.BigDecimal discountHead;
+	/**折后金额*/
+	@Excel(name = "折后金额", width = 15)
+	@ApiModelProperty(value = "折后金额")
+	private java.lang.String discountAmount;
+	/**关闭原因*/
+	@Excel(name = "关闭原因", width = 15)
+	@ApiModelProperty(value = "关闭原因")
+	private java.lang.String closeReason;
 
 	@ExcelCollection(name="采购订单b2b子表 - 船明细")
 	@ApiModelProperty(value = "采购订单b2b子表 - 船明细")

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

@@ -28,188 +28,265 @@ import io.swagger.annotations.ApiModelProperty;
 public class SaleOrderB2bPage {
 
 	/**主键id*/
-	@ApiModelProperty(value = "主键id")
-    private String id;
+ 	@ApiModelProperty(value = "主键id")
+	private java.lang.String id;
 	/**创建人*/
 	@ApiModelProperty(value = "创建人")
-    private String createBy;
+	private java.lang.String createBy;
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
 	@ApiModelProperty(value = "创建时间")
-    private Date createTime;
+	private java.util.Date createTime;
 	/**更新人*/
 	@ApiModelProperty(value = "更新人")
-    private String updateBy;
+	private java.lang.String updateBy;
 	/**更新时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
 	@ApiModelProperty(value = "更新时间")
-    private Date updateTime;
+	private java.util.Date updateTime;
 	/**客户确认(1-已确认,0-未确认)*/
 	@Excel(name = "客户确认(1-已确认,0-未确认)", width = 15)
 	@ApiModelProperty(value = "客户确认(1-已确认,0-未确认)")
-    private Integer status;
+	private java.lang.Integer status;
 	/**提交(submit)1是0否*/
 	@Excel(name = "提交(submit)1是0否", width = 15)
 	@ApiModelProperty(value = "提交(submit)1是0否")
-    private String submit;
+	private java.lang.String submit;
 	/**关闭(close)1是0否*/
 	@Excel(name = "关闭(close)1是0否", width = 15)
 	@ApiModelProperty(value = "关闭(close)1是0否")
-    private String close;
+	private java.lang.String close;
 	/**删除状态(0-正常,1-已删除)*/
 	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
 	@ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
-    private Integer delFlag;
+	private java.lang.Integer delFlag;
 	/**单据日期*/
-	@Excel(name = "单据日期", width = 15, format = "yyyy-MM-dd")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+	@Excel(name = "单据日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
 	@ApiModelProperty(value = "单据日期")
-    private Date billDate;
+	private java.util.Date billDate;
 	/**单据编码*/
 	@Excel(name = "单据编码", width = 15)
 	@ApiModelProperty(value = "单据编码")
-    private String billCode;
+	private java.lang.String billCode;
 	/**项目(project)*/
 	@Excel(name = "项目(project)", width = 15)
 	@ApiModelProperty(value = "项目(project)")
-    private String project;
+	private java.lang.String project;
 	/**项目名称*/
 	@Excel(name = "项目名称", width = 15)
 	@ApiModelProperty(value = "项目名称")
-    private String projectName;
+	private java.lang.String projectName;
 	/**客户(customer)*/
 	@Excel(name = "客户(customer)", width = 15)
 	@ApiModelProperty(value = "客户(customer)")
-    private String customer;
+	private java.lang.String customer;
 	/**客户名称*/
 	@Excel(name = "客户名称", width = 15)
 	@ApiModelProperty(value = "客户名称")
-    private String customerName;
+	private java.lang.String customerName;
 	/**业务类型(busyness type)*/
 	@Excel(name = "业务类型(busyness type)", width = 15)
 	@ApiModelProperty(value = "业务类型(busyness type)")
-    private String busynessType;
+	private java.lang.String busynessType;
 	/**中间人(intermediator)*/
 	@Excel(name = "中间人(intermediator)", width = 15)
 	@ApiModelProperty(value = "中间人(intermediator)")
-    private String intermediator;
+	private java.lang.String intermediator;
 	/**中间人名称*/
 	@Excel(name = "中间人名称", width = 15)
 	@ApiModelProperty(value = "中间人名称")
-    private String intermediatorName;
+	private java.lang.String intermediatorName;
 	/**优先级(priority)*/
 	@Excel(name = "优先级(priority)", width = 15)
 	@ApiModelProperty(value = "优先级(priority)")
-    private String priority;
+	private java.lang.String priority;
 	/**产品分类(production class)*/
 	@Excel(name = "产品分类(production class)", width = 15)
 	@ApiModelProperty(value = "产品分类(production class)")
-    private String productionClass;
+	private java.lang.String productionClass;
 	/**机型(model)*/
 	@Excel(name = "机型(model)", width = 15)
 	@ApiModelProperty(value = "机型(model)")
-    private String model;
+	private java.lang.String model;
 	/**厂家(maker)*/
 	@Excel(name = "厂家(maker)", width = 15)
 	@ApiModelProperty(value = "厂家(maker)")
-    private String maker;
+	private java.lang.String maker;
 	/**币种(currency)*/
 	@Excel(name = "币种(currency)", width = 15)
 	@ApiModelProperty(value = "币种(currency)")
-    private String currency;
+	private java.lang.String currency;
 	/**汇率(exchange rate)*/
 	@Excel(name = "汇率(exchange rate)", width = 15)
 	@ApiModelProperty(value = "汇率(exchange rate)")
-    private java.math.BigDecimal exchangeRate;
+	private java.math.BigDecimal exchangeRate;
 	/**交货条款(delivery terms)*/
 	@Excel(name = "交货条款(delivery terms)", width = 15)
 	@ApiModelProperty(value = "交货条款(delivery terms)")
-    private String deliveryTerms;
+	private java.lang.String deliveryTerms;
 	/**付款条件(payment terms)*/
 	@Excel(name = "付款条件(payment terms)", width = 15)
 	@ApiModelProperty(value = "付款条件(payment terms)")
-    private String paymentTerms;
+	private java.lang.String paymentTerms;
 	/**交期(delivery time)*/
-	@Excel(name = "交期(delivery time)", width = 15, format = "yyyy-MM-dd")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+	@Excel(name = "交期(delivery time)", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
 	@ApiModelProperty(value = "交期(delivery time)")
-    private Date deliveryTime;
+	private java.util.Date deliveryTime;
 	/**发货方式(delivery)*/
 	@Excel(name = "发货方式(delivery)", width = 15)
 	@ApiModelProperty(value = "发货方式(delivery)")
-    private String delivery;
+	private java.lang.String delivery;
 	/**交货地点(delivery address)*/
 	@Excel(name = "交货地点(delivery address)", width = 15)
 	@ApiModelProperty(value = "交货地点(delivery address)")
-    private String deliveryAddress;
+	private java.lang.String deliveryAddress;
 	/**开票抬头(Invoice header)*/
 	@Excel(name = "开票抬头(Invoice header)", width = 15)
 	@ApiModelProperty(value = "开票抬头(Invoice header)")
-    private String invoiceHeader;
+	private java.lang.String invoiceHeader;
+	/**开票地址(Invoice address)*/
+	@Excel(name = "开票地址(Invoice address)", width = 15)
+	@ApiModelProperty(value = "开票地址(Invoice address)")
+	private java.lang.String invoiceAddress;
 	/**质保期(warranty period)*/
 	@Excel(name = "质保期(warranty period)", width = 15)
 	@ApiModelProperty(value = "质保期(warranty period)")
-    private String warrantyPeriod;
+	private java.lang.String warrantyPeriod;
 	/**是否出口(export) 1是0否*/
 	@Excel(name = "是否出口(export) 1是0否", width = 15)
 	@ApiModelProperty(value = "是否出口(export) 1是0否")
-    private String isExport;
+	private java.lang.String isExport;
 	/**包装要求(packageb requirement)*/
 	@Excel(name = "包装要求(packageb requirement)", width = 15)
 	@ApiModelProperty(value = "包装要求(packageb requirement)")
-    private String packagebRequirement;
+	private java.lang.String packagebRequirement;
 	/**销售部门(sale department)*/
 	@Excel(name = "销售部门(sale department)", width = 15)
 	@ApiModelProperty(value = "销售部门(sale department)")
-    private String saleDepartment;
+	private java.lang.String saleDepartment;
 	/**业务员(salesman)*/
 	@Excel(name = "业务员(salesman)", width = 15)
 	@ApiModelProperty(value = "业务员(salesman)")
-    private String salesman;
+	private java.lang.String salesman;
 	/**销售部门(sale department)名称*/
 	@Excel(name = "销售部门(sale department)名称", width = 15)
 	@ApiModelProperty(value = "销售部门(sale department)名称")
-    private String saleDepartmentName;
+	private java.lang.String saleDepartmentName;
 	/**业务员(salesman)名称*/
 	@Excel(name = "业务员(salesman)名称", width = 15)
 	@ApiModelProperty(value = "业务员(salesman)名称")
-    private String salesmanName;
+	private java.lang.String salesmanName;
 	/**附件(attachs)*/
 	@Excel(name = "附件(attachs)", width = 15)
 	@ApiModelProperty(value = "附件(attachs)")
-    private String attachs;
+	private java.lang.String attachs;
 	/**备注(notes)*/
 	@Excel(name = "备注(notes)", width = 15)
 	@ApiModelProperty(value = "备注(notes)")
-    private String notes;
+	private java.lang.String notes;
 	/**客户订单号(customer order number)*/
 	@Excel(name = "客户订单号(customer order number)", width = 15)
 	@ApiModelProperty(value = "客户订单号(customer order number)")
-    private String customerOrder;
+	private java.lang.String customerOrder;
 	/**折上折(double discount)*/
 	@Excel(name = "折上折(double discount)", width = 15)
 	@ApiModelProperty(value = "折上折(double discount)")
-    private java.math.BigDecimal doubleDiscount;
+	private java.math.BigDecimal doubleDiscount;
 	/**折后金额(converted amount)*/
 	@Excel(name = "折后金额(converted amount)", width = 15)
 	@ApiModelProperty(value = "折后金额(converted amount)")
-    private String convertedAmount;
+	private java.math.BigDecimal convertedAmount;
 	/**质保条款(warranty terms)*/
 	@Excel(name = "质保条款(warranty terms)", width = 15)
 	@ApiModelProperty(value = "质保条款(warranty terms)")
-    private String warrantyTerms;
+	private java.lang.String warrantyTerms;
 	/**预付比例(advance ratio)*/
 	@Excel(name = "预付比例(advance ratio)", width = 15)
 	@ApiModelProperty(value = "预付比例(advance ratio)")
-    private String advanceRatio;
+	private java.lang.String advanceRatio;
 	/**版本号*/
 	@Excel(name = "版本号", width = 15)
 	@ApiModelProperty(value = "版本号")
-    private String version;
+	private java.lang.String version;
+	/**订单金额(order money)*/
+	@Excel(name = "订单金额(order money)", width = 15)
+	@ApiModelProperty(value = "订单金额(order money)")
+	private java.math.BigDecimal orderMoney;
+	/**发货金额(delivery money)*/
+	@Excel(name = "发货金额(delivery money)", width = 15)
+	@ApiModelProperty(value = "发货金额(delivery money)")
+	private java.math.BigDecimal deliveryMoney;
+	/**发票金额(invoice money)*/
+	@Excel(name = "发票金额(invoice money)", width = 15)
+	@ApiModelProperty(value = "发票金额(invoice money)")
+	private java.math.BigDecimal invoiceMoney;
+	/**收款金额(collected money)*/
+	@Excel(name = "收款金额(collected money)", width = 15)
+	@ApiModelProperty(value = "收款金额(collected money)")
+	private java.math.BigDecimal collectedMoney;
+	/**来源*/
+	@Excel(name = "来源", width = 15)
+	@ApiModelProperty(value = "来源")
+	private java.lang.String sourceCode;
+	/**来源2*/
+	@Excel(name = "来源2", width = 15)
+	@ApiModelProperty(value = "来源2")
+	private java.lang.String sourceCode2;
+	/**运输方式（transport）*/
+	@Excel(name = "运输方式（transport）", width = 15)
+	@ApiModelProperty(value = "运输方式（transport）")
+	private java.lang.String transport;
+	/**确认人*/
+	@Excel(name = "确认人", width = 15)
+	@ApiModelProperty(value = "确认人")
+	private java.lang.String confirmBy;
+	/**确认时间*/
+	@Excel(name = "确认时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	@ApiModelProperty(value = "确认时间")
+	private java.util.Date confirmTime;
+	/**所属部门*/
+	@ApiModelProperty(value = "所属部门")
+	private java.lang.String sysOrgCode;
+	/**上海/香港*/
+	@Excel(name = "上海/香港", width = 15)
+	@ApiModelProperty(value = "上海/香港")
+	private java.lang.String organize;
+	/**协议条款*/
+	@Excel(name = "协议条款", width = 15)
+	@ApiModelProperty(value = "协议条款")
+	private java.lang.String agreementTerms;
+	/**1是 0否*/
+	@Excel(name = "1是 0否", width = 15)
+	@ApiModelProperty(value = "1是 0否")
+	private java.lang.Integer b2b;
+	/**船名*/
+	@Excel(name = "船名", width = 15)
+	@ApiModelProperty(value = "船名")
+	private java.lang.String shipName;
+	/**imo*/
+	@Excel(name = "imo", width = 15)
+	@ApiModelProperty(value = "imo")
+	private java.lang.String imo;
+	/**联系人主键*/
+	@Excel(name = "联系人主键", width = 15)
+	@ApiModelProperty(value = "联系人主键")
+	private java.lang.String liaisonId;
+	/**联系人信息*/
+	@Excel(name = "联系人信息", width = 15)
+	@ApiModelProperty(value = "联系人信息")
+	private java.lang.String liaisonInfo;
+	/**关闭原因*/
+	@Excel(name = "关闭原因", width = 15)
+	@ApiModelProperty(value = "关闭原因")
+	private java.lang.String closeReason;
 
 	@ExcelCollection(name="销售订单b2b子表 - 船明细")
 	@ApiModelProperty(value = "销售订单b2b子表 - 船明细")

srm-module-code/src/main/java/org/jeecg/modules/storeCode/service/impl/StorePurchaseInServiceImpl.java

@@ -4,9 +4,15 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.apache.commons.lang.StringUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.exception.JeecgBootException;
+import org.jeecg.modules.purCode.entity.PurDeliveryNote;
 import org.jeecg.modules.purCode.entity.PurDeliveryNoteArrival;
 import org.jeecg.modules.purCode.mapper.PurDeliveryNoteArrivalMapper;
+import org.jeecg.modules.purCode.mapper.PurOrderMapper;
+import org.jeecg.modules.purCode.mapper.PurOrderProductMapper;
 import org.jeecg.modules.purCode.service.IPurDeliveryNoteArrivalService;
+import org.jeecg.modules.purCode.service.IPurDeliveryNoteService;
+import org.jeecg.modules.saleCode.mapper.SaleOrderMapper;
+import org.jeecg.modules.saleCode.mapper.SaleOrderProductMapper;
 import org.jeecg.modules.storeCode.entity.*;
 import org.jeecg.modules.storeCode.mapper.StorePurchaseInShipMapper;
 import org.jeecg.modules.storeCode.mapper.StorePurchaseInDetailsMapper;
@@ -48,6 +54,17 @@ public class StorePurchaseInServiceImpl extends ServiceImpl<StorePurchaseInMappe
     private PurDeliveryNoteArrivalMapper purDeliveryNoteArrivalMapper;
     @Autowired
     private IPurDeliveryNoteArrivalService purDeliveryNoteArrivalService;
+    @Autowired
+    private IPurDeliveryNoteService purDeliveryNoteService;
+
+    @Autowired
+    private SaleOrderProductMapper saleOrderProductMapper;
+    @Autowired
+    private SaleOrderMapper saleOrderMapper;
+    @Autowired
+    private PurOrderMapper purOrderMapper;
+    @Autowired
+    private PurOrderProductMapper purOrderProductMapper;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -112,14 +129,6 @@ public class StorePurchaseInServiceImpl extends ServiceImpl<StorePurchaseInMappe
         }
     }
 
-    public static void main(String[] args) {
-
-        BigDecimal arrivalQuantity = new BigDecimal("-1");
-
-        System.out.println(arrivalQuantity.compareTo(BigDecimal.ZERO));
-    }
-
-
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void updateMain(StorePurchaseIn storePurchaseIn, List<StorePurchaseInShip> storePurchaseInShipList, List<StorePurchaseInDetails> storePurchaseInDetailsList) {
@@ -288,6 +297,11 @@ public class StorePurchaseInServiceImpl extends ServiceImpl<StorePurchaseInMappe
         }
     }
 
+    /**
+     * 采购异常 处理功能
+     * @param ids
+     * @return
+     */
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Result<String> hasDeal(String ids) {
@@ -522,4 +536,30 @@ public class StorePurchaseInServiceImpl extends ServiceImpl<StorePurchaseInMappe
         return Result.OK("取消提交成功！");
     }
 
+
+    /**
+     * 生成 b2b 订单
+     * @param storePurchaseInList
+     * @return
+     */
+    public String actionB2BInfo(List<StorePurchaseIn> storePurchaseInList){
+
+        for(StorePurchaseIn storePurchaseIn:storePurchaseInList){
+
+            String sourceCodeDhd = storePurchaseIn.getSourceCode();//到货单
+            if(StringUtils.isBlank(sourceCodeDhd)){
+                continue;
+            }
+
+            QueryWrapper<PurDeliveryNote> queryWrapperDhd = new QueryWrapper<>();
+            queryWrapperDhd.eq("del_flag",0);
+            queryWrapperDhd.eq("bill_code",sourceCodeDhd);
+            purDeliveryNoteService.getOne(queryWrapperDhd);
+
+
+        }
+
+        return "true";
+    }
+
 }