增加协议号和入库类型字段

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

@@ -64,7 +64,7 @@
     <result column="khqyr" property="khqyr" jdbcType="VARCHAR" />
     <result column="bfkhh" property="bfkhh" jdbcType="VARCHAR" />
     <result column="bfzh" property="bfzh" jdbcType="VARCHAR" />
-    <result column="agreement_number" property="agreementNumber" jdbcType="VARCHAR" />
+    
   </resultMap>
   <sql id="Example_Where_Clause" >
     <!--
@@ -149,7 +149,7 @@
     change_reason, change_time, change_content, changing, plan_bid, audit_state, process_instance_id, 
     process_definition_id, agree_time, create_man, creater, create_time, create_unit, 
     create_depot, update_time, org_id, in_application, creater_id, identification, updatetime, 
-    qddd, lybzj, khqyr, bfkhh, bfzh,agreement_number
+    qddd, lybzj, khqyr, bfkhh, bfzh
   </sql>
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.business.model.BusinessContractExample" >
     <!--
@@ -226,7 +226,7 @@
       update_time, org_id, in_application, 
       creater_id, identification, updatetime, 
       qddd, lybzj, khqyr, 
-      bfkhh, bfzh,agreement_number)
+      bfkhh, bfzh)
     values (#{id,jdbcType=INTEGER}, #{contractNumber,jdbcType=VARCHAR}, #{contractTitle,jdbcType=VARCHAR}, 
       #{customerId,jdbcType=VARCHAR}, #{customerBid,jdbcType=INTEGER}, #{customerNumber,jdbcType=VARCHAR}, 
       #{customerName,jdbcType=VARCHAR}, #{grainQuantity,jdbcType=VARCHAR}, #{moneyQuantity,jdbcType=VARCHAR}, 
@@ -246,7 +246,7 @@
       #{updateTime,jdbcType=TIMESTAMP}, #{orgId,jdbcType=INTEGER}, #{inApplication,jdbcType=INTEGER}, 
       #{createrId,jdbcType=INTEGER}, #{identification,jdbcType=VARCHAR}, #{updatetime,jdbcType=TIMESTAMP}, 
       #{qddd,jdbcType=VARCHAR}, #{lybzj,jdbcType=VARCHAR}, #{khqyr,jdbcType=VARCHAR}, 
-      #{bfkhh,jdbcType=VARCHAR}, #{bfzh,jdbcType=VARCHAR},#{agreementNumber,jdbcType=VARCHAR})
+      #{bfkhh,jdbcType=VARCHAR}, #{bfzh,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.chinaitop.depot.business.model.BusinessContract" >
     <!--
@@ -427,9 +427,7 @@
       <if test="bfzh != null" >
         bfzh,
       </if>
-      <if test="agreementNumber != null" >
-        agreement_number,
-      </if>
+      
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -603,9 +601,7 @@
       <if test="bfzh != null" >
         #{bfzh,jdbcType=VARCHAR},
       </if>
-      <if test="agreementNumber != null" >
-        #{agreementNumber,jdbcType=VARCHAR},
-      </if>
+      
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.chinaitop.depot.business.model.BusinessContractExample" resultType="java.lang.Integer" >
@@ -798,9 +794,7 @@
       <if test="record.bfzh != null" >
         bfzh = #{record.bfzh,jdbcType=VARCHAR},
       </if>
-      <if test="record.agreementNumber != null" >
-        agreement_number = #{record.agreementNumber,jdbcType=VARCHAR},
-      </if>
+      
     </set>
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
@@ -869,8 +863,8 @@
       lybzj = #{record.lybzj,jdbcType=VARCHAR},
       khqyr = #{record.khqyr,jdbcType=VARCHAR},
       bfkhh = #{record.bfkhh,jdbcType=VARCHAR},
-      bfzh = #{record.bfzh,jdbcType=VARCHAR},
-      agreement_number = #{record.agreementNumber,jdbcType=VARCHAR}
+      bfzh = #{record.bfzh,jdbcType=VARCHAR}
+      
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -1051,9 +1045,7 @@
       <if test="bfzh != null" >
         bfzh = #{bfzh,jdbcType=VARCHAR},
       </if>
-      <if test="agreementNumber != null" >
-        agreement_number = #{agreementNumber,jdbcType=VARCHAR},
-      </if>
+      
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -1119,8 +1111,8 @@
       lybzj = #{lybzj,jdbcType=VARCHAR},
       khqyr = #{khqyr,jdbcType=VARCHAR},
       bfkhh = #{bfkhh,jdbcType=VARCHAR},
-      bfzh = #{bfzh,jdbcType=VARCHAR},
-      agreement_number = #{agreementNumber,jdbcType=VARCHAR}
+      bfzh = #{bfzh,jdbcType=VARCHAR}
+      
     where id = #{id,jdbcType=INTEGER}
   </update>
   
@@ -1134,7 +1126,7 @@
  
   <select id="getApprovalList" resultMap="approvalResultMap" parameterType="java.util.Map" >
     select
-        a.id id, a.contract_number contract_number, a.plan_number plan_number,a.agreement_number agreement_number,
+        a.id id, a.contract_number contract_number, a.plan_number plan_number,
         a.contract_title contract_title,
         a.contract_type contract_type,
         a.customer_name customer_name,

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

@@ -61,7 +61,7 @@
     <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="agreement_number" property="agreementNumber" jdbcType="VARCHAR" />
+    
   </resultMap>
   <sql id="Example_Where_Clause" >
     <!--
@@ -145,7 +145,7 @@
     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,agreement_number
+    change_reason, change_time, change_content, lqss
   </sql>
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.business.model.BusinessDeliveryStorageNoticeExample" >
     <!--
@@ -220,7 +220,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,agreement_number
+      change_reason, change_time, change_content, lqss
       )
     values (#{id,jdbcType=INTEGER}, #{billType,jdbcType=VARCHAR}, #{billTypeId,jdbcType=INTEGER}, 
       #{billNumber,jdbcType=VARCHAR}, #{shipingCount,jdbcType=VARCHAR}, #{finishedCount,jdbcType=VARCHAR}, 
@@ -239,8 +239,7 @@
       #{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}
-      , #{agreementNumber,jdbcType=VARCHAR})
+      #{changeReason,jdbcType=VARCHAR}, #{changeTime,jdbcType=TIMESTAMP}, #{changeContent,jdbcType=VARCHAR}, #{lqss,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.chinaitop.depot.business.model.BusinessDeliveryStorageNotice" >
     <!--
@@ -412,9 +411,7 @@
       <if test="lqss != null" >
         lqss,
       </if>
-      <if test="agreementNumber != null" >
-        agreement_number,
-      </if>
+      
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -579,9 +576,7 @@
       <if test="lqss != null" >
         #{lqss,jdbcType=VARCHAR},
       </if>
-      <if test="agreementNumber != null" >
-        #{agreementNumber,jdbcType=VARCHAR},
-      </if>
+      
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.chinaitop.depot.business.model.BusinessDeliveryStorageNoticeExample" resultType="java.lang.Integer" >
@@ -765,9 +760,7 @@
       <if test="record.lqss != null" >
         lqss = #{record.lqss,jdbcType=VARCHAR},
       </if>
-      <if test="record.agreementNumber != null" >
-        agreement_number = #{record.agreementNumber,jdbcType=VARCHAR},
-      </if>
+      
     </set>
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
@@ -833,8 +826,8 @@
       change_reason = #{record.changeReason,jdbcType=VARCHAR},
       change_time = #{record.changeTime,jdbcType=TIMESTAMP},
       change_content = #{record.changeContent,jdbcType=VARCHAR},
-      lqss = #{record.lqss,jdbcType=VARCHAR},
-      agreement_number = #{record.agreementNumber,jdbcType=VARCHAR}
+      lqss = #{record.lqss,jdbcType=VARCHAR}
+     
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -1006,9 +999,7 @@
       <if test="lqss != null" >
         lqss = #{lqss,jdbcType=VARCHAR},
       </if>
-      <if test="agreementNumber != null" >
-        agreement_number = #{agreementNumber,jdbcType=VARCHAR},
-      </if>
+      
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -1071,8 +1062,8 @@
       change_reason = #{changeReason,jdbcType=VARCHAR},
       change_time = #{changeTime,jdbcType=TIMESTAMP},
       change_content = #{changeContent,jdbcType=VARCHAR},
-      lqss = #{lqss,jdbcType=VARCHAR},
-      agreement_number = #{agreementNumber,jdbcType=VARCHAR}
+      lqss = #{lqss,jdbcType=VARCHAR}
+      
     where id = #{id,jdbcType=INTEGER}
   </update>
   
@@ -1087,7 +1078,7 @@
  
   <select id="getApprovalList" resultMap="approvalResultMap" parameterType="java.util.Map" >
     select
-        a.id id, a.bill_type bill_type, a.bill_number bill_number,a.agreement_number agreement_number,
+        a.id id, a.bill_type bill_type, a.bill_number bill_number,
         a.contract contract,
         a.plan_number plan_number,
         a.delivery_customer delivery_customer,

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

@@ -41,7 +41,6 @@
     <result column="kszxrq" property="kszxrq" jdbcType="TIMESTAMP" />
     <result column="jzzxrq" property="jzzxrq" jdbcType="TIMESTAMP" />
     <result column="jhnd" property="jhnd" jdbcType="VARCHAR" />
-    <result column="agreement_number" property="agreementNumber" jdbcType="VARCHAR" />
   </resultMap>
   
   <resultMap id="approvalResultMap" type="com.chinaitop.depot.business.model.vo.BusinessPlanAuditVO" extends="BaseResultMap">
@@ -145,7 +144,7 @@
     process_instance_id, process_definition_id, current_approve_path, agree_time, creater_id, 
     creater, create_time, create_unit, org_id, in_application, total_quantity, report_date, 
     send_date, province_remark, enterprise_remark, attribute_type, refuse_reason, updatetime, 
-    kszxrq, jzzxrq, jhnd ,agreement_number
+    kszxrq, jzzxrq, jhnd 
   </sql>
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.business.model.BusinessPlanExample" >
     <!--
@@ -214,7 +213,7 @@
       report_date, send_date, province_remark, 
       enterprise_remark, attribute_type, refuse_reason, 
       updatetime, kszxrq, jzzxrq, 
-      jhnd,agreement_number)
+      jhnd)
     values (#{id,jdbcType=INTEGER}, #{planNumber,jdbcType=VARCHAR}, #{planTitle,jdbcType=VARCHAR}, 
       #{referenceNumber,jdbcType=VARCHAR}, #{planDesc,jdbcType=VARCHAR}, #{executeType,jdbcType=INTEGER}, 
       #{outAmount,jdbcType=VARCHAR}, #{inAmount,jdbcType=VARCHAR}, #{outTotalPrice,jdbcType=VARCHAR}, 
@@ -226,7 +225,7 @@
       #{reportDate,jdbcType=TIMESTAMP}, #{sendDate,jdbcType=TIMESTAMP}, #{provinceRemark,jdbcType=VARCHAR}, 
       #{enterpriseRemark,jdbcType=VARCHAR}, #{attributeType,jdbcType=INTEGER}, #{refuseReason,jdbcType=VARCHAR}, 
       #{updatetime,jdbcType=TIMESTAMP}, #{kszxrq,jdbcType=TIMESTAMP}, #{jzzxrq,jdbcType=TIMESTAMP}, 
-      #{jhnd,jdbcType=VARCHAR},#{agreementNumber,jdbcType=VARCHAR})
+      #{jhnd,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.chinaitop.depot.business.model.BusinessPlan" >
     <!--
@@ -338,9 +337,7 @@
       <if test="jhnd != null" >
         jhnd,
       </if>
-      <if test="agreementNumber != null" >
-        agreement_number,
-      </if>
+      
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -445,9 +442,7 @@
       <if test="jhnd != null" >
         #{jhnd,jdbcType=VARCHAR},
       </if>
-      <if test="agreementNumber != null" >
-        #{agreementNumber,jdbcType=VARCHAR},
-      </if>
+      
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.chinaitop.depot.business.model.BusinessPlanExample" resultType="java.lang.Integer" >
@@ -571,9 +566,7 @@
       <if test="record.jhnd != null" >
         jhnd = #{record.jhnd,jdbcType=VARCHAR},
       </if>
-      <if test="record.agreementNumber != null" >
-        agreement_number = #{record.agreementNumber,jdbcType=VARCHAR},
-      </if>
+      
     </set>
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
@@ -619,8 +612,8 @@
       updatetime = #{record.updatetime,jdbcType=TIMESTAMP},
       kszxrq = #{record.kszxrq,jdbcType=TIMESTAMP},
       jzzxrq = #{record.jzzxrq,jdbcType=TIMESTAMP},
-      jhnd = #{record.jhnd,jdbcType=VARCHAR},
-      agreement_number = #{record.agreementNumber,jdbcType=VARCHAR}
+      jhnd = #{record.jhnd,jdbcType=VARCHAR}
+      
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -732,9 +725,7 @@
       <if test="jhnd != null" >
         jhnd = #{jhnd,jdbcType=VARCHAR},
       </if>
-      <if test="agreementNumber != null" >
-        agreement_number = #{agreementNumber,jdbcType=VARCHAR},
-      </if>
+      
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -777,15 +768,15 @@
       updatetime = #{updatetime,jdbcType=TIMESTAMP},
       kszxrq = #{kszxrq,jdbcType=TIMESTAMP},
       jzzxrq = #{jzzxrq,jdbcType=TIMESTAMP},
-      jhnd = #{jhnd,jdbcType=VARCHAR},
-      agreement_number = #{agreementNumber,jdbcType=VARCHAR}
+      jhnd = #{jhnd,jdbcType=VARCHAR}
+      
     where id = #{id,jdbcType=INTEGER}
   </update>
   
    <select id="getApprovalList" resultMap="approvalResultMap" parameterType="java.util.Map" >
     select
         a.id id, a.plan_number plan_number, a.reference_number reference_number, a.execute_type execute_type,
-        a.in_amount in_amount,a.out_amount out_amount, a.create_time create_time,a.agreement_number agreement_number,
+        a.in_amount in_amount,a.out_amount out_amount, a.create_time create_time,
         a.process_instance_id process_instance_id,
         a.process_definition_id process_definition_id,
         b.id auditId,
@@ -833,7 +824,7 @@
   <select id="getAcceptanceList" resultMap="approvalResultMap" parameterType="java.util.Map" >
     SELECT
       a.id id,a.plan_number plan_number,a.reference_number reference_number,
-      a.execute_type execute_type,a.agreement_number agreement_number,
+      a.execute_type execute_type,
       a.customer_plan_state customer_plan_state,
       a.in_application in_application,
       detail.grain_kind grain_kind,

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

@@ -29,6 +29,8 @@
     <result column="out_detail_total_price" property="outDetailTotalPrice" jdbcType="VARCHAR" />
     <result column="out_remaining_number" property="outRemainingNumber" jdbcType="VARCHAR" />
     <result column="jstzd_id" property="jstzdId" jdbcType="VARCHAR" />
+    <result column="agreement_number" property="agreementNumber" jdbcType="VARCHAR" />
+    <result column="incoming_type" property="incomingType" jdbcType="INTEGER" />
   </resultMap>
   <sql id="Example_Where_Clause" >
     <where >
@@ -92,7 +94,7 @@
     id, zid, type, house_id, house_name, warehouse_id, warehouse_name, create_time, org_id, 
     grain_kind, grain_detail_kind, grain_grade, grain_attribute, grain_annual, grain_producing_area, 
     in_price, in_count, in_detail_total_price, input_time, state, productive_year, remaining_number, 
-    out_price, out_count, out_detail_total_price, out_remaining_number,jstzd_id
+    out_price, out_count, out_detail_total_price, out_remaining_number,jstzd_id,agreement_number,incoming_type
   </sql>
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.business.model.BusinessStoreWareDetailExample" >
     select
@@ -133,7 +135,7 @@
       in_price, in_count, in_detail_total_price, 
       input_time, state, productive_year, 
       remaining_number, out_price, out_count, 
-      out_detail_total_price, out_remaining_number,jstzd_id
+      out_detail_total_price, out_remaining_number,jstzd_id,agreement_number,incoming_type
       )
     values (#{id,jdbcType=INTEGER}, #{zid,jdbcType=INTEGER}, #{type,jdbcType=VARCHAR}, 
       #{houseId,jdbcType=INTEGER}, #{houseName,jdbcType=VARCHAR}, #{warehouseId,jdbcType=INTEGER}, 
@@ -144,7 +146,7 @@
       #{inputTime,jdbcType=TIMESTAMP}, #{state,jdbcType=INTEGER}, #{productiveYear,jdbcType=INTEGER}, 
       #{remainingNumber,jdbcType=VARCHAR}, #{outPrice,jdbcType=VARCHAR}, #{outCount,jdbcType=VARCHAR}, 
       #{outDetailTotalPrice,jdbcType=VARCHAR}, #{outRemainingNumber,jdbcType=VARCHAR},#{jstzdId,jdbcType=VARCHAR}
-      )
+      ,#{agreementNumber,jdbcType=VARCHAR},#{incomingType,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.chinaitop.depot.business.model.BusinessStoreWareDetail" >
     insert into business_store_ware_detail
