提交

jy-business/src/main/java/com/jy/business/contract/model/entity/ContractDetail.java

@@ -16,7 +16,7 @@ import lombok.Setter;
  * </p>
  *
  * @author 
- * @since 2025-06-10
+ * @since 2025-06-12
  */
 @Getter
 @Setter
@@ -39,79 +39,39 @@ public class ContractDetail extends BaseIdPo {
     private Long bulkGoodsSpecId;
 
     /**
-     * 商品名
-     */
-    private String spuName;
-
-    /**
-     * 颜色
-     */
-    private String colour;
-
-    /**
-     * 数量
+     * 商品编码
      */
-    private BigDecimal quantity;
+    private String spuCode;
 
     /**
-     * 定制标签：1-激光打印；2-UV印刷
-     */
-    private Integer customizeTag;
-
-    /**
-     * 定制加工项目id
+     * 商品名
      */
-    private Long customizeProcessingItemId;
+    private String spuName;
 
     /**
-     * 设计图
+     * 商品规格
      */
-    private String blueprintUrl;
+    private String spec;
 
     /**
-     * 设计图规格详情
+     * 颜色
      */
-    private String blueprintSpecDetails;
+    private String colour;
 
     /**
-     * 颜色规格详情
+     * 商品材质
      */
-    private String colourDetails;
+    private String material;
 
     /**
-     * 包材配置详情
+     * 数量
      */
-    private String packagingDetails;
+    private BigDecimal quantity;
 
     /**
      * 购买单价
      */
-    private BigDecimal salesPrice;
-
-    /**
-     * 定制加工单价
-     */
-    private BigDecimal customizeProcessingPrice;
-
-    /**
-     * 包材金额
-     */
-    private BigDecimal packingMaterialPrice;
-
-    /**
-     * 运费金额
-     */
-    private BigDecimal freightPrice;
-
-    /**
-     * 额外费用详情
-     */
-    private String additionalCustomizeDetails;
-
-    /**
-     * 额外费用
-     */
-    private BigDecimal additionalCustomizePrice;
+    private BigDecimal unitPrice;
 
     /**
      * 金额

jy-business/src/main/java/com/jy/business/contract/model/entity/ContractInfo.java

@@ -2,7 +2,6 @@ package com.jy.business.contract.model.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.jy.framework.model.base.BaseIdPo;
 import lombok.Getter;
@@ -17,7 +16,7 @@ import java.util.Date;
  * </p>
  *
  * @author
- * @since 2025-06-10
+ * @since 2025-06-12
  */
 @Getter
 @Setter
@@ -30,39 +29,34 @@ public class ContractInfo extends BaseIdPo {
     private String contractNo;
 
     /**
-     * 合同类型 1-三梵合同，2-佰易来合同
+     * 是否含税（1是 0否）
      */
-    private Integer type;
+    private Integer isTax;
 
     /**
-     * 合同主体id
+     * 合同状态 10进行中 20已完成
      */
-    private Long contractSubjectId;
+    private Integer status;
 
     /**
-     * 采购类型 1-一件商品，2-批单商品
+     * 卖方公司名称
      */
-    private Integer purchaseType;
+    private String sellerCompany;
 
     /**
-     * 是否含税（1是 0否）
+     * 卖方地址
      */
-    private Integer isTax;
+    private String sellerAddress;
 
     /**
-     * 等级id
+     * 卖方国家
      */
-    private Long rankId;
+    private String sellerCountry;
 
     /**
-     * 合同状态 10进行中 20已完成
+     * 卖方联系方式
      */
-    private Integer status;
-
-    /**
-     * 包装状态 0未包装 1已包装
-     */
-    private Integer packingStatus;
+    private String sellerContact;
 
     /**
      * 支付类型 1银行卡支付 2支付宝支付
@@ -145,11 +139,6 @@ public class ContractInfo extends BaseIdPo {
     private Integer validityDate;
 
     /**
-     * 客户id
-     */
-    private Long customerId;
-
-    /**
      * 客户名称
      */
     private String customerName;
@@ -180,6 +169,11 @@ public class ContractInfo extends BaseIdPo {
     private String shippingMethod;
 
     /**
+     * 卸货港
+     */
+    private String placeOfDischarge;
+
+    /**
      * 交货条款
      */
     private String deliveryTerms;

jy-business/src/main/java/com/jy/business/contract/model/table/ContractDetailTable.java

@@ -30,79 +30,39 @@ public class ContractDetailTable extends Table<ContractDetail> {
     public QueryColumn bulkGoodsSpecId = this.field(ContractDetail::getBulkGoodsSpecId);
 
     /**
-     * 商品名
-     */
-    public QueryColumn spuName = this.field(ContractDetail::getSpuName);
-
-    /**
-     * 颜色
-     */
-    public QueryColumn colour = this.field(ContractDetail::getColour);
-
-    /**
-     * 数量
+     * 商品编码
      */
-    public QueryColumn quantity = this.field(ContractDetail::getQuantity);
+    public QueryColumn spuCode = this.field(ContractDetail::getSpuCode);
 
     /**
-     * 定制标签：1-激光打印；2-UV印刷
-     */
-    public QueryColumn customizeTag = this.field(ContractDetail::getCustomizeTag);
-
-    /**
-     * 定制加工项目id
+     * 商品名
      */
-    public QueryColumn customizeProcessingItemId = this.field(ContractDetail::getCustomizeProcessingItemId);
+    public QueryColumn spuName = this.field(ContractDetail::getSpuName);
 
     /**
-     * 设计图
+     * 商品规格
      */
-    public QueryColumn blueprintUrl = this.field(ContractDetail::getBlueprintUrl);
+    public QueryColumn spec = this.field(ContractDetail::getSpec);
 
     /**
-     * 设计图规格详情
+     * 颜色
      */
-    public QueryColumn blueprintSpecDetails = this.field(ContractDetail::getBlueprintSpecDetails);
+    public QueryColumn colour = this.field(ContractDetail::getColour);
 
     /**
-     * 颜色规格详情
+     * 商品材质
      */
-    public QueryColumn colourDetails = this.field(ContractDetail::getColourDetails);
+    public QueryColumn material = this.field(ContractDetail::getMaterial);
 
     /**
-     * 包材配置详情
+     * 数量
      */
-    public QueryColumn packagingDetails = this.field(ContractDetail::getPackagingDetails);
+    public QueryColumn quantity = this.field(ContractDetail::getQuantity);
 
     /**
      * 购买单价
      */
-    public QueryColumn salesPrice = this.field(ContractDetail::getSalesPrice);
-
-    /**
-     * 定制加工单价
-     */
-    public QueryColumn customizeProcessingPrice = this.field(ContractDetail::getCustomizeProcessingPrice);
-
-    /**
-     * 包材金额
-     */
-    public QueryColumn packingMaterialPrice = this.field(ContractDetail::getPackingMaterialPrice);
-
-    /**
-     * 运费金额
-     */
-    public QueryColumn freightPrice = this.field(ContractDetail::getFreightPrice);
-
-    /**
-     * 额外费用详情
-     */
-    public QueryColumn additionalCustomizeDetails = this.field(ContractDetail::getAdditionalCustomizeDetails);
-
-    /**
-     * 额外费用
-     */
-    public QueryColumn additionalCustomizePrice = this.field(ContractDetail::getAdditionalCustomizePrice);
+    public QueryColumn unitPrice = this.field(ContractDetail::getUnitPrice);
 
     /**
      * 金额

jy-business/src/main/java/com/jy/business/contract/model/table/ContractInfoTable.java

@@ -20,39 +20,34 @@ public class ContractInfoTable extends Table<ContractInfo> {
     public QueryColumn contractNo = this.field(ContractInfo::getContractNo);
 
     /**
-     * 合同类型 1-三梵合同，2-佰易来合同
+     * 是否含税（1是 0否）
      */
-    public QueryColumn type = this.field(ContractInfo::getType);
+    public QueryColumn isTax = this.field(ContractInfo::getIsTax);
 
     /**
-     * 合同主体id
+     * 合同状态 10进行中 20已完成
      */
-    public QueryColumn contractSubjectId = this.field(ContractInfo::getContractSubjectId);
+    public QueryColumn status = this.field(ContractInfo::getStatus);
 
     /**
-     * 采购类型 1-一件商品，2-批单商品
+     * 卖方公司名称
      */
-    public QueryColumn purchaseType = this.field(ContractInfo::getPurchaseType);
+    public QueryColumn sellerCompany = this.field(ContractInfo::getSellerCompany);
 
     /**
-     * 是否含税（1是 0否）
+     * 卖方地址
      */
-    public QueryColumn isTax = this.field(ContractInfo::getIsTax);
+    public QueryColumn sellerAddress = this.field(ContractInfo::getSellerAddress);
 
     /**
-     * 等级id
+     * 卖方国家
      */
-    public QueryColumn rankId = this.field(ContractInfo::getRankId);
+    public QueryColumn sellerCountry = this.field(ContractInfo::getSellerCountry);
 
     /**
-     * 合同状态 10进行中 20已完成
+     * 卖方联系方式
      */
-    public QueryColumn status = this.field(ContractInfo::getStatus);
-
-    /**
-     * 包装状态 0未包装 1已包装
-     */
-    public QueryColumn packingStatus = this.field(ContractInfo::getPackingStatus);
+    public QueryColumn sellerContact = this.field(ContractInfo::getSellerContact);
 
     /**
      * 支付类型 1银行卡支付 2支付宝支付
@@ -135,11 +130,6 @@ public class ContractInfoTable extends Table<ContractInfo> {
     public QueryColumn validityDate = this.field(ContractInfo::getValidityDate);
 
     /**
-     * 客户id
-     */
-    public QueryColumn customerId = this.field(ContractInfo::getCustomerId);
-
-    /**
      * 客户名称
      */
     public QueryColumn customerName = this.field(ContractInfo::getCustomerName);
@@ -170,6 +160,11 @@ public class ContractInfoTable extends Table<ContractInfo> {
     public QueryColumn shippingMethod = this.field(ContractInfo::getShippingMethod);
 
     /**
+     * 卸货港
+     */
+    public QueryColumn placeOfDischarge = this.field(ContractInfo::getPlaceOfDischarge);
+
+    /**
      * 交货条款
      */
     public QueryColumn deliveryTerms = this.field(ContractInfo::getDeliveryTerms);

jy-generator/src/main/java/com/jy/generator/BusinessGenerator.java

@@ -7,9 +7,9 @@ public class BusinessGenerator {
     public static void main(String[] args) {
         GeneratorBuilder
                 .builder(
-                        "jdbc:mysql://sh-cdb-22oyn58i.sql.tencentcdb.com:63963/jy_erp_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai",
-                        "root",
-                        "PdKKy%vZ)2mGykg"
+                        "jdbc:mysql://rm-gw0i0555rlxx31n834o.mysql.cn-chengdu.rds.aliyuncs.com:9642/jy_erp_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai",
+                        "e4O5x_OTKr4w_hH",
+                        "cn0J5y3DsvdP1M-Y8AyD"
                 )
                 .port(9093)
                 .module("jy-business")