fanxw 1 year ago
parent
commit
f6838d2fbc

+ 14 - 14
src/main/java/com/chinaitop/depot/business/mapper/BusinessContractReceiveMapper.xml

@@ -10,7 +10,7 @@
10
     <result column="htzsl" property="htzsl" jdbcType="DECIMAL" />
10
     <result column="htzsl" property="htzsl" jdbcType="DECIMAL" />
11
     <result column="htdj" property="htdj" jdbcType="DECIMAL" />
11
     <result column="htdj" property="htdj" jdbcType="DECIMAL" />
12
     <result column="htzj" property="htzj" jdbcType="DECIMAL" />
12
     <result column="htzj" property="htzj" jdbcType="DECIMAL" />
13
-    <result column="yjsje" property="yjsje" jdbcType="DECIMAL" />
13
+    <result column="yjssl" property="yjssl" jdbcType="DECIMAL" />
14
     <result column="house_id" property="houseId" jdbcType="INTEGER" />
14
     <result column="house_id" property="houseId" jdbcType="INTEGER" />
15
     <result column="warehouse_id" property="warehouseId" jdbcType="INTEGER" />
15
     <result column="warehouse_id" property="warehouseId" jdbcType="INTEGER" />
16
     <result column="lypz" property="lypz" jdbcType="INTEGER" />
16
     <result column="lypz" property="lypz" jdbcType="INTEGER" />
@@ -87,7 +87,7 @@
87
     </where>
87
     </where>
88
   </sql>
88
   </sql>
89
   <sql id="Base_Column_List" >
89
   <sql id="Base_Column_List" >
90
-    id, org_id, spt_htid, htbh, htlx, htzsl, htdj, htzj, yjsje, house_id, warehouse_id, 
90
+    id, org_id, spt_htid, htbh, htlx, htzsl, htdj, htzj, yjssl, house_id, warehouse_id, 
91
     lypz, mxpz, lydj, lyxz, scnf, shnd, lycd, rksj, khid, khmc, tyxydm, input_time, update_time, 
91
     lypz, mxpz, lydj, lyxz, scnf, shnd, lycd, rksj, khid, khmc, tyxydm, input_time, update_time, 
92
     data_type
92
     data_type
93
   </sql>
93
   </sql>
@@ -124,7 +124,7 @@
124
   <insert id="insert" parameterType="com.chinaitop.depot.business.model.BusinessContractReceive" >
124
   <insert id="insert" parameterType="com.chinaitop.depot.business.model.BusinessContractReceive" >
125
     insert into business_contract_receive (id, org_id, spt_htid, 
125
     insert into business_contract_receive (id, org_id, spt_htid, 
126
       htbh, htlx, htzsl, 
126
       htbh, htlx, htzsl, 
127
-      htdj, htzj, yjsje, 
127
+      htdj, htzj, yjssl, 
128
       house_id, warehouse_id, lypz, 
128
       house_id, warehouse_id, lypz, 
129
       mxpz, lydj, lyxz, scnf, 
129
       mxpz, lydj, lyxz, scnf, 
130
       shnd, lycd, rksj, 
130
       shnd, lycd, rksj, 
@@ -133,7 +133,7 @@
133
       )
133
       )
