接收的通知单中收获年度和生产年份、产地取自于出入库

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

@@ -26,6 +26,10 @@
     <result column="grain_attribute" property="grainAttribute" jdbcType="INTEGER" />
     <result column="grain_detail_kind" property="grainDetailKind" jdbcType="INTEGER" />
     <result column="receive_time" property="receiveTime" jdbcType="TIMESTAMP" />
+    <result column="input_time" property="inputTime" jdbcType="TIMESTAMP" />
+     <result column="grain_annual" property="grainAnnual" jdbcType="INTEGER" />
+    <result column="productive_year" property="productiveYear" jdbcType="INTEGER" />
+     <result column="grain_producing_area" property="grainProducingArea" jdbcType="INTEGER" />
   </resultMap>
   <sql id="Example_Where_Clause" >
     <!--
@@ -103,7 +107,7 @@
     -->
     id, notice_number, crktype, contract_number, ywtype, house_id, ware_house_id, grain_kind, 
     grain_grade, count, outgoing_period, forwarding_unit, receive_unit, resion, in_application, 
-    org_id, grain_attribute, grain_detail_kind, receive_time
+    org_id, grain_attribute, grain_detail_kind, receive_time,input_time,grain_annual,productive_year,grain_producing_area
   </sql>
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.business.model.BusinessNoticeReceiveExample" >
     <!--
@@ -167,14 +171,15 @@
       count, outgoing_period, forwarding_unit, 
       receive_unit, resion, in_application, 
       org_id, grain_attribute, grain_detail_kind, 
-      receive_time)
+      receive_time,input_time,grain_annual,productive_year,grain_producing_area)
     values (#{id,jdbcType=INTEGER}, #{noticeNumber,jdbcType=VARCHAR}, #{crktype,jdbcType=VARCHAR}, 
       #{contractNumber,jdbcType=VARCHAR}, #{ywtype,jdbcType=VARCHAR}, #{houseId,jdbcType=INTEGER}, 
       #{wareHouseId,jdbcType=INTEGER}, #{grainKind,jdbcType=INTEGER}, #{grainGrade,jdbcType=INTEGER}, 
       #{count,jdbcType=VARCHAR}, #{outgoingPeriod,jdbcType=VARCHAR}, #{forwardingUnit,jdbcType=VARCHAR}, 
       #{receiveUnit,jdbcType=VARCHAR}, #{resion,jdbcType=VARCHAR}, #{inApplication,jdbcType=INTEGER}, 
       #{orgId,jdbcType=INTEGER}, #{grainAttribute,jdbcType=INTEGER}, #{grainDetailKind,jdbcType=INTEGER}, 
-      #{receiveTime,jdbcType=TIMESTAMP})
+      #{receiveTime,jdbcType=TIMESTAMP},#{inputTime,jdbcType=TIMESTAMP},#{grainAnnual,jdbcType=INTEGER},
+      #{productiveYear,jdbcType=INTEGER},#{grainProducingArea,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.chinaitop.depot.business.model.BusinessNoticeReceive" >
     <!--
@@ -241,6 +246,18 @@
       <if test="receiveTime != null" >
         receive_time,
       </if>
+      <if test="inputTime != null" >
+        input_time,
+      </if>
+      <if test="grainAnnual != null" >
+        grain_annual,
+      </if>
+      <if test="productiveYear != null" >
+        productive_year,
+      </if>
+      <if test="grainProducingArea != null" >
+        grain_producing_area,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -300,6 +317,18 @@
       <if test="receiveTime != null" >
         #{receiveTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="inputTime != null" >
+        #{inputTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="grainAnnual != null" >
+        #{grainAnnual,jdbcType=INTEGER},
+      </if>
+      <if test="productiveYear != null" >
+        #{productiveYear,jdbcType=INTEGER},
+      </if>
+      <if test="grainProducingArea != null" >
+        #{grainProducingArea,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.chinaitop.depot.business.model.BusinessNoticeReceiveExample" resultType="java.lang.Integer" >
@@ -378,6 +407,18 @@
       <if test="record.receiveTime != null" >
         receive_time = #{record.receiveTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="record.inputTime != null" >
+        input_time = #{record.inputTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.grainAnnual != null" >
+        grain_annual = #{record.grainAnnual,jdbcType=INTEGER},
+      </if>
+      <if test="record.productiveYear!= null" >
+        productive_year = #{record.productiveYear,jdbcType=INTEGER},
+      </if>
+      <if test="record.grainProducingArea != null" >
+        grain_producing_area = #{record.grainProducingArea,jdbcType=INTEGER},
+      </if>
     </set>
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
@@ -408,7 +449,12 @@
       org_id = #{record.orgId,jdbcType=INTEGER},
       grain_attribute = #{record.grainAttribute,jdbcType=INTEGER},
       grain_detail_kind = #{record.grainDetailKind,jdbcType=INTEGER},
-      receive_time = #{record.receiveTime,jdbcType=TIMESTAMP}
+      receive_time = #{record.receiveTime,jdbcType=TIMESTAMP},
+      input_time = #{record.inputTime,jdbcType=TIMESTAMP},
+      grain_annual = #{record.grainAnnual,jdbcType=INTEGER},
+      productive_year = #{record.productiveYear,jdbcType=INTEGER},
+      grain_producing_area = #{record.grainProducingArea,jdbcType=INTEGER}
+      
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -475,6 +521,18 @@
       <if test="receiveTime != null" >
         receive_time = #{receiveTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="receiveTime != null" >
+        input_time = #{inputTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="grainAnnual != null" >
+        grain_annual = #{grainAnnual,jdbcType=INTEGER},
+      </if>
+      <if test="productiveYear != null" >
+        productive_year = #{productiveYear,jdbcType=INTEGER},
+      </if>
+      <if test="grainProducingArea != null" >
+        grain_producing_area = #{grainProducingArea,jdbcType=INTEGER},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -502,7 +560,11 @@
       org_id = #{orgId,jdbcType=INTEGER},
       grain_attribute = #{grainAttribute,jdbcType=INTEGER},
       grain_detail_kind = #{grainDetailKind,jdbcType=INTEGER},
-      receive_time = #{receiveTime,jdbcType=TIMESTAMP}
+      receive_time = #{receiveTime,jdbcType=TIMESTAMP},
+      input_time = #{inputTime,jdbcType=TIMESTAMP},
+      grain_annual = #{grainAnnual,jdbcType=INTEGER},
+      productive_year = #{productiveYear,jdbcType=INTEGER},
+      grain_producing_area = #{grainProducingArea,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
 </mapper>

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

@@ -64,6 +64,46 @@ public class BusinessNoticeReceive {
 			this.outRemainingNumber = outRemainingNumber;
 		}
 		
+		//表里面新增的字段
+		private Integer grainAnnual;//收获年度
+		private Integer productiveYear;//生产年份
+		private Integer grainProducingArea;//粮油产地
+		private Date inputTime;//入库时间
+		
+		
+		 public Integer getGrainAnnual() {
+		        return grainAnnual;
+		 }
+
+		 public void setGrainAnnual(Integer grainAnnual) {
+		        this.grainAnnual = grainAnnual;
+		 }
+		 public Integer getProductiveYear() {
+		        return productiveYear;
+		 }
+
+		 public void setProductiveYear(Integer productiveYear) {
+		        this.productiveYear = productiveYear;
+		 }
+		 public Integer getGrainProducingArea() {
+		        return grainProducingArea;
+		 }
+
+		 public void setGrainProducingArea(Integer grainProducingArea) {
+		        this.grainProducingArea = grainProducingArea;
+		 }
+
+		 public Date getInputTime() {
+		        return inputTime;
+		 }
+
+		 public void setInputTime(Date inputTime) {
+		        this.inputTime = inputTime;
+		 }
+		    
+		
+		
+		
     /**
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column business_notice_receive.id

src/main/java/com/chinaitop/depot/business/service/FeignBasicService.java

@@ -15,5 +15,9 @@ public interface FeignBasicService {
 
     @RequestMapping(value = "/Warehouse/getWareDataByHwbm", method = RequestMethod.GET)
     Map<String, Object> getWareDataByHwbm(@RequestParam(value = "hwbm") String hwbm);
+    
+    
+    @RequestMapping(value = "/Enum/getIdByNameAndParentId", method = RequestMethod.GET)
+    Map<String, Object> getIdByNameAndParentId(@RequestParam(value = "parentId") Integer parentId,@RequestParam(value = "enumName") String enumName);
 
 }

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

@@ -180,14 +180,28 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
                     	}else{
                           //根据仓房、货位、orgId获取粮食品种等信息
                             Map<String, Object> map = feignAgileService.getDateByChHwh(orgId, houseId, wareHouseId);
-                             grainAttribute = (Integer) map.get("hwxz"); //粮油性质
-                             grainKind = (Integer) map.get("pz"); //品种
+                            grainAttribute = (Integer) map.get("hwxz"); //粮油性质
+                            grainKind = (Integer) map.get("pz"); //品种
                             Integer grainDetailKind = (Integer) map.get("mxpz"); //明细品种
                             Integer grainGrade = (Integer) map.get("dj"); //等级
+                            Date inputTime = (Date) map.get("rq"); //入库时间
+                            if(inputTime!=null){
+                            	String year=String.format("%tY", inputTime);
+                                Map<String, Object> basicMap = feignBasicService.getIdByNameAndParentId(1004, year);//1004是生产年份的父ID
+                                Integer productiveYear = (Integer) basicMap.get("enumId");
+                                businessNoticeReceive.setProductiveYear(productiveYear);//生产年份
+                                businessNoticeReceive.setGrainAnnual(productiveYear);//收获年度
+                            }
+                            
+                            Integer grainProducingArea = (Integer) map.get("gb"); //产地
+                            
                             businessNoticeReceive.setGrainKind(grainKind); //品种
                             businessNoticeReceive.setGrainDetailKind(grainDetailKind); //明细品种
                             businessNoticeReceive.setGrainGrade(grainGrade); //等级
                             businessNoticeReceive.setGrainAttribute(grainAttribute); //粮油性质
+                            businessNoticeReceive.setInputTime(inputTime);//入库时间
+                            businessNoticeReceive.setGrainProducingArea(grainProducingArea);//产地
+                           
                     	}
                         String  lsyqsl = jsonObject.getString("lsyqsl");
                         BigDecimal s = new BigDecimal(1000);
@@ -203,6 +217,7 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
                        businessNoticeReceive.setReceiveTime(new Date());//接收数据的时间
                        businessNoticeReceiveMapper.insert(businessNoticeReceive);
                    	
+                       
                        /**
                         * 修改粮食性质(轮换或者销售进行修改)
                         *   parameters[0] = ;     //单位ID

src/main/java/com/chinaitop/depot/utils/HelloServiceHystrix.java

@@ -78,4 +78,11 @@ public class HelloServiceHystrix implements FeignAgileService,FeignBasicService{
 		return null;
 	}
 
+	@Override
+	public Map<String, Object> getIdByNameAndParentId(Integer parentId, String enumName) {
+		// TODO Auto-generated method stub
+		logger.info("获取生产年度的ID失败!");
+		return null;
+	}
+
 }