1

src/main/java/com/chinaitop/depot/business/controller/ReceiveNoticeController.java

@@ -165,12 +165,14 @@ public class ReceiveNoticeController {
 	@RequestMapping(value="/scRkxzzbd", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
     @ApiOperation(value="增加性质转变单数据(入库)", notes = "")
 	@ApiImplicitParams({
-        @ApiImplicitParam(name = "sptId", value = "市库对接的货位ID", paramType = "query")
+        @ApiImplicitParam(name = "sptId", value = "市库对接的货位ID", paramType = "query"),
+        @ApiImplicitParam(name = "crklx", value = "市库对接的货位ID", paramType = "query"),
+        @ApiImplicitParam(name = "ysid", value = "市库对接的货位ID", paramType = "query")
     })
-	public Map<String, Object> scRkxzzbd(String sptId) {
+	public Map<String, Object> scRkxzzbd(String sptId, String crklx, String ysid) {
 		Map<String, Object> map = new HashMap<>();
 		try {
-			map = receiveNoticeService.scRkxzzbd(sptId);
+			map = receiveNoticeService.scRkxzzbd(sptId, crklx, ysid);
 			systemOutsideDataService.addlogger("rkxzzbd", sptId, map.toString());
 		} catch (Exception e) {
 			logger.error("性质转变单生成异常");

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

@@ -41,6 +41,8 @@
     <result column="is_notice" property="isNotice" jdbcType="INTEGER" />
     <result column="pzmc" property="pzmc" jdbcType="VARCHAR" />
     <result column="is_sheet" property="isSheet" jdbcType="INTEGER" />
+    <result column="cblx" property="cblx" jdbcType="VARCHAR" />
+    <result column="ysid" property="ysid" jdbcType="VARCHAR" />
      
   </resultMap>
   <sql id="Example_Where_Clause" >
@@ -115,7 +117,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,input_time,grain_annual,productive_year,grain_producing_area,
-    lsxzzbdh,lssl,hzqlsxzdm,hzrq,ccshr,zjshr,tjshr,kjshr,ldshr,bz,audit_state,is_notice,pzmc,is_sheet,htbh
+    lsxzzbdh,lssl,hzqlsxzdm,hzrq,ccshr,zjshr,tjshr,kjshr,ldshr,bz,audit_state,is_notice,pzmc,is_sheet,htbh,cblx,ysid
   </sql>
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.business.model.BusinessNoticeReceiveExample" >
     select
@@ -155,7 +157,7 @@
       receive_unit, resion, in_application, 
       org_id, grain_attribute, grain_detail_kind, 
       receive_time,input_time,grain_annual,productive_year,grain_producing_area,
-      lsxzzbdh,lssl,hzqlsxzdm,hzrq,ccshr,zjshr,tjshr,kjshr,ldshr,bz,audit_state,is_notice,pzmc,is_sheet,htbh)
+      lsxzzbdh,lssl,hzqlsxzdm,hzrq,ccshr,zjshr,tjshr,kjshr,ldshr,bz,audit_state,is_notice,pzmc,is_sheet,htbh,cblx,ysid)
     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}, 
@@ -168,7 +170,7 @@
       #{hzrq,jdbcType=TIMESTAMP},#{ccshr,jdbcType=VARCHAR},#{zjshr,jdbcType=VARCHAR},
       #{tjshr,jdbcType=VARCHAR},#{kjshr,jdbcType=VARCHAR},#{ldshr,jdbcType=VARCHAR},
       #{bz,jdbcType=VARCHAR},#{auditState,jdbcType=INTEGER},#{isNotice,jdbcType=INTEGER},#{pzmc,jdbcType=VARCHAR}
-      ,#{isSheet,jdbcType=INTEGER},#{htbh,jdbcType=VARCHAR})
+      ,#{isSheet,jdbcType=INTEGER},#{htbh,jdbcType=VARCHAR},#{cblx,jdbcType=VARCHAR},#{ysid,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.chinaitop.depot.business.model.BusinessNoticeReceive" >
     insert into business_notice_receive
@@ -287,6 +289,12 @@
       <if test="htbh != null">
         htbh,
       </if>
+      <if test="cblx != null">
+        cblx,
+      </if>
+      <if test="ysid != null">
+        ysid,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -403,6 +411,12 @@
       <if test="htbh != null">
         #{htbh,jdbcType=VARCHAR},
       </if>
+      <if test="cblx != null">
+        #{cblx,jdbcType=VARCHAR},
+      </if>
+      <if test="ysid != null">
+        #{ysid,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.chinaitop.depot.business.model.BusinessNoticeReceiveExample" resultType="java.lang.Integer" >
@@ -528,6 +542,12 @@
       <if test="record.htbh != null">
         htbh = #{record.htbh,jdbcType=VARCHAR},
       </if>
+      <if test="record.cblx != null">
+        cblx = #{record.cblx,jdbcType=VARCHAR},
+      </if>
+      <if test="record.ysid != null">
+        ysid = #{record.ysid,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
@@ -572,7 +592,9 @@
       is_notice = #{record.isNotice,jdbcType=INTEGER},
       pzmc = #{record.pzmc,jdbcType=VARCHAR},
       is_sheet = #{record.isSheet,jdbcType=INTEGER},
-      htbh = #{record.htbh,jdbcType=VARCHAR}
+      htbh = #{record.htbh,jdbcType=VARCHAR},
+      cblx = #{record.cblx,jdbcType=VARCHAR},
+      ysid = #{record.ysid,jdbcType=VARCHAR}
       
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
@@ -692,6 +714,12 @@
       <if test="htbh != null">
         htbh = #{htbh,jdbcType=VARCHAR},
       </if>
+      <if test="cblx != null">
+        cblx = #{cblx,jdbcType=VARCHAR},
+      </if>
+      <if test="ysid != null">
+        ysid = #{ysid,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -733,7 +761,9 @@
       is_notice = #{isNotice,jdbcType=INTEGER},
       pzmc = #{pzmc,jdbcType=VARCHAR},
       is_sheet = #{isSheet,jdbcType=INTEGER},
-      htbh = #{htbh,jdbcType=VARCHAR}
+      htbh = #{htbh,jdbcType=VARCHAR},
+      cblx = #{cblx,jdbcType=VARCHAR},
+      ysid = #{ysid,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
   

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

@@ -23,6 +23,8 @@ public class BusinessNoticeReceive {
     private String pzmc;
     private Integer isSheet;
     private String htbh;
+    private String cblx;
+    private String ysid;
 
     /**
      * 0是性质转变单
@@ -823,4 +825,36 @@ public class BusinessNoticeReceive {
 		this.htbh = htbh;
 	}
 
+	/**
+	 * 储备类型(1市储，2区储)
+	 * @return
+	 */
+	public String getCblx() {
+		return cblx;
+	}
+
+	/**
+	 * 储备类型(1市储，2区储)
+	 * @param cblx
+	 */
+	public void setCblx(String cblx) {
+		this.cblx = cblx;
+	}
+
+	/**
+	 * 市平台验收数据ID
+	 * @return
+	 */
+	public String getYsid() {
+		return ysid;
+	}
+
+	/**
+	 * 市平台验收数据ID
+	 * @param ysid
+	 */
+	public void setYsid(String ysid) {
+		this.ysid = ysid;
+	}
+
 }

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

@@ -41,9 +41,11 @@ public interface ReceiveNoticeService {
 
 	/**
 	 * 生成入库性质转变单
-	 * @param datas
+	 * @param sptId 市平台货位ID
+	 * @param cblx 储备类型(1市储，2区储)
+	 * @param ysid 市平台验收数据ID
 	 * @return
 	 */
-	Map<String, Object> scRkxzzbd(String datas);
+	Map<String, Object> scRkxzzbd(String sptId, String cblx, String ysid);
 			
 }

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

@@ -639,9 +639,8 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
 
 
 
-	@SuppressWarnings("unused")
 	@Override
-	public Map<String, Object> scRkxzzbd(String sptId) {
+	public Map<String, Object> scRkxzzbd(String sptId, String cblx, String ysid) {
 		Map<String, Object> result_map = new HashMap<>();
 		
 		if (sptId != null) {
@@ -650,6 +649,8 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
 
             businessNoticeReceive.setCrktype("1"); //默认值：入库
         	businessNoticeReceive.setYwtype("1");//默认值：竞价入库
+        	businessNoticeReceive.setCblx(cblx);//储备类型(1市储，2区储)
+        	businessNoticeReceive.setYsid(ysid);//市平台验收数据ID
 
             if (sptId != null) {
             	//查询仓房ID、货位ID、orgId