朱园亮 / xingyun-erp · Commits

Commit ae985a7fae37741a72d3dc4476da1064fed57cb0

Authored by yeqianyong
1 parent f098a324

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

Inline Side-by-side
Showing 3 changed files with 15 additions and 0 deletions
@@ -84,6 +84,12 @@ public class ShipmentsPlanDetailBo extends BaseBo<ShipmentsPlanDetail> { @@ -84,6 +84,12 @@ public class ShipmentsPlanDetailBo extends BaseBo<ShipmentsPlanDetail> {
84 private String packagingFee; 84 private String packagingFee;
85 85
86 /** 86 /**
  87 + * 合同类型
  88 + */
  89 + @ApiModelProperty("合同类型")
  90 + private String contractType;
  91 +
  92 + /**
87 * 客户ID 93 * 客户ID
88 */ 94 */
89 @ApiModelProperty("客户ID") 95 @ApiModelProperty("客户ID")
@@ -76,6 +76,12 @@ public class ShipmentsPlanDetail extends BaseEntity implements BaseDto { @@ -76,6 +76,12 @@ public class ShipmentsPlanDetail extends BaseEntity implements BaseDto {
76 private String packagingFee; 76 private String packagingFee;
77 77
78 /** 78 /**
  79 + * 合同类型
  80 + */
  81 + @TableField(exist = false)
  82 + private String contractType;
  83 +
  84 + /**
79 * 客户ID 85 * 客户ID
80 */ 86 */
81 @TableField(exist = false) 87 @TableField(exist = false)
@@ -7,6 +7,7 @@ @@ -7,6 +7,7 @@
7 <result column="plan_id" property="planId"/> 7 <result column="plan_id" property="planId"/>
8 <result column="order_id" property="orderId"/> 8 <result column="order_id" property="orderId"/>
9 <result column="order_no" property="orderNo"/> 9 <result column="order_no" property="orderNo"/>
  10 + <result column="contract_type" property="contractType"/>
10 <result column="order_type" property="orderType"/> 11 <result column="order_type" property="orderType"/>
11 <result column="customer_id" property="customerId"/> 12 <result column="customer_id" property="customerId"/>
12 <result column="customer_name" property="customerName"/> 13 <result column="customer_name" property="customerName"/>
@@ -37,6 +38,7 @@ @@ -37,6 +38,7 @@
37 tb.plan_id, 38 tb.plan_id,
38 tb.order_id, 39 tb.order_id,
39 o.order_no, 40 o.order_no,
  41 + s.type as contract_type,
40 CASE 42 CASE
41 WHEN s.type IN ('DISTRIB_STD', 'DIST_STOCK_CONTRACT', 'DRAFT_DIST_AGMT') THEN '经销' 43 WHEN s.type IN ('DISTRIB_STD', 'DIST_STOCK_CONTRACT', 'DRAFT_DIST_AGMT') THEN '经销'
42 WHEN s.type IN ('INTL_STD_CONTRACT', 'INTL_INVENTORY_AGMT', 'INTL_OPEN_SPEC_AGMT') THEN '外贸' 44 WHEN s.type IN ('INTL_STD_CONTRACT', 'INTL_INVENTORY_AGMT', 'INTL_OPEN_SPEC_AGMT') THEN '外贸'
@@ -202,6 +204,7 @@ @@ -202,6 +204,7 @@
202 o.delivery_method, 204 o.delivery_method,
203 o.settlement_terms, 205 o.settlement_terms,
204 o.packaging_fee, 206 o.packaging_fee,
  207 + sc.type as contract_type,
205 CASE 208 CASE
206 WHEN sc.type IN ('DISTRIB_STD', 'DIST_STOCK_CONTRACT', 'DRAFT_DIST_AGMT') THEN '经销' 209 WHEN sc.type IN ('DISTRIB_STD', 'DIST_STOCK_CONTRACT', 'DRAFT_DIST_AGMT') THEN '经销'
207 WHEN sc.type IN ('INTL_STD_CONTRACT', 'INTL_INVENTORY_AGMT', 'INTL_OPEN_SPEC_AGMT') THEN '外贸' 210 WHEN sc.type IN ('INTL_STD_CONTRACT', 'INTL_INVENTORY_AGMT', 'INTL_OPEN_SPEC_AGMT') THEN '外贸'