fanxw hai 1 ano
pai
achega
5008c58058

+ 20 - 5
src/main/java/com/chinaitop/depot/business/mapper/BusinessStoreWareDetailMapper.xml

@@ -31,6 +31,7 @@
31 31
     <result column="jstzd_id" property="jstzdId" jdbcType="VARCHAR" />
32 32
     <result column="agreement_number" property="agreementNumber" jdbcType="VARCHAR" />
33 33
     <result column="incoming_type" property="incomingType" jdbcType="INTEGER" />
34
+    <result column="htbh" property="htbh" jdbcType="VARCHAR" />
34 35
   </resultMap>
35 36
   <sql id="Example_Where_Clause" >
36 37
     <where >
@@ -94,7 +95,7 @@
94 95
     id, zid, type, house_id, house_name, warehouse_id, warehouse_name, create_time, org_id, 
95 96
     grain_kind, grain_detail_kind, grain_grade, grain_attribute, grain_annual, grain_producing_area, 
96 97
     in_price, in_count, in_detail_total_price, input_time, state, productive_year, remaining_number, 
97
-    out_price, out_count, out_detail_total_price, out_remaining_number,jstzd_id,agreement_number,incoming_type
98
+    out_price, out_count, out_detail_total_price, out_remaining_number,jstzd_id,agreement_number,incoming_type,htbh
98 99
   </sql>
99 100
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.business.model.BusinessStoreWareDetailExample" >
100 101
     select
@@ -135,7 +136,7 @@
135 136
       in_price, in_count, in_detail_total_price, 
136 137
       input_time, state, productive_year, 
137 138
       remaining_number, out_price, out_count, 
138
-      out_detail_total_price, out_remaining_number,jstzd_id,agreement_number,incoming_type
139
+      out_detail_total_price, out_remaining_number,jstzd_id,agreement_number,incoming_type,htbh
139 140
       )
