|  | @@ -43,6 +43,7 @@
 | 
		
	
		
			
			| 43 | 43 |  
 | 
		
	
		
			
			| 44 | 44 |      <result column="in_ware_days" property="inWareDays" jdbcType="INTEGER" />
 | 
		
	
		
			
			| 45 | 45 |      <result column="store_fee" property="storeFee" jdbcType="DOUBLE" />
 | 
		
	
		
			
			|  | 46 | +    <result column="contract_no" property="contractNo" jdbcType="VARCHAR" />
 | 
		
	
		
			
			| 46 | 47 |  
 | 
		
	
		
			
			| 47 | 48 |      <association  column="add_id" property="addUser" select="com.th.demo.mapping.system.SysUserMapper.selectByPrimaryKey" />
 | 
		
	
		
			
			| 48 | 49 |      <association  column="distribution_id" property="distribution" select="com.th.demo.mapping.ware.DistributionMapper.selectByPrimaryKey" />
 | 
		
	
	
		
			
			|  | @@ -90,6 +91,7 @@
 | 
		
	
		
			
			| 90 | 91 |      <result column="in_ware_days" property="inWareDays" jdbcType="INTEGER" />
 | 
		
	
		
			
			| 91 | 92 |      <result column="store_fee" property="storeFee" jdbcType="DOUBLE" />
 | 
		
	
		
			
			| 92 | 93 |      <result column="unit_price" property="unitPrice" jdbcType="DOUBLE" />
 | 
		
	
		
			
			|  | 94 | +    <result column="contract_no" property="contractNo" jdbcType="VARCHAR" />
 | 
		
	
		
			
			| 93 | 95 |    </resultMap>
 | 
		
	
		
			
			| 94 | 96 |    <resultMap id="TotalResultMap" type="com.th.demo.model.ware.TotalRecord">
 | 
		
	
		
			
			| 95 | 97 |      <result column="total_amount" property="totalAmount" jdbcType="DOUBLE" />
 | 
		
	
	
		
			
			|  | @@ -98,7 +100,8 @@
 | 
		
	
		
			
			| 98 | 100 |    <sql id="Base_Column_List" >
 | 
		
	
		
			
			| 99 | 101 |      id, ware_name, stack_name, layer, material_name, material_no, standard, model, customer_name, 
 | 
		
	
		
			
			| 100 | 102 |      customer_no, count, weight, remark, add_id, add_time, modify_id, modify_time, cancel_id, 
 | 
		
	
		
			
			| 101 |  | -    cancel_time, cancel_flag, belong_id, plate_no,in_id, record_type,back_flag,receive_address,distribution_id,wgt_dcn_mtc_cd,edge_ty,production_place,verify_account_id,unit_price
 | 
		
	
		
			
			|  | 103 | +    cancel_time, cancel_flag, belong_id, plate_no,in_id, record_type,back_flag,receive_address,
 | 
		
	
		
			
			|  | 104 | +    distribution_id,wgt_dcn_mtc_cd,edge_ty,production_place,verify_account_id,unit_price,contract_no
 | 
		
	
		
			
			| 102 | 105 |    </sql>
 | 
		
	
		
			
			| 103 | 106 |    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
 | 
		
	
		
			
			| 104 | 107 |      select 
 | 
		
	
	
		
			
			|  | @@ -122,7 +125,7 @@
 | 
		
	
		
			
			| 122 | 125 |        modify_id, modify_time, cancel_id, 
 | 
		
	
		
			
			| 123 | 126 |        cancel_time, cancel_flag, belong_id, 
 | 
		
	
		
			
			| 124 | 127 |        plate_no,in_id, record_type,back_flag,receive_address,distribution_id
 | 
		
	
		
			
			| 125 |  | -    ,wgt_dcn_mtc_cd,edge_ty,production_place,tally_people,invoice_price,unit_price)
 | 
		
	
		
			
			|  | 128 | +    ,wgt_dcn_mtc_cd,edge_ty,production_place,tally_people,invoice_price,unit_price,contract_no)
 | 
		
	
		
			
			| 126 | 129 |      values (#{id,jdbcType=VARCHAR}, #{wareName,jdbcType=VARCHAR}, #{stackName,jdbcType=VARCHAR}, 
 | 
		
	
		
			
			| 127 | 130 |        #{layer,jdbcType=INTEGER}, #{materialName,jdbcType=VARCHAR}, #{materialNo,jdbcType=VARCHAR}, 
 | 
		
	
		
			
			| 128 | 131 |        #{standard,jdbcType=VARCHAR}, #{model,jdbcType=VARCHAR}, #{customerName,jdbcType=VARCHAR}, 
 | 
		
	
	
		
			
			|  | @@ -132,7 +135,8 @@
 | 
		
	
		
			
			| 132 | 135 |        #{cancelTime,jdbcType=TIMESTAMP}, #{cancelFlag,jdbcType=VARCHAR}, #{belongId,jdbcType=VARCHAR},
 | 
		
	
		
			
			| 133 | 136 |      #{plateNo,jdbcType=VARCHAR},  #{inId,jdbcType=VARCHAR}, #{recordType,jdbcType=VARCHAR},
 | 
		
	
		
			
			| 134 | 137 |      #{backFlag,jdbcType=VARCHAR}, #{receiveAddress,jdbcType=VARCHAR}, #{distributionId,jdbcType=VARCHAR}
 | 
		
	
		
			
			| 135 |  | -    ,#{wgtDcnMtcCd,jdbcType=VARCHAR},#{edgeTy,jdbcType=VARCHAR},#{productionPlace,jdbcType=VARCHAR},#{tallyPeople,jdbcType=VARCHAR},#{invoicePrice,jdbcType=DOUBLE},#{unitPrice,jdbcType=DOUBLE})
 | 
		
	
		
			
			|  | 138 | +    ,#{wgtDcnMtcCd,jdbcType=VARCHAR},#{edgeTy,jdbcType=VARCHAR},#{productionPlace,jdbcType=VARCHAR},
 | 
		
	
		
			
			|  | 139 | +    #{tallyPeople,jdbcType=VARCHAR},#{invoicePrice,jdbcType=DOUBLE},#{unitPrice,jdbcType=DOUBLE},#{contractNo,jdbcType=VARCHAR})
 | 
		
	
		
			
			| 136 | 140 |    </insert>
 | 
		
	
		
			
			| 137 | 141 |    <insert id="insertSelective" parameterType="com.th.demo.model.ware.OutRecord" >
 | 
		
	
		
			
			| 138 | 142 |      insert into t_ware_out_record
 | 
		
	
	
		
			
			|  | @@ -370,7 +374,8 @@
 | 
		
	
		
			
			| 370 | 374 |            back_flag =  #{backFlag,jdbcType=VARCHAR},
 | 
		
	
		
			
			| 371 | 375 |      receive_address = #{receiveAddress,jdbcType=VARCHAR},
 | 
		
	
		
			
			| 372 | 376 |        distribution_id =  #{distributionId,jdbcType=VARCHAR},
 | 
		
	
		
			
			| 373 |  | -        unit_price =  #{unitPrice,jdbcType=DOUBLE}
 | 
		
	
		
			
			|  | 377 | +        unit_price =  #{unitPrice,jdbcType=DOUBLE},
 | 
		
	
		
			
			|  | 378 | +        contract_no =  #{contractNo,jdbcType=VARCHAR}
 | 
		
	
		
			
			| 374 | 379 |      where id = #{id,jdbcType=VARCHAR}
 | 
		
	
		
			
			| 375 | 380 |    </update>
 | 
		
	
		
			
			| 376 | 381 |  
 |