fanxw пре 9 месеци
родитељ
комит
f7819067f7

+ 5 - 21
src/main/java/com/chinaitop/depot/business/mapper/BusinessDeliveryStorageNoticeMapper.xml

@@ -56,7 +56,6 @@
56 56
     <result column="change_time" property="changeTime" jdbcType="TIMESTAMP" />
57 57
     <result column="change_content" property="changeContent" jdbcType="VARCHAR" />
58 58
     <result column="lqss" property="lqss" jdbcType="VARCHAR" />
59
-    <result column="yjssl" property="yjssl" jdbcType="DECIMAL" />
60 59
     
61 60
   </resultMap>
62 61
   <sql id="Example_Where_Clause" >
@@ -126,7 +125,7 @@
126 125
     warehouse_id, warehouse_name, creater, create_time, create_unit, create_depot, update_time, 
127 126
     org_id, in_application, creater_id, root_contract_bid, identification, carNumber, 
128 127
     changing, change_record_flag, root_notice_bid, original_notice, original_notice_bid, 
129
-    change_reason, change_time, change_content, lqss, yjssl
128
+    change_reason, change_time, change_content, lqss
130 129
   </sql>
131 130
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.business.model.BusinessDeliveryStorageNoticeExample" >
132 131
     select
@@ -176,7 +175,7 @@
176 175
       root_contract_bid, identification, carNumber, 
177 176
        changing, change_record_flag, 
178 177
       root_notice_bid, original_notice, original_notice_bid, 
179
-      change_reason, change_time, change_content, lqss, yjssl
178
+      change_reason, change_time, change_content, lqss
180 179
       )
181 180
     values (#{id,jdbcType=INTEGER}, #{billType,jdbcType=VARCHAR}, #{billTypeId,jdbcType=INTEGER}, 
182 181
       #{billNumber,jdbcType=VARCHAR}, #{shipingCount,jdbcType=VARCHAR}, #{finishedCount,jdbcType=VARCHAR}, 
@@ -195,8 +194,7 @@
195 194
       #{rootContractBid,jdbcType=INTEGER}, #{identification,jdbcType=VARCHAR}, #{carnumber,jdbcType=VARCHAR}, 
196 195
        #{changing,jdbcType=VARCHAR}, #{changeRecordFlag,jdbcType=VARCHAR}, 
197 196
       #{rootNoticeBid,jdbcType=INTEGER}, #{originalNotice,jdbcType=VARCHAR}, #{originalNoticeBid,jdbcType=INTEGER}, 
198
-      #{changeReason,jdbcType=VARCHAR}, #{changeTime,jdbcType=TIMESTAMP}, #{changeContent,jdbcType=VARCHAR}, #{lqss,jdbcType=VARCHAR},
199
-      #{yjssl,jdbcType=DECIMAL})
197
+      #{changeReason,jdbcType=VARCHAR}, #{changeTime,jdbcType=TIMESTAMP}, #{changeContent,jdbcType=VARCHAR}, #{lqss,jdbcType=VARCHAR})
200 198
   </insert>
201 199
   <insert id="insertSelective" parameterType="com.chinaitop.depot.business.model.BusinessDeliveryStorageNotice" >
202 200
     insert into business_delivery_storage_notice
@@ -363,9 +361,6 @@
363 361
       <if test="lqss != null" >
364 362
         lqss,
365 363
       </if>
366
-      <if test="yjssl != null">
367
-        yjssl,
368
-      </if>
369 364
     </trim>
370 365
     <trim prefix="values (" suffix=")" suffixOverrides="," >
371 366
       <if test="id != null" >
@@ -530,9 +525,6 @@
530 525
       <if test="lqss != null" >
531 526
         #{lqss,jdbcType=VARCHAR},
532 527
       </if>
533
-      <if test="yjssl != null">
534
-        #{yjssl,jdbcType=DECIMAL},
535
-      </if>
536 528
     </trim>
537 529
   </insert>
538 530
   <select id="countByExample" parameterType="com.chinaitop.depot.business.model.BusinessDeliveryStorageNoticeExample" resultType="java.lang.Integer" >
@@ -706,9 +698,6 @@
706 698
       <if test="record.lqss != null" >
707 699
         lqss = #{record.lqss,jdbcType=VARCHAR},
708 700
       </if>
709
-      <if test="record.yjssl != null">
710
-        yjssl = #{record.yjssl,jdbcType=DECIMAL},
711
-      </if>
712 701
     </set>
713 702
     <if test="_parameter != null" >
714 703
       <include refid="Update_By_Example_Where_Clause" />
@@ -769,8 +758,7 @@
769 758
       change_reason = #{record.changeReason,jdbcType=VARCHAR},
770 759
       change_time = #{record.changeTime,jdbcType=TIMESTAMP},
771 760
       change_content = #{record.changeContent,jdbcType=VARCHAR},
772
-      lqss = #{record.lqss,jdbcType=VARCHAR},
773
-      yjssl = #{record.yjssl,jdbcType=DECIMAL}
761
+      lqss = #{record.lqss,jdbcType=VARCHAR}
774 762
      
775 763
     <if test="_parameter != null" >
776 764
       <include refid="Update_By_Example_Where_Clause" />
@@ -938,9 +926,6 @@
938 926
       <if test="lqss != null" >
939 927
         lqss = #{lqss,jdbcType=VARCHAR},
940 928
       </if>
941
-      <if test="yjssl != null">
942
-        yjssl = #{yjssl,jdbcType=DECIMAL},
943
-      </if>
944 929
     </set>
945 930
     where id = #{id,jdbcType=INTEGER}
946 931
   </update>
@@ -998,8 +983,7 @@
998 983
       change_reason = #{changeReason,jdbcType=VARCHAR},
999 984
       change_time = #{changeTime,jdbcType=TIMESTAMP},
1000 985
       change_content = #{changeContent,jdbcType=VARCHAR},
1001
-      lqss = #{lqss,jdbcType=VARCHAR},
1002
-      yjssl = #{yjssl,jdbcType=DECIMAL}
986
+      lqss = #{lqss,jdbcType=VARCHAR}
1003 987
       
1004 988
     where id = #{id,jdbcType=INTEGER}
1005 989
   </update>

+ 0 - 21
src/main/java/com/chinaitop/depot/business/model/BusinessDeliveryStorageNotice.java

@@ -1,6 +1,5 @@
1 1
 package com.chinaitop.depot.business.model;
2 2
 
3
-import java.math.BigDecimal;
4 3
 import java.util.Date;
5 4
 
6 5
 public class BusinessDeliveryStorageNotice {
@@ -467,11 +466,6 @@ public class BusinessDeliveryStorageNotice {
467 466
     private String lqss;
468 467
 
469 468
     /**
470
-     * 已结算数量(吨)
471
-     */
472
-    private BigDecimal yjssl;
473
-
474
-    /**
475 469
      * This method was generated by MyBatis Generator.
476 470
      * This method returns the value of the database column business_delivery_storage_notice.id
477 471
      *
@@ -1753,19 +1747,4 @@ public class BusinessDeliveryStorageNotice {
1753 1747
         this.lqss = lqss == null ? null : lqss.trim();
1754 1748
     }
1755 1749
 
1756
-    /**
1757
-     * 已结算数量(吨)
1758
-     * @return
1759
-     */
1760
-	public BigDecimal getYjssl() {
1761
-		return yjssl;
1762
-	}
1763
-
1764
-	/**
1765
-	 * 已结算数量(吨)
1766
-	 * @param yjssl
1767
-	 */
1768
-	public void setYjssl(BigDecimal yjssl) {
1769
-		this.yjssl = yjssl;
1770
-	}
1771 1750
 }

+ 1 - 2
src/main/java/com/chinaitop/depot/business/service/impl/BusinessDeliveryStorageNoticeServiceImpl.java

@@ -97,8 +97,7 @@ public class BusinessDeliveryStorageNoticeServiceImpl implements BusinessDeliver
97 97
     public Map<String, Object> add(BusinessDeliveryStorageNotice businessDeliveryStorageNotice, 
98 98
             List<BusinessStoreWareDetail> storeWareDetailList, Integer userId, String name ,Integer orgId,Integer depotInfoOrgId) {
99 99
         Map<String, Object> returnMap = new HashMap<String, Object>();
100
-        //已结算数量为0
101
-        businessDeliveryStorageNotice.setYjssl(new BigDecimal(0));
100
+
102 101
         // 没有被变更.
103 102
         businessDeliveryStorageNotice.setChanging("0");
104 103
         // 不是变更数据.