140 141
     values (#{id,jdbcType=INTEGER}, #{zid,jdbcType=INTEGER}, #{type,jdbcType=VARCHAR}, 
141 142
       #{houseId,jdbcType=INTEGER}, #{houseName,jdbcType=VARCHAR}, #{warehouseId,jdbcType=INTEGER}, 
@@ -146,7 +147,7 @@
146 147
       #{inputTime,jdbcType=TIMESTAMP}, #{state,jdbcType=INTEGER}, #{productiveYear,jdbcType=INTEGER}, 
147 148
       #{remainingNumber,jdbcType=VARCHAR}, #{outPrice,jdbcType=VARCHAR}, #{outCount,jdbcType=VARCHAR}, 
148 149
       #{outDetailTotalPrice,jdbcType=VARCHAR}, #{outRemainingNumber,jdbcType=VARCHAR},#{jstzdId,jdbcType=VARCHAR}
149
-      ,#{agreementNumber,jdbcType=VARCHAR},#{incomingType,jdbcType=INTEGER})
150
+      ,#{agreementNumber,jdbcType=VARCHAR},#{incomingType,jdbcType=INTEGER},#{htbh,jdbcType=VARCHAR})
150 151
   </insert>
151 152
   <insert id="insertSelective" parameterType="com.chinaitop.depot.business.model.BusinessStoreWareDetail" >
152 153
     insert into business_store_ware_detail
@@ -238,6 +239,9 @@
238 239
       <if test="incomingType != null" >
239 240
         incoming_type,
240 241
       </if>
242
+      <if test="htbh != null">
243
+        htbh,
244
+      </if>
241 245
     </trim>
242 246
     <trim prefix="values (" suffix=")" suffixOverrides="," >
243 247
       <if test="id != null" >
@@ -327,6 +331,9 @@
327 331
       <if test="incomingType != null" >
328 332
         #{incomingType,jdbcType=INTEGER},
329 333
       </if>
334
+      <if test="htbh != null">
335
+        #{htbh,jdbcType=VARCHAR},
336
+      </if>
330 337
     </trim>
331 338
   </insert>
332 339
   <select id="countByExample" parameterType="com.chinaitop.depot.business.model.BusinessStoreWareDetailExample" resultType="java.lang.Integer" >
@@ -425,6 +432,9 @@
425 432
       <if test="record.incomingType != null" >
426 433
         incoming_type = #{record.incomingType,jdbcType=INTEGER},
427 434
       </if>
435
+      <if test="record.htbh != null">
436
+        htbh = #{record.htbh,jdbcType=VARCHAR},
437
+      </if>
428 438
     </set>
429 439
     <if test="_parameter != null" >
430 440
       <include refid="Update_By_Example_Where_Clause" />
@@ -459,7 +469,8 @@
459 469
       out_detail_total_price = #{record.outDetailTotalPrice,jdbcType=VARCHAR},
460 470
       out_remaining_number = #{record.outRemainingNumber,jdbcType=VARCHAR},
461 471
       jstzd_id = #{record.jstzdId,jdbcType=VARCHAR},agreement_number = #{record.agreementNumber,jdbcType=VARCHAR},
462
-      incoming_type = #{record.incomingType,jdbcType=INTEGER}
472
+      incoming_type = #{record.incomingType,jdbcType=INTEGER},
473
+      htbh = #{record.htbh,jdbcType=VARCHAR}
463 474
     <if test="_parameter != null" >
464 475
       <include refid="Update_By_Example_Where_Clause" />
465 476
     </if>
@@ -551,6 +562,9 @@
551 562
       <if test="incomingType != null" >
552 563
         incoming_type = #{incomingType,jdbcType=INTEGER},
553 564
       </if>
565
+      <if test="htbh != null">
566
+        htbh = #{htbh,jdbcType=VARCHAR},
567
+      </if>
554 568
     </set>
555 569
     where id = #{id,jdbcType=INTEGER}
556 570
   </update>
@@ -583,7 +597,8 @@
583 597
       out_remaining_number = #{outRemainingNumber,jdbcType=VARCHAR},
584 598
       jstzd_id = #{jstzdId,jdbcType=VARCHAR},
585 599
       agreement_number = #{agreementNumber,jdbcType=VARCHAR},
586
-      incoming_type = #{incomingType,jdbcType=INTEGER}
600
+      incoming_type = #{incomingType,jdbcType=INTEGER},
601
+      htbh = #{htbh,jdbcType=VARCHAR}
587 602
     where id = #{id,jdbcType=INTEGER}
588 603
   </update>
589 604
   <!-- 通过计划ID获取计划子表数据的已使用数量 -->

+ 26 - 10
src/main/java/com/chinaitop/depot/business/model/BusinessStoreWareDetail.java

@@ -6,11 +6,11 @@ import com.fasterxml.jackson.annotation.JsonFormat;
6 6
 
7 7
 public class BusinessStoreWareDetail {
8 8
 	
9
-	 private String agreementNumber;//协议编号
10
-	 private Integer incomingType;//入库类型
11
-	 
12
-		
13
-	 public Integer getIncomingType() {
9
+	private String agreementNumber;//协议编号
10
+	private Integer incomingType;//入库类型
11
+	private String htbh;//合同编号
12
+
13
+	public Integer getIncomingType() {
14 14
 		return incomingType;
15 15
 	}
16 16
 
@@ -19,13 +19,13 @@ public class BusinessStoreWareDetail {
19 19
 	}
20 20
 
21 21
 	public String getAgreementNumber() {
22
-		return agreementNumber;
23
-	 }
22
+	    return agreementNumber;
23
+	}
24 24
 
25
-	 public void setAgreementNumber(String agreementNumber) {
25
+	public void setAgreementNumber(String agreementNumber) {
26 26
 		this.agreementNumber = agreementNumber;
27
-	 }
28
-		
27
+	}
28
+
29 29
     private Integer id;
30 30
 
31 31
     private Integer zid;
@@ -812,4 +812,20 @@ public class BusinessStoreWareDetail {
812 812
     public void setOutRemainingNumber(String outRemainingNumber) {
813 813
         this.outRemainingNumber = outRemainingNumber == null ? null : outRemainingNumber.trim();
814 814
     }
815
+
816
+    /**
817
+     * 合同编号
818
+     * @return
819
+     */
820
+	public String getHtbh() {
821
+		return htbh;
822
+	}
823
+
824
+	/**
825
+	 * 合同编号
826
+	 * @param htbh
827
+	 */
828
+	public void setHtbh(String htbh) {
829
+		this.htbh = htbh;
830
+	}
815 831
 }