134
     values (#{id,jdbcType=INTEGER}, #{orgId,jdbcType=INTEGER}, #{sptHtid,jdbcType=VARCHAR}, 
134
     values (#{id,jdbcType=INTEGER}, #{orgId,jdbcType=INTEGER}, #{sptHtid,jdbcType=VARCHAR}, 
135
       #{htbh,jdbcType=VARCHAR}, #{htlx,jdbcType=VARCHAR}, #{htzsl,jdbcType=DECIMAL}, 
135
       #{htbh,jdbcType=VARCHAR}, #{htlx,jdbcType=VARCHAR}, #{htzsl,jdbcType=DECIMAL}, 
136
-      #{htdj,jdbcType=DECIMAL}, #{htzj,jdbcType=DECIMAL}, #{yjsje,jdbcType=DECIMAL}, 
136
+      #{htdj,jdbcType=DECIMAL}, #{htzj,jdbcType=DECIMAL}, #{yjssl,jdbcType=DECIMAL}, 
137
       #{houseId,jdbcType=INTEGER}, #{warehouseId,jdbcType=INTEGER}, #{lypz,jdbcType=INTEGER}, 
137
       #{houseId,jdbcType=INTEGER}, #{warehouseId,jdbcType=INTEGER}, #{lypz,jdbcType=INTEGER}, 
138
       #{mxpz,jdbcType=INTEGER}, #{lydj,jdbcType=INTEGER}, #{lyxz,jdbcType=INTEGER}, #{scnf,jdbcType=INTEGER}, 
138
       #{mxpz,jdbcType=INTEGER}, #{lydj,jdbcType=INTEGER}, #{lyxz,jdbcType=INTEGER}, #{scnf,jdbcType=INTEGER}, 
139
       #{shnd,jdbcType=INTEGER}, #{lycd,jdbcType=INTEGER}, #{rksj,jdbcType=TIMESTAMP}, 
139
       #{shnd,jdbcType=INTEGER}, #{lycd,jdbcType=INTEGER}, #{rksj,jdbcType=TIMESTAMP}, 
@@ -168,8 +168,8 @@
168
       <if test="htzj != null" >
168
       <if test="htzj != null" >
169
         htzj,
169
         htzj,
170
       </if>
170
       </if>
171
-      <if test="yjsje != null" >
172
-        yjsje,
171
+      <if test="yjssl != null" >
172
+        yjssl,
173
       </if>
173
       </if>
174
       <if test="houseId != null" >
174
       <if test="houseId != null" >
175
         house_id,
175
         house_id,
@@ -245,8 +245,8 @@
245
       <if test="htzj != null" >
245
       <if test="htzj != null" >
246
         #{htzj,jdbcType=DECIMAL},
246
         #{htzj,jdbcType=DECIMAL},
247
       </if>
247
       </if>
248
-      <if test="yjsje != null" >
249
-        #{yjsje,jdbcType=DECIMAL},
248
+      <if test="yjssl != null" >
249
+        #{yjssl,jdbcType=DECIMAL},
250
       </if>
250
       </if>
251
       <if test="houseId != null" >
251
       <if test="houseId != null" >
252
         #{houseId,jdbcType=INTEGER},
252
         #{houseId,jdbcType=INTEGER},
@@ -331,8 +331,8 @@
331
       <if test="record.htzj != null" >
331
       <if test="record.htzj != null" >
332
         htzj = #{record.htzj,jdbcType=DECIMAL},
332
         htzj = #{record.htzj,jdbcType=DECIMAL},
333
       </if>
333
       </if>
334
-      <if test="record.yjsje != null" >
335
-        yjsje = #{record.yjsje,jdbcType=DECIMAL},
334
+      <if test="record.yjssl != null" >
335
+        yjssl = #{record.yjssl,jdbcType=DECIMAL},
336
       </if>
336
       </if>
337
       <if test="record.houseId != null" >
337
       <if test="record.houseId != null" >
338
         house_id = #{record.houseId,jdbcType=INTEGER},
338
         house_id = #{record.houseId,jdbcType=INTEGER},
@@ -397,7 +397,7 @@
397
       htzsl = #{record.htzsl,jdbcType=DECIMAL},
397
       htzsl = #{record.htzsl,jdbcType=DECIMAL},
398
       htdj = #{record.htdj,jdbcType=DECIMAL},
398
       htdj = #{record.htdj,jdbcType=DECIMAL},
399
       htzj = #{record.htzj,jdbcType=DECIMAL},
399
       htzj = #{record.htzj,jdbcType=DECIMAL},
400
-      yjsje = #{record.yjsje,jdbcType=DECIMAL},
400
+      yjssl = #{record.yjssl,jdbcType=DECIMAL},
401
       house_id = #{record.houseId,jdbcType=INTEGER},
401
       house_id = #{record.houseId,jdbcType=INTEGER},
402
       warehouse_id = #{record.warehouseId,jdbcType=INTEGER},
402
       warehouse_id = #{record.warehouseId,jdbcType=INTEGER},
403
       lypz = #{record.lypz,jdbcType=INTEGER},
403
       lypz = #{record.lypz,jdbcType=INTEGER},
@@ -442,8 +442,8 @@
442
       <if test="htzj != null" >
442
       <if test="htzj != null" >
443
         htzj = #{htzj,jdbcType=DECIMAL},
443
         htzj = #{htzj,jdbcType=DECIMAL},
444
       </if>
444
       </if>
445
-      <if test="yjsje != null" >
446
-        yjsje = #{yjsje,jdbcType=DECIMAL},
445
+      <if test="yjssl != null" >
446
+        yjssl = #{yjssl,jdbcType=DECIMAL},
447
       </if>
447
       </if>
448
       <if test="houseId != null" >
448
       <if test="houseId != null" >
449
         house_id = #{houseId,jdbcType=INTEGER},
449
         house_id = #{houseId,jdbcType=INTEGER},
@@ -505,7 +505,7 @@
505
       htzsl = #{htzsl,jdbcType=DECIMAL},
505
       htzsl = #{htzsl,jdbcType=DECIMAL},
506
       htdj = #{htdj,jdbcType=DECIMAL},
506
       htdj = #{htdj,jdbcType=DECIMAL},
507
       htzj = #{htzj,jdbcType=DECIMAL},
507
       htzj = #{htzj,jdbcType=DECIMAL},
508
-      yjsje = #{yjsje,jdbcType=DECIMAL},
508
+      yjssl = #{yjssl,jdbcType=DECIMAL},
509
       house_id = #{houseId,jdbcType=INTEGER},
509
       house_id = #{houseId,jdbcType=INTEGER},
510
       warehouse_id = #{warehouseId,jdbcType=INTEGER},
510
       warehouse_id = #{warehouseId,jdbcType=INTEGER},
511
       lypz = #{lypz,jdbcType=INTEGER},
511
       lypz = #{lypz,jdbcType=INTEGER},

+ 9 - 9
src/main/java/com/chinaitop/depot/business/model/BusinessContractReceive.java

@@ -22,7 +22,7 @@ public class BusinessContractReceive {
22
 
22
 
23
     private BigDecimal htzj;
23
     private BigDecimal htzj;
24
 
24
 
25
-    private BigDecimal yjsje;
25
+    private BigDecimal yjssl;
26
 
26
 
27
     private Integer houseId;
27
     private Integer houseId;
28
 
28
 
@@ -188,19 +188,19 @@ public class BusinessContractReceive {
188
     }
188
     }
189
 
189
 
190
     /**
190
     /**
191
-     * 已结算金额
192
-     * @return yjsje 已结算金额
191
+     * 已结算数量
192
+     * @return yjssl 已结算数量
193
      */
193
      */
194
-    public BigDecimal getYjsje() {
195
-        return yjsje;
194
+    public BigDecimal getYjssl() {
195
+        return yjssl;
196
     }
196
     }
197
 
197
 
198
     /**
198
     /**
199
-     * 已结算金额
200
-     * @param yjsje 已结算金额
199
+     * 已结算数量
200
+     * @param yjsje 已结算数量
201
      */
201
      */
202
-    public void setYjsje(BigDecimal yjsje) {
203
-        this.yjsje = yjsje;
202
+    public void setYjssl(BigDecimal yjssl) {
203
+        this.yjssl = yjssl;
204
     }
204
     }
205
 
205
 
206
     /**
206
     /**

+ 24 - 24
src/main/java/com/chinaitop/depot/business/model/BusinessContractReceiveExample.java

@@ -628,63 +628,63 @@ public class BusinessContractReceiveExample {
628
             return (Criteria) this;
628
             return (Criteria) this;
629
         }
629
         }
630
 
630
 
631
-        public Criteria andYjsjeIsNull() {
632
-            addCriterion("yjsje is null");
631
+        public Criteria andYjsslIsNull() {
632
+            addCriterion("yjssl is null");
633
             return (Criteria) this;
633
             return (Criteria) this;
634
         }
634
         }
635
 
635
 
636
-        public Criteria andYjsjeIsNotNull() {
637
-            addCriterion("yjsje is not null");
636
+        public Criteria andYjsslIsNotNull() {
637
+            addCriterion("yjssl is not null");
638
             return (Criteria) this;
638
             return (Criteria) this;
639
         }
639
         }
640
 
640
 
641
-        public Criteria andYjsjeEqualTo(BigDecimal value) {
642
-            addCriterion("yjsje =", value, "yjsje");
641
+        public Criteria andYjsslEqualTo(BigDecimal value) {
642
+            addCriterion("yjssl =", value, "yjssl");
643
             return (Criteria) this;
643
             return (Criteria) this;
644
         }
644
         }
645
 
645
 
646
-        public Criteria andYjsjeNotEqualTo(BigDecimal value) {
647
-            addCriterion("yjsje <>", value, "yjsje");
646
+        public Criteria andYjsslNotEqualTo(BigDecimal value) {
647
+            addCriterion("yjssl <>", value, "yjssl");
648
             return (Criteria) this;
648
             return (Criteria) this;
649
         }
649
         }
650
 
650
 
651
-        public Criteria andYjsjeGreaterThan(BigDecimal value) {
652
-            addCriterion("yjsje >", value, "yjsje");
651
+        public Criteria andYjsslGreaterThan(BigDecimal value) {
652
+            addCriterion("yjssl >", value, "yjssl");
653
             return (Criteria) this;
653
             return (Criteria) this;
654
         }
654
         }
655
 
655
 
656
-        public Criteria andYjsjeGreaterThanOrEqualTo(BigDecimal value) {
657
-            addCriterion("yjsje >=", value, "yjsje");
656
+        public Criteria andYjsslGreaterThanOrEqualTo(BigDecimal value) {
657
+            addCriterion("yjssl >=", value, "yjssl");
658
             return (Criteria) this;
658
             return (Criteria) this;
659
         }
659
         }
660
 
660
 
661
-        public Criteria andYjsjeLessThan(BigDecimal value) {
662
-            addCriterion("yjsje <", value, "yjsje");
661
+        public Criteria andYjsslLessThan(BigDecimal value) {
662
+            addCriterion("yjssl <", value, "yjssl");
663
             return (Criteria) this;
663
             return (Criteria) this;
664
         }
664
         }
665
 
665
 
666
-        public Criteria andYjsjeLessThanOrEqualTo(BigDecimal value) {
667
-            addCriterion("yjsje <=", value, "yjsje");
666
+        public Criteria andYjsslLessThanOrEqualTo(BigDecimal value) {
667
+            addCriterion("yjssl <=", value, "yjssl");
668
             return (Criteria) this;
668
             return (Criteria) this;
669
         }
669
         }
670
 
670
 
671
-        public Criteria andYjsjeIn(List<BigDecimal> values) {
672
-            addCriterion("yjsje in", values, "yjsje");
671
+        public Criteria andYjsslIn(List<BigDecimal> values) {
672
+            addCriterion("yjssl in", values, "yjssl");
673
             return (Criteria) this;
673
             return (Criteria) this;
674
         }
674
         }
675
 
675
 
676
-        public Criteria andYjsjeNotIn(List<BigDecimal> values) {
677
-            addCriterion("yjsje not in", values, "yjsje");
676
+        public Criteria andYjsslNotIn(List<BigDecimal> values) {
677
+            addCriterion("yjssl not in", values, "yjssl");
678
             return (Criteria) this;
678
             return (Criteria) this;
679
         }
679
         }
680
 
680
 
681
-        public Criteria andYjsjeBetween(BigDecimal value1, BigDecimal value2) {
682
-            addCriterion("yjsje between", value1, value2, "yjsje");
681
+        public Criteria andYjsslBetween(BigDecimal value1, BigDecimal value2) {
682
+            addCriterion("yjssl between", value1, value2, "yjssl");
683
             return (Criteria) this;
683
             return (Criteria) this;
684
         }
684
         }
685
 
685
 
686
-        public Criteria andYjsjeNotBetween(BigDecimal value1, BigDecimal value2) {
687
-            addCriterion("yjsje not between", value1, value2, "yjsje");
686
+        public Criteria andYjsslNotBetween(BigDecimal value1, BigDecimal value2) {
687
+            addCriterion("yjssl not between", value1, value2, "yjssl");
688
             return (Criteria) this;
688
             return (Criteria) this;
689
         }
689
         }
690
 
690
 

+ 1 - 0
src/main/java/com/chinaitop/depot/business/service/impl/BusinessContractReceiveServiceImpl.java

@@ -324,6 +324,7 @@ public class BusinessContractReceiveServiceImpl implements BusinessContractRecei
324
 		} else {
324
 		} else {
325
 			businessContractReceive.setId(list.get(0).getId());
325
 			businessContractReceive.setId(list.get(0).getId());
326
 			businessContractReceive.setUpdateTime(new Date());
326
 			businessContractReceive.setUpdateTime(new Date());
327
+			businessContractReceive.setYjssl(new BigDecimal(0));
327
 			businessContractReceiveMapper.updateByExample(businessContractReceive, example);
328
 			businessContractReceiveMapper.updateByExample(businessContractReceive, example);
328
 		}
329
 		}
329
 	}
330
 	}