合同功能修改

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

@@ -491,4 +491,59 @@ public class Contract extends BasePo {
      */
     private Date outboundTime;
 
+    //-----------------------------------------------------------
+
+    /**
+     * 业务员id
+     */
+    private Long salesmanId;
+
+    /**
+     * 订单渠道
+     */
+    private String contractChannel;
+    /**
+     * 订单渠道 编号
+     */
+    private String channelCode;
+    /**
+     * 销售日期
+     */
+    private Date saleDate;
+    /**
+     * 税运方式（字典 tax_transportation_way）
+     */
+    private String taxTransportationWay;
+    /**
+     * 出货前付款比例
+     */
+    private BigDecimal beforeShipmentRatio;
+    /**
+     * 出货后付款比例
+     */
+    private BigDecimal afterShipmentRatio;
+
+    /**
+     * 出厂总金额
+     */
+    private BigDecimal factoryAmount;
+
+    /**
+     * 毛利
+     */
+    private BigDecimal grossProfit;
+    /**
+     * 税点
+     */
+    private BigDecimal taxPoints;
+
+    /**
+     * 阿里巴巴编号
+     */
+    private String alibabaCode;
+    /**
+     * 1688店铺名称
+     */
+    private String alibabaShopName;
+
 }

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

@@ -133,14 +133,19 @@ public class ContractProduct extends BasePo {
      * 产品宽
      */
     private BigDecimal productWidth;
-    /**
-     * 产品高
-     */
-    private BigDecimal productHeight;
-
-    /**
-     * 报价单商品表id
-     */
-    private Long quotationProductId;
+	/**
+	 * 产品高
+	 */
+	private BigDecimal productHeight;
+
+	/**
+	 * 报价单商品表id
+	 */
+	private Long quotationProductId;
+
+	/**
+	 * 出场价
+	 */
+	private BigDecimal factoryPrice;
 
 }

hx-sale/src/main/java/com/fjhx/sale/entity/contract/vo/ContractProductVo.java

@@ -70,25 +70,47 @@ public class ContractProductVo extends ContractProduct {
 
     /**
      * 货品规格型号
-     */
-    private String productSpec;
-
-    /**
-     * 货品类型
-     */
-    private String productType;
-
-    private String productColor;
-
-    /**
-     * 产品图片地址
-     */
-    private String productImgUrl;
-
-    /**
-     * 所属分类id
-     */
-    private Long productCategoryId;
+	 */
+	private String productSpec;
+
+	/**
+	 * 货品类型
+	 */
+	private String productType;
+
+	private String productColor;
+
+	private String productClassifyName;
+
+	/**
+	 * 正面纹路
+	 */
+	private String productFrontalTexture;
+	/**
+	 * 反面纹路
+	 */
+	private String productReverseTexture;
+	/**
+	 * 净重
+	 */
+	private BigDecimal productNetWeight;
+	/**
+	 * 净重
+	 */
+	private BigDecimal netWeight;
+	/**
+	 * 单位
+	 */
+	private String unit;
+	/**
+	 * 产品图片地址
+	 */
+	private String productImgUrl;
+
+	/**
+	 * 所属分类id
+	 */
+	private Long productCategoryId;
 
     /**
      * 合同产品数量

hx-sale/src/main/java/com/fjhx/sale/entity/contract/vo/ContractVo.java

@@ -232,15 +232,17 @@ public class ContractVo extends Contract {
     /**
      * 生产状态
      */
-    private Integer produceStatus;
+	private Integer produceStatus;
 
-    /**
-     * 跟单员名称
-     */
-    private String merchUserName;
+	/**
+	 * 跟单员名称
+	 */
+	private String merchUserName;
+
+	private String ofCompanyName;
 
-    private String ofCompanyName;
 
+	private String createUserName;
 
 }
 

hx-wms/src/main/java/com/fjhx/wms/mapper/stock/StockWaitDetailsMapper.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.wms.entity.stock.po.StockWaitDetails;
 import com.fjhx.wms.entity.stock.vo.StockWaitDetailsVo;
 import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 
@@ -16,6 +17,7 @@ import org.apache.ibatis.annotations.Param;
  * @author
  * @since 2023-04-13
  */
+@Mapper
 public interface StockWaitDetailsMapper extends BaseMapper<StockWaitDetails> {
 
     /**