样品单

hx-ehsd/src/main/java/com/fjhx/ehsd/entity/sample/po/Sample.java

@@ -31,11 +31,6 @@ public class Sample extends BasePo {
     private String code;
 
     /**
-     * 合同类型(1外销 2内销)
-     */
-    private Integer contractType;
-
-    /**
      * 合同模版ID
      */
     private Long contractTemplateId;
@@ -121,22 +116,12 @@ public class Sample extends BasePo {
     private Integer status;
 
     /**
-     * 合同状态
-     */
-    private Integer contractStatus;
-
-    /**
-     * 到款状态 0未到款  10部分到款  20已到款
-     */
-    private Integer refundStatus;
-
-    /**
      * 币种（字典account_currency）
      */
     private String currency;
 
     /**
-     * 合同金额
+     * 样品单金额
      */
     private BigDecimal amount;
 
@@ -146,11 +131,6 @@ public class Sample extends BasePo {
     private String paymentMethod;
 
     /**
-     * 贸易方式（字典trade_methods）
-     */
-    private String tradeMethods;
-
-    /**
      * 预付比例
      */
     private String advanceRatio;
@@ -171,11 +151,6 @@ public class Sample extends BasePo {
     private Long shroffAccountId;
 
     /**
-     * 质保期
-     */
-    private Integer warranty;
-
-    /**
      * 审核通过时间
      */
     private Date approvedDate;
@@ -201,11 +176,6 @@ public class Sample extends BasePo {
     private String deliveryTime;
 
     /**
-     * 是否结算 1已结算 0未结算
-     */
-    private Integer settlementStatus;
-
-    /**
      * 汇率json
      */
     private String currencyRateJson;
@@ -220,6 +190,36 @@ public class Sample extends BasePo {
      */
     private String ehsdJson;
 
+    /**
+     * beneficiaryName
+     */
+    private String beneficiaryName;
+
+    /**
+     * beneficiaryBank
+     */
+    private String beneficiaryBank;
+
+    /**
+     * beneficiaryBankAddress
+     */
+    private String beneficiaryBankAddress;
+
+    /**
+     * beneficiaryAddress
+     */
+    private String beneficiaryAddress;
+
+    /**
+     * beneficiaryName
+     */
+    private String swiftCode;
+
+    /**
+     * beneficiaryAccountNumber
+     */
+    private String beneficiaryAccountNumber;
+
 
     /**
      * 样品单产品列表

hx-sale/src/main/java/com/fjhx/sale/entity/contract/po/Contract.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.Version;
+import com.fjhx.file.entity.ObsFile;
 import com.ruoyi.common.core.domain.BasePo;
 import lombok.Getter;
 import lombok.Setter;
@@ -259,6 +260,12 @@ public class Contract extends BasePo {
     private Integer version;
 
     /**
+     * 附件列表
+     */
+    @TableField(exist = false)
+    private List<ObsFile> fileList;
+
+    /**
      * 合同产品列表
      */
     @TableField(exist = false)

hx-sale/src/main/java/com/fjhx/sale/flow/ContractFlow.java

@@ -84,6 +84,7 @@ public class ContractFlow extends FlowDelegate {
             }
             contractShipmentService.saveBatch(contractShipmentList);
         }
+        ObsFileUtil.saveFile(contract.getFileList(),contract.getId());
         return contract.getId();
     }