楚江ERP-发货明细列表数据调整

@@ -84,6 +84,12 @@ public class ShipmentsPlanDetailBo extends BaseBo<ShipmentsPlanDetail> {
     private String packagingFee;
 
     /**
+     * 合同类型
+     */
+    @ApiModelProperty("合同类型")
+    private String contractType;
+
+    /**
      * 客户ID
      */
     @ApiModelProperty("客户ID")

@@ -76,6 +76,12 @@ public class ShipmentsPlanDetail extends BaseEntity implements BaseDto {
     private String packagingFee;
 
     /**
+     * 合同类型
+     */
+    @TableField(exist = false)
+    private String contractType;
+
+    /**
      * 客户ID
      */
     @TableField(exist = false)

@@ -7,6 +7,7 @@
         <result column="plan_id" property="planId"/>
         <result column="order_id" property="orderId"/>
         <result column="order_no" property="orderNo"/>
+        <result column="contract_type" property="contractType"/>
         <result column="order_type" property="orderType"/>
         <result column="customer_id" property="customerId"/>
         <result column="customer_name" property="customerName"/>
@@ -37,6 +38,7 @@
             tb.plan_id,
             tb.order_id,
             o.order_no,
+            s.type as contract_type,
             CASE
                 WHEN s.type IN ('DISTRIB_STD', 'DIST_STOCK_CONTRACT', 'DRAFT_DIST_AGMT') THEN '经销'
                 WHEN s.type IN ('INTL_STD_CONTRACT', 'INTL_INVENTORY_AGMT', 'INTL_OPEN_SPEC_AGMT') THEN '外贸'
@@ -202,6 +204,7 @@
             o.delivery_method,
             o.settlement_terms,
             o.packaging_fee,
+            sc.type as contract_type,
             CASE
                 WHEN sc.type IN ('DISTRIB_STD', 'DIST_STOCK_CONTRACT', 'DRAFT_DIST_AGMT') THEN '经销'
                 WHEN sc.type IN ('INTL_STD_CONTRACT', 'INTL_INVENTORY_AGMT', 'INTL_OPEN_SPEC_AGMT') THEN '外贸'