@@ -230,6 +232,12 @@
       <if test="jstzdId != null" >
         jstzd_id,
       </if>
+      <if test="agreementNumber != null" >
+        agreement_number,
+      </if>
+      <if test="incomingType != null" >
+        incoming_type,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -313,6 +321,12 @@
       <if test="jstzdId != null" >
         #{jstzdId,jdbcType=VARCHAR},
       </if>
+      <if test="agreementNumber  != null" >
+        #{agreementNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="incomingType != null" >
+        #{incomingType,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.chinaitop.depot.business.model.BusinessStoreWareDetailExample" resultType="java.lang.Integer" >
@@ -405,6 +419,12 @@
       <if test="record.jstzdId != null" >
         jstzd_id = #{record.jstzdId,jdbcType=VARCHAR},
       </if>
+      <if test="record.agreementNumber!= null" >
+        agreement_number = #{record.agreementNumber ,jdbcType=VARCHAR},
+      </if>
+      <if test="record.incomingType != null" >
+        incoming_type = #{record.incomingType,jdbcType=INTEGER},
+      </if>
     </set>
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
@@ -438,7 +458,8 @@
       out_count = #{record.outCount,jdbcType=VARCHAR},
       out_detail_total_price = #{record.outDetailTotalPrice,jdbcType=VARCHAR},
       out_remaining_number = #{record.outRemainingNumber,jdbcType=VARCHAR},
-      jstzd_id = #{record.jstzdId,jdbcType=VARCHAR}
+      jstzd_id = #{record.jstzdId,jdbcType=VARCHAR},agreement_number = #{record.agreementNumber,jdbcType=VARCHAR},
+      incoming_type = #{record.incomingType,jdbcType=INTEGER}
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -524,6 +545,12 @@
       <if test="jstzdId != null" >
         jstzd_id = #{jstzdId,jdbcType=VARCHAR},
       </if>
+      <if test="agreementNumber  != null" >
+        agreement_number = #{agreementNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="incomingType != null" >
+        incoming_type = #{incomingType,jdbcType=INTEGER},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -554,7 +581,9 @@
       out_count = #{outCount,jdbcType=VARCHAR},
       out_detail_total_price = #{outDetailTotalPrice,jdbcType=VARCHAR},
       out_remaining_number = #{outRemainingNumber,jdbcType=VARCHAR},
-      jstzd_id = #{jstzdId,jdbcType=VARCHAR}
+      jstzd_id = #{jstzdId,jdbcType=VARCHAR},
+      agreement_number = #{agreementNumber,jdbcType=VARCHAR},
+      incoming_type = #{incomingType,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
   <!-- 通过计划ID获取计划子表数据的已使用数量 -->

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

@@ -4,7 +4,7 @@ import java.util.Date;
 
 public class BusinessContract {
 	
-	private String agreementNumber;//协议编号
+	/*private String agreementNumber;//协议编号
 	
     public String getAgreementNumber() {
 		return agreementNumber;
@@ -12,7 +12,7 @@ public class BusinessContract {
 
 	public void setAgreementNumber(String agreementNumber) {
 		this.agreementNumber = agreementNumber;
-	}
+	}*/
 
 	/**
      * This field was generated by MyBatis Generator.

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

@@ -4,7 +4,7 @@ import java.util.Date;
 
 public class BusinessDeliveryStorageNotice {
 	
-    private String agreementNumber;//协议编号
+    /*private String agreementNumber;//协议编号
 	
     public String getAgreementNumber() {
 		return agreementNumber;
@@ -12,7 +12,7 @@ public class BusinessDeliveryStorageNotice {
 
 	public void setAgreementNumber(String agreementNumber) {
 		this.agreementNumber = agreementNumber;
-	}
+	}*/
 	
 	
 	//业务字段(用于通知单新增)

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

@@ -4,16 +4,6 @@ import java.util.Date;
 
 public class BusinessPlan {
 	
-    private String agreementNumber;//协议编号
-	
-    public String getAgreementNumber() {
-		return agreementNumber;
-	}
-
-	public void setAgreementNumber(String agreementNumber) {
-		this.agreementNumber = agreementNumber;
-	}
-	
 	
 	//业务字段
     private String grainAttributeByfirst; //省平台展示粮油性质

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

@@ -5,6 +5,27 @@ import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 
 public class BusinessStoreWareDetail {
+	
+	 private String agreementNumber;//协议编号
+	 private Integer incomingType;//入库类型
+	 
+		
+	 public Integer getIncomingType() {
+		return incomingType;
+	}
+
+	public void setIncomingType(Integer incomingType) {
+		this.incomingType = incomingType;
+	}
+
+	public String getAgreementNumber() {
+		return agreementNumber;
+	 }
+
+	 public void setAgreementNumber(String agreementNumber) {
+		this.agreementNumber = agreementNumber;
+	 }
+		
     private Integer id;
 
     private Integer zid;