销售合同增加银行名称

trade-client/src/main/resources/data/init/wl-trade-client.sql

@@ -216,6 +216,7 @@ CREATE TABLE `contract_terms`
     `account_name`     VARCHAR(50)  DEFAULT '' COMMENT '账户名称',
     `account_number`   VARCHAR(50)  DEFAULT '' COMMENT '账号',
     `opening_bank`     VARCHAR(300) DEFAULT '' COMMENT '开户行名称',
+    `bank_name`        VARCHAR(300) DEFAULT '' COMMENT '银行名称',
     `swift_code`       VARCHAR(100) DEFAULT '' COMMENT '香港开户行',
     `deleted`          TINYINT(1) DEFAULT 0 COMMENT '删除标识',
     -- `submit_status`    varchar(4)   DEFAULT '' COMMENT '提交状态1草稿2正式',

trade-service/src/main/java/com/trade/service/trade/salescontract/domain/ContractTerms.java

@@ -45,6 +45,9 @@ public class ContractTerms extends BizBaseI18nEntity<ContractTerms> {
     @ApiModelProperty(name = "openingBank", value = "开户行名称")
     @I18nField
     private String openingBank;
+    @ApiModelProperty(name = "bankName", value = "银行名称")
+    @I18nField
+    private String bankName;
     @ApiModelProperty(name = "swiftCode", value = "香港开户行")
     private String swiftCode;
     @ApiModelProperty(name = "remark", value = "备注")

trade-service/src/main/java/com/trade/service/trade/salescontract/dto/ContractCommodityDto.java

@@ -16,10 +16,12 @@ public class ContractCommodityDto {
     private String xh;
     // 商品名称
     private String goodsName;
+    private String goodsNameEn;
     // 型号
     private String model;
     // 计量单位
     private String unit;
+    private String unitEn;
     // 包装规格
     private String packages;
     // 数量

trade-service/src/main/java/com/trade/service/trade/salescontract/dto/ContractTemplateDto.java

@@ -13,25 +13,37 @@ public class ContractTemplateDto {
 
     private String contractNo;
     private String buyer;
+    private String buyerEn;
     private String seller;
+    private String sellerEn;
     private String cTotal;
     private String currency;
     private String pTotal;
     private String aTotal;
     private String remark;
     private String portDeparture;
+    private String portDepartureEn;
     private String portDestination;
+    private String portDestinationEn;
     private String tradeTerms;
     private String paymentTerms;
+    private String paymentTermsEn;
     private String accountName;
+    private String accountNameEn;
     private String accountNumber;
     private String openingBank;
+    private String openingBankEn;
     private String swiftCode;
     private String sellerContact;
+    private String sellerContactEn;
     private String sellerAddress;
+    private String sellerAddressEn;
     private String sellerEmail;
     private String buyerContact;
+    private String buyerContactEn;
     private String buyerAddress;
+    private String buyerAddressEn;
     private String buyerEmail;
     private String titleInfo;
+    private String titleInfoEn;
 }

trade-service/src/main/java/com/trade/service/trade/salescontract/dto/ContractTermsDto.java

@@ -34,18 +34,18 @@ public class ContractTermsDto extends CommonI18nEntity {
 
     private static final long serialVersionUID = 1725364450348L;
     @ApiModelProperty(name = "contractId", value = "合同ID")
-    @NotNull(message = "合同ID", groups = {
+    @NotNull(message = "合同ID不能为空", groups = {
             ValidatorGroup.Submit.class
     })
     private Long contractId;
     @ApiModelProperty(name = "contractType", value = "合同类型")
-    @NotBlank(message = "合同类型", groups = {
+    @NotBlank(message = "合同类型不能为空", groups = {
             ValidatorGroup.Submit.class
     })
     private String contractType;
     @ApiModelProperty(name = "contractNo", value = "合同编号")
     private String contractNo;
-    @NotBlank(message = "付款方式", groups = {
+    @NotBlank(message = "付款方式不能为空", groups = {
             ValidatorGroup.Submit.class
     })
     @ApiModelProperty(name = "paymentWay", value = "付款方式")
@@ -54,31 +54,36 @@ public class ContractTermsDto extends CommonI18nEntity {
     private String paymentCurrency;
     @ApiModelProperty(name = "invoiceType", value = "发票类型1增值税专用发票2增值税普通发票3增值税电子专用发票4增值税电子普通发票5数电票（增值税专用发票）6（数电票）增值税普通发票")
     private String invoiceType;
-    @NotNull(message = "结算周期单位天", groups = {
+    @NotNull(message = "结算周期单位天不能为空", groups = {
             ValidatorGroup.Submit.class
     })
     @ApiModelProperty(name = "settlementCycle", value = "结算周期单位天")
     private Integer settlementCycle;
-    @NotBlank(message = "账户名称", groups = {
+    @NotBlank(message = "账户名称不能为空", groups = {
             ValidatorGroup.Submit.class
     })
     @ApiModelProperty(name = "accountName", value = "账户名称")
     private String accountName;
-    @NotBlank(message = "账号", groups = {
+    @NotBlank(message = "账号不能为空", groups = {
             ValidatorGroup.Submit.class
     })
     @ApiModelProperty(name = "accountNumber", value = "账号")
     private String accountNumber;
-    @NotBlank(message = "开户行名称", groups = {
+    @NotBlank(message = "开户行名称不能为空", groups = {
             ValidatorGroup.Submit.class
     })
     @ApiModelProperty(name = "openingBank", value = "开户行名称")
     private String openingBank;
+    @NotBlank(message = "银行名称不能为空", groups = {
+            ValidatorGroup.Submit.class
+    })
+    @ApiModelProperty(name = "bankName", value = "银行名称")
+    private String bankName;
     @ApiModelProperty(name = "swiftCode", value = "香港开户行")
     private String swiftCode;
     @ApiModelProperty(name = "remark", value = "备注")
     private String remark;
-    @NotBlank(message = "提交状态", groups = {
+    @NotBlank(message = "提交状态不能为空", groups = {
             ValidatorGroup.Submit.class
     })
     @ApiModelProperty(name = "submitStatus", value = "提交状态1草稿2正式")

trade-service/src/main/resources/mapper/contract/ContractTermsMapper.xml

@@ -13,6 +13,7 @@
 		<id column="account_name" property="accountName" />
 		<id column="account_number" property="accountNumber" />
 		<id column="opening_bank" property="openingBank" />
+        <id column="bank_name" property="bankName" />
 		<id column="swift_code" property="swiftCode" />
 		<id column="remark" property="remark" />
         <id column="deleted" property="deleted" />
@@ -20,7 +21,7 @@
 		<id column="gmt_modified" property="gmtModified" />
 	</resultMap>
 	<sql id="Base_Column_List">
-		id, contract_no, contract_type, payment_way, payment_currency, invoice_type, settlement_cycle, account_name, account_number, opening_bank, swift_code, remark, deleted, gmt_create, gmt_modified
+		id, contract_no, contract_type, payment_way, payment_currency, invoice_type, settlement_cycle, account_name, account_number, opening_bank, bank_name, swift_code, remark, deleted, gmt_create, gmt_modified
 	</sql>
 	
 </mapper>