朱园亮 / xingyun-erp · Commits

Commit cbb0a39f53dcdfb793597b04a12c9dea8b79d77c

Authored by 房远帅
1 parent 49194c84

订货单：新增合同类型

Inline Side-by-side
Showing 2 changed files with 9 additions and 0 deletions
@@ -37,6 +37,12 @@ public class GetPurchaseOrderInfoBo extends BaseBo<PurchaseOrderInfo> { @@ -37,6 +37,12 @@ public class GetPurchaseOrderInfoBo extends BaseBo<PurchaseOrderInfo> {
37 private String contractId; 37 private String contractId;
38 38
39 /** 39 /**
  40 + * 合同类型
  41 + */
  42 + @ApiModelProperty("合同类型")
  43 + private String contractType;
  44 +
  45 + /**
40 * 订单编号 46 * 订单编号
41 */ 47 */
42 @ApiModelProperty("订单编号") 48 @ApiModelProperty("订单编号")
@@ -5,6 +5,7 @@ @@ -5,6 +5,7 @@
5 <resultMap id="PurchaseOrderInfo" type="com.lframework.xingyun.sc.entity.PurchaseOrderInfo"> 5 <resultMap id="PurchaseOrderInfo" type="com.lframework.xingyun.sc.entity.PurchaseOrderInfo">
6 <id column="id" property="id"/> 6 <id column="id" property="id"/>
7 <result column="contract_id" property="contractId"/> 7 <result column="contract_id" property="contractId"/>
  8 + <result column="contract_type" property="contractType"/>
8 <result column="replenishment_order_id" property="replenishmentOrderId"/> 9 <result column="replenishment_order_id" property="replenishmentOrderId"/>
9 <result column="order_no" property="orderNo"/> 10 <result column="order_no" property="orderNo"/>
10 <result column="supply_unit" property="supplyUnit"/> 11 <result column="supply_unit" property="supplyUnit"/>
@@ -63,6 +64,7 @@ @@ -63,6 +64,7 @@
63 SELECT 64 SELECT
64 tb.id, 65 tb.id,
65 tb.contract_id, 66 tb.contract_id,
  67 + cds.type AS contract_type,
66 tb.replenishment_order_id, 68 tb.replenishment_order_id,
67 tb.order_no, 69 tb.order_no,
68 tb.supply_unit, 70 tb.supply_unit,
@@ -124,6 +126,7 @@ @@ -124,6 +126,7 @@
124 left join sys_user as su on su.id = tb.contract_create_by_id 126 left join sys_user as su on su.id = tb.contract_create_by_id
125 left join sys_dept as sd1 on sd1.id = tb.region 127 left join sys_dept as sd1 on sd1.id = tb.region
126 left join base_data_customer as cu1 on cu1.id = tb.stock_up_company_id 128 left join base_data_customer as cu1 on cu1.id = tb.stock_up_company_id
  129 + left join tbl_contract_distributor_standard as cds on cds.id = tb.contract_id
127 </sql> 130 </sql>
128 131
129 <select id="query" resultMap="PurchaseOrderInfo"> 132 <select id="query" resultMap="PurchaseOrderInfo">