1

src/main/java/com/chinaitop/depot/business/mapper/BusinessDeliveryStorageNoticeMapper.xml

@@ -2,11 +2,6 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.chinaitop.depot.business.mapper.BusinessDeliveryStorageNoticeMapper" >
   <resultMap id="BaseResultMap" type="com.chinaitop.depot.business.model.BusinessDeliveryStorageNotice" >
-    <!--
-      WARNING - @mbggenerated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Aug 25 14:02:58 CST 2020.
-    -->
     <id column="id" property="id" jdbcType="INTEGER" />
     <result column="bill_type" property="billType" jdbcType="VARCHAR" />
     <result column="bill_type_id" property="billTypeId" jdbcType="INTEGER" />
@@ -61,14 +56,10 @@
     <result column="change_time" property="changeTime" jdbcType="TIMESTAMP" />
     <result column="change_content" property="changeContent" jdbcType="VARCHAR" />
     <result column="lqss" property="lqss" jdbcType="VARCHAR" />
+    <result column="yjssl" property="yjssl" jdbcType="DECIMAL" />
     
   </resultMap>
   <sql id="Example_Where_Clause" >
-    <!--
-      WARNING - @mbggenerated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Aug 25 14:02:58 CST 2020.
-    -->
     <where >
       <foreach collection="oredCriteria" item="criteria" separator="or" >
         <if test="criteria.valid" >
@@ -98,11 +89,6 @@
     </where>
   </sql>
   <sql id="Update_By_Example_Where_Clause" >
-    <!--
-      WARNING - @mbggenerated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Aug 25 14:02:58 CST 2020.
-    -->
     <where >
       <foreach collection="example.oredCriteria" item="criteria" separator="or" >
         <if test="criteria.valid" >
@@ -132,11 +118,6 @@
     </where>
   </sql>
   <sql id="Base_Column_List" >
-    <!--
-      WARNING - @mbggenerated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Aug 25 14:02:58 CST 2020.
-    -->
     id, bill_type, bill_type_id, bill_number, shiping_count, finished_count, received_money, 
     customer_bid, customer_number, mobile, delivery_customer, contract, contract_bid, 
     plan_number, plan_bid, bill_memo, grain_price, money_quantity, grain_annual, warehouse, 
@@ -145,14 +126,9 @@
     warehouse_id, warehouse_name, creater, create_time, create_unit, create_depot, update_time, 
     org_id, in_application, creater_id, root_contract_bid, identification, carNumber, 
     changing, change_record_flag, root_notice_bid, original_notice, original_notice_bid, 
-    change_reason, change_time, change_content, lqss
+    change_reason, change_time, change_content, lqss, yjssl
   </sql>
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.business.model.BusinessDeliveryStorageNoticeExample" >
-    <!--
-      WARNING - @mbggenerated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Aug 25 14:02:58 CST 2020.
-    -->
     select
     <if test="distinct" >
       distinct
@@ -167,42 +143,22 @@
     </if>
   </select>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
-    <!--
-      WARNING - @mbggenerated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Aug 25 14:02:58 CST 2020.
-    -->
     select 
     <include refid="Base_Column_List" />
     from business_delivery_storage_notice
     where id = #{id,jdbcType=INTEGER}
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
-    <!--
-      WARNING - @mbggenerated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Aug 25 14:02:58 CST 2020.
-    -->
     delete from business_delivery_storage_notice
     where id = #{id,jdbcType=INTEGER}
   </delete>
   <delete id="deleteByExample" parameterType="com.chinaitop.depot.business.model.BusinessDeliveryStorageNoticeExample" >
-    <!--
-      WARNING - @mbggenerated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Aug 25 14:02:58 CST 2020.
-    -->
     delete from business_delivery_storage_notice
     <if test="_parameter != null" >
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
   <insert id="insert" useGeneratedKeys="true" keyProperty="id" parameterType="com.chinaitop.depot.business.model.BusinessDeliveryStorageNotice" >
-    <!--
-      WARNING - @mbggenerated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Aug 25 14:02:58 CST 2020.
-    -->
     insert into business_delivery_storage_notice (id, bill_type, bill_type_id, 
       bill_number, shiping_count, finished_count, 
       received_money, customer_bid, customer_number, 
@@ -220,7 +176,7 @@
       root_contract_bid, identification, carNumber, 
        changing, change_record_flag, 
       root_notice_bid, original_notice, original_notice_bid, 
-      change_reason, change_time, change_content, lqss
+      change_reason, change_time, change_content, lqss, yjssl
       )
     values (#{id,jdbcType=INTEGER}, #{billType,jdbcType=VARCHAR}, #{billTypeId,jdbcType=INTEGER}, 
       #{billNumber,jdbcType=VARCHAR}, #{shipingCount,jdbcType=VARCHAR}, #{finishedCount,jdbcType=VARCHAR}, 
@@ -239,14 +195,10 @@
       #{rootContractBid,jdbcType=INTEGER}, #{identification,jdbcType=VARCHAR}, #{carnumber,jdbcType=VARCHAR}, 
        #{changing,jdbcType=VARCHAR}, #{changeRecordFlag,jdbcType=VARCHAR}, 
       #{rootNoticeBid,jdbcType=INTEGER}, #{originalNotice,jdbcType=VARCHAR}, #{originalNoticeBid,jdbcType=INTEGER}, 
-      #{changeReason,jdbcType=VARCHAR}, #{changeTime,jdbcType=TIMESTAMP}, #{changeContent,jdbcType=VARCHAR}, #{lqss,jdbcType=VARCHAR})
+      #{changeReason,jdbcType=VARCHAR}, #{changeTime,jdbcType=TIMESTAMP}, #{changeContent,jdbcType=VARCHAR}, #{lqss,jdbcType=VARCHAR},
+      #{yjssl,jdbcType=DECIMAL})
   </insert>
   <insert id="insertSelective" parameterType="com.chinaitop.depot.business.model.BusinessDeliveryStorageNotice" >
-    <!--
-      WARNING - @mbggenerated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Aug 25 14:02:58 CST 2020.
-    -->
     insert into business_delivery_storage_notice
     <trim prefix="(" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -411,7 +363,9 @@
       <if test="lqss != null" >
         lqss,
       </if>
-      
+      <if test="yjssl != null">
+        yjssl,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -576,26 +530,18 @@
       <if test="lqss != null" >
         #{lqss,jdbcType=VARCHAR},
       </if>
-      
+      <if test="yjssl != null">
+        #{yjssl,jdbcType=DECIMAL},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.chinaitop.depot.business.model.BusinessDeliveryStorageNoticeExample" resultType="java.lang.Integer" >
-    <!--
-      WARNING - @mbggenerated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Aug 25 14:02:58 CST 2020.
-    -->
     select count(*) from business_delivery_storage_notice
     <if test="_parameter != null" >
       <include refid="Example_Where_Clause" />
     </if>
   </select>
   <update id="updateByExampleSelective" parameterType="map" >
-    <!--
-      WARNING - @mbggenerated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Aug 25 14:02:58 CST 2020.
-    -->
     update business_delivery_storage_notice
     <set >
       <if test="record.id != null" >
@@ -760,18 +706,15 @@
       <if test="record.lqss != null" >
         lqss = #{record.lqss,jdbcType=VARCHAR},
       </if>
-      
+      <if test="record.yjssl != null">
+        yjssl = #{record.yjssl,jdbcType=DECIMAL},
+      </if>
     </set>
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
   <update id="updateByExample" parameterType="map" >
-    <!--
-      WARNING - @mbggenerated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Aug 25 14:02:58 CST 2020.
-    -->
     update business_delivery_storage_notice
     set id = #{record.id,jdbcType=INTEGER},
       bill_type = #{record.billType,jdbcType=VARCHAR},
@@ -826,18 +769,14 @@
       change_reason = #{record.changeReason,jdbcType=VARCHAR},
       change_time = #{record.changeTime,jdbcType=TIMESTAMP},
       change_content = #{record.changeContent,jdbcType=VARCHAR},
-      lqss = #{record.lqss,jdbcType=VARCHAR}
+      lqss = #{record.lqss,jdbcType=VARCHAR},
+      yjssl = #{record.yjssl,jdbcType=DECIMAL}
      
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.business.model.BusinessDeliveryStorageNotice" >
-    <!--
-      WARNING - @mbggenerated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Aug 25 14:02:58 CST 2020.
-    -->
     update business_delivery_storage_notice
     <set >
       <if test="billType != null" >
@@ -999,16 +938,13 @@
       <if test="lqss != null" >
         lqss = #{lqss,jdbcType=VARCHAR},
       </if>
-      
+      <if test="yjssl != null">
+        yjssl = #{yjssl,jdbcType=DECIMAL},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.business.model.BusinessDeliveryStorageNotice" >
-    <!--
-      WARNING - @mbggenerated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Aug 25 14:02:58 CST 2020.
-    -->
     update business_delivery_storage_notice
     set bill_type = #{billType,jdbcType=VARCHAR},
       bill_type_id = #{billTypeId,jdbcType=INTEGER},
@@ -1062,7 +998,8 @@
       change_reason = #{changeReason,jdbcType=VARCHAR},
       change_time = #{changeTime,jdbcType=TIMESTAMP},
       change_content = #{changeContent,jdbcType=VARCHAR},
-      lqss = #{lqss,jdbcType=VARCHAR}
+      lqss = #{lqss,jdbcType=VARCHAR},
+      yjssl = #{yjssl,jdbcType=DECIMAL}
       
     where id = #{id,jdbcType=INTEGER}
   </update>

src/main/java/com/chinaitop/depot/business/model/BusinessDeliveryStorageNotice.java

@@ -1,5 +1,6 @@
 package com.chinaitop.depot.business.model;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 public class BusinessDeliveryStorageNotice {
@@ -466,6 +467,11 @@ public class BusinessDeliveryStorageNotice {
     private String lqss;
 
     /**
+     * 已结算数量(吨)
+     */
+    private BigDecimal yjssl;
+
+    /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column business_delivery_storage_notice.id
      *
@@ -1746,4 +1752,20 @@ public class BusinessDeliveryStorageNotice {
     public void setLqss(String lqss) {
         this.lqss = lqss == null ? null : lqss.trim();
     }
+
+    /**
+     * 已结算数量(吨)
+     * @return
+     */
+	public BigDecimal getYjssl() {
+		return yjssl;
+	}
+
+	/**
+	 * 已结算数量(吨)
+	 * @param yjssl
+	 */
+	public void setYjssl(BigDecimal yjssl) {
+		this.yjssl = yjssl;
+	}
 }

src/main/java/com/chinaitop/depot/business/service/impl/BusinessDeliveryStorageNoticeServiceImpl.java

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