Commit 024dfa53f90f5fed292fe2fc47b030bd5b4a5ed6

Authored by yeqianyong
1 parent 31fc1b97

楚江erp:台账明细增加内贸、外贸区分

... ... @@ -29,6 +29,14 @@ public class QueryReceiptLedgerInfoBo extends BaseBo<ReceiptLedgerInfo> {
29 29 @ApiModelProperty("ID")
30 30 private String id;
31 31
  32 + /**
  33 + * 类型
  34 + * 外贸: OUTSIDE
  35 + * 内贸:INSIDE
  36 + */
  37 + @ApiModelProperty("类型")
  38 + private String type;
  39 +
32 40 @ApiModelProperty("父ID")
33 41 private String parentId;
34 42
... ...
... ... @@ -30,6 +30,13 @@ public class ReceiptLedgerInfo extends BaseEntity implements BaseDto {
30 30 private String id;
31 31
32 32 /**
  33 + * 类型
  34 + * 外贸: OUTSIDE
  35 + * 内贸:INSIDE
  36 + */
  37 + private String type;
  38 +
  39 + /**
33 40 * 父ID
34 41 */
35 42 private String parentId;
... ...
... ... @@ -238,6 +238,7 @@ public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedge
238 238 String userId = SecurityUtil.getCurrentUser().getId();
239 239 ReceiptLedgerInfo data = new ReceiptLedgerInfo();
240 240 data.setId(IdUtil.getId());
  241 + data.setType(vo.getType());
241 242 data.setParentId(vo.getId());
242 243 data.setCustomerShortId(vo.getCustomerShortId());
243 244 data.setQuota(vo.getQuota());
... ...
... ... @@ -18,6 +18,14 @@ public class QueryReceiptLedgerInfoVo extends PageVo implements BaseVo, Serializ
18 18 private String id;
19 19
20 20 /**
  21 + * 类型
  22 + * 外贸: OUTSIDE
  23 + * 内贸:INSIDE
  24 + */
  25 + @ApiModelProperty("类型")
  26 + private String type;
  27 +
  28 + /**
21 29 * 客户简称ID
22 30 */
23 31 @ApiModelProperty("客户简称ID")
... ...
... ... @@ -4,6 +4,7 @@
4 4
5 5 <resultMap id="ReceiptLedgerInfo" type="com.lframework.xingyun.sc.entity.ReceiptLedgerInfo">
6 6 <id column="id" property="id"/>
  7 + <result column="type" property="type"/>
7 8 <result column="parent_id" property="parentId"/>
8 9 <result column="customer_short_id" property="customerShortId"/>
9 10 <result column="customer_short_name" property="customerShortName"/>
... ... @@ -45,6 +46,7 @@
45 46 <sql id="ReceiptLedgerInfo_sql">
46 47 SELECT
47 48 tb.id,
  49 + tb.type,
48 50 tb.parent_id,
49 51 tb.customer_short_id,
50 52 cs.short_name as customer_short_name,
... ... @@ -96,6 +98,9 @@
96 98 <if test="vo.id != null and vo.id != ''">
97 99 AND tb.id = #{vo.id}
98 100 </if>
  101 + <if test="vo.type != null and vo.type != ''">
  102 + AND tb.type = #{vo.type}
  103 + </if>
99 104 <if test="vo.customerShortId != null and vo.customerShortId != ''">
100 105 AND tb.customer_short_id = #{vo.customerShortId}
101 106 </if>
... ... @@ -137,6 +142,7 @@
137 142 <insert id="batchAdd">
138 143 INSERT INTO receipt_ledger_info (
139 144 id,
  145 + type,
140 146 parent_id,
141 147 customer_short_id,
142 148 quota,
... ... @@ -169,6 +175,7 @@
169 175 <foreach collection="list" item="item" separator=",">
170 176 (
171 177 #{item.id},
  178 + #{item.type},
172 179 #{item.parentId},
173 180 #{item.customerShortId},
174 181 #{item.quota},
... ...