fanxw 1 jaar geleden
bovenliggende
commit
4273e87391

+ 5 - 3
src/main/java/com/chinaitop/depot/business/controller/ReceiveNoticeController.java

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

+ 35 - 5
src/main/java/com/chinaitop/depot/business/mapper/BusinessNoticeReceiveMapper.xml

@@ -41,6 +41,8 @@
41
     <result column="is_notice" property="isNotice" jdbcType="INTEGER" />
41
     <result column="is_notice" property="isNotice" jdbcType="INTEGER" />
42
     <result column="pzmc" property="pzmc" jdbcType="VARCHAR" />
42
     <result column="pzmc" property="pzmc" jdbcType="VARCHAR" />
43
     <result column="is_sheet" property="isSheet" jdbcType="INTEGER" />
43
     <result column="is_sheet" property="isSheet" jdbcType="INTEGER" />
44
+    <result column="cblx" property="cblx" jdbcType="VARCHAR" />
45
+    <result column="ysid" property="ysid" jdbcType="VARCHAR" />
44
      
46
      
45
   </resultMap>
47
   </resultMap>
46
   <sql id="Example_Where_Clause" >
48
   <sql id="Example_Where_Clause" >
@@ -115,7 +117,7 @@
115
     id, notice_number, crktype, contract_number, ywtype, house_id, ware_house_id, grain_kind, 
117
     id, notice_number, crktype, contract_number, ywtype, house_id, ware_house_id, grain_kind, 
116
     grain_grade, count, outgoing_period, forwarding_unit, receive_unit, resion, in_application, 
118
     grain_grade, count, outgoing_period, forwarding_unit, receive_unit, resion, in_application, 
117
     org_id, grain_attribute, grain_detail_kind, receive_time,input_time,grain_annual,productive_year,grain_producing_area,
119
     org_id, grain_attribute, grain_detail_kind, receive_time,input_time,grain_annual,productive_year,grain_producing_area,
118
-    lsxzzbdh,lssl,hzqlsxzdm,hzrq,ccshr,zjshr,tjshr,kjshr,ldshr,bz,audit_state,is_notice,pzmc,is_sheet,htbh
120
+    lsxzzbdh,lssl,hzqlsxzdm,hzrq,ccshr,zjshr,tjshr,kjshr,ldshr,bz,audit_state,is_notice,pzmc,is_sheet,htbh,cblx,ysid
119
   </sql>
121
   </sql>
120
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.business.model.BusinessNoticeReceiveExample" >
122
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.business.model.BusinessNoticeReceiveExample" >
121
     select
123
     select
@@ -155,7 +157,7 @@
155
       receive_unit, resion, in_application, 
157
       receive_unit, resion, in_application, 
156
       org_id, grain_attribute, grain_detail_kind, 
158
       org_id, grain_attribute, grain_detail_kind, 
157
       receive_time,input_time,grain_annual,productive_year,grain_producing_area,
159
       receive_time,input_time,grain_annual,productive_year,grain_producing_area,
158
-      lsxzzbdh,lssl,hzqlsxzdm,hzrq,ccshr,zjshr,tjshr,kjshr,ldshr,bz,audit_state,is_notice,pzmc,is_sheet,htbh)
160
+      lsxzzbdh,lssl,hzqlsxzdm,hzrq,ccshr,zjshr,tjshr,kjshr,ldshr,bz,audit_state,is_notice,pzmc,is_sheet,htbh,cblx,ysid)
159
     values (#{id,jdbcType=INTEGER}, #{noticeNumber,jdbcType=VARCHAR}, #{crktype,jdbcType=VARCHAR}, 
161
     values (#{id,jdbcType=INTEGER}, #{noticeNumber,jdbcType=VARCHAR}, #{crktype,jdbcType=VARCHAR}, 
160
       #{contractNumber,jdbcType=VARCHAR}, #{ywtype,jdbcType=VARCHAR}, #{houseId,jdbcType=INTEGER}, 
162
       #{contractNumber,jdbcType=VARCHAR}, #{ywtype,jdbcType=VARCHAR}, #{houseId,jdbcType=INTEGER}, 
161
       #{wareHouseId,jdbcType=INTEGER}, #{grainKind,jdbcType=INTEGER}, #{grainGrade,jdbcType=INTEGER}, 
163
       #{wareHouseId,jdbcType=INTEGER}, #{grainKind,jdbcType=INTEGER}, #{grainGrade,jdbcType=INTEGER}, 
@@ -168,7 +170,7 @@
168
       #{hzrq,jdbcType=TIMESTAMP},#{ccshr,jdbcType=VARCHAR},#{zjshr,jdbcType=VARCHAR},
170
       #{hzrq,jdbcType=TIMESTAMP},#{ccshr,jdbcType=VARCHAR},#{zjshr,jdbcType=VARCHAR},
169
       #{tjshr,jdbcType=VARCHAR},#{kjshr,jdbcType=VARCHAR},#{ldshr,jdbcType=VARCHAR},
171
       #{tjshr,jdbcType=VARCHAR},#{kjshr,jdbcType=VARCHAR},#{ldshr,jdbcType=VARCHAR},
170
       #{bz,jdbcType=VARCHAR},#{auditState,jdbcType=INTEGER},#{isNotice,jdbcType=INTEGER},#{pzmc,jdbcType=VARCHAR}
172
       #{bz,jdbcType=VARCHAR},#{auditState,jdbcType=INTEGER},#{isNotice,jdbcType=INTEGER},#{pzmc,jdbcType=VARCHAR}
171
-      ,#{isSheet,jdbcType=INTEGER},#{htbh,jdbcType=VARCHAR})
173
+      ,#{isSheet,jdbcType=INTEGER},#{htbh,jdbcType=VARCHAR},#{cblx,jdbcType=VARCHAR},#{ysid,jdbcType=VARCHAR})
172
   </insert>
174
   </insert>
173
   <insert id="insertSelective" parameterType="com.chinaitop.depot.business.model.BusinessNoticeReceive" >
175
   <insert id="insertSelective" parameterType="com.chinaitop.depot.business.model.BusinessNoticeReceive" >
174
     insert into business_notice_receive
176
     insert into business_notice_receive
@@ -287,6 +289,12 @@
287
       <if test="htbh != null">
289
       <if test="htbh != null">
288
         htbh,
290
         htbh,
289
       </if>
291
       </if>
292
+      <if test="cblx != null">
293
+        cblx,
294
+      </if>
295
+      <if test="ysid != null">
296
+        ysid,
297
+      </if>
290
     </trim>
298
     </trim>
291
     <trim prefix="values (" suffix=")" suffixOverrides="," >
299
     <trim prefix="values (" suffix=")" suffixOverrides="," >
292
       <if test="id != null" >
300
       <if test="id != null" >
@@ -403,6 +411,12 @@
403
       <if test="htbh != null">
411
       <if test="htbh != null">
404
         #{htbh,jdbcType=VARCHAR},
412
         #{htbh,jdbcType=VARCHAR},
405
       </if>
413
       </if>
414
+      <if test="cblx != null">
415
+        #{cblx,jdbcType=VARCHAR},
416
+      </if>
417
+      <if test="ysid != null">
418
+        #{ysid,jdbcType=VARCHAR},
419
+      </if>
406
     </trim>
420
     </trim>
407
   </insert>
421
   </insert>
408
   <select id="countByExample" parameterType="com.chinaitop.depot.business.model.BusinessNoticeReceiveExample" resultType="java.lang.Integer" >
422
   <select id="countByExample" parameterType="com.chinaitop.depot.business.model.BusinessNoticeReceiveExample" resultType="java.lang.Integer" >
@@ -528,6 +542,12 @@
528
       <if test="record.htbh != null">
542
       <if test="record.htbh != null">
529
         htbh = #{record.htbh,jdbcType=VARCHAR},
543
         htbh = #{record.htbh,jdbcType=VARCHAR},
530
       </if>
544
       </if>
545
+      <if test="record.cblx != null">
546
+        cblx = #{record.cblx,jdbcType=VARCHAR},
547
+      </if>
548
+      <if test="record.ysid != null">
549
+        ysid = #{record.ysid,jdbcType=VARCHAR},
550
+      </if>
531
     </set>
551
     </set>
532
     <if test="_parameter != null" >
552
     <if test="_parameter != null" >
533
       <include refid="Update_By_Example_Where_Clause" />
553
       <include refid="Update_By_Example_Where_Clause" />
@@ -572,7 +592,9 @@
572
       is_notice = #{record.isNotice,jdbcType=INTEGER},
592
       is_notice = #{record.isNotice,jdbcType=INTEGER},
573
       pzmc = #{record.pzmc,jdbcType=VARCHAR},
593
       pzmc = #{record.pzmc,jdbcType=VARCHAR},
574
       is_sheet = #{record.isSheet,jdbcType=INTEGER},
594
       is_sheet = #{record.isSheet,jdbcType=INTEGER},
575
-      htbh = #{record.htbh,jdbcType=VARCHAR}
595
+      htbh = #{record.htbh,jdbcType=VARCHAR},
596
+      cblx = #{record.cblx,jdbcType=VARCHAR},
597
+      ysid = #{record.ysid,jdbcType=VARCHAR}
576
       
598
       
577
     <if test="_parameter != null" >
599
     <if test="_parameter != null" >
578
       <include refid="Update_By_Example_Where_Clause" />
600
       <include refid="Update_By_Example_Where_Clause" />
@@ -692,6 +714,12 @@
692
       <if test="htbh != null">
714
       <if test="htbh != null">
693
         htbh = #{htbh,jdbcType=VARCHAR},
715
         htbh = #{htbh,jdbcType=VARCHAR},
694
       </if>
716
       </if>
717
+      <if test="cblx != null">
718
+        cblx = #{cblx,jdbcType=VARCHAR},
719
+      </if>
720
+      <if test="ysid != null">
721
+        ysid = #{ysid,jdbcType=VARCHAR},
722
+      </if>
695
     </set>
723
     </set>
696
     where id = #{id,jdbcType=INTEGER}
724
     where id = #{id,jdbcType=INTEGER}
697
   </update>
725
   </update>
@@ -733,7 +761,9 @@
733
       is_notice = #{isNotice,jdbcType=INTEGER},
761
       is_notice = #{isNotice,jdbcType=INTEGER},
734
       pzmc = #{pzmc,jdbcType=VARCHAR},
762
       pzmc = #{pzmc,jdbcType=VARCHAR},
735
       is_sheet = #{isSheet,jdbcType=INTEGER},
763
       is_sheet = #{isSheet,jdbcType=INTEGER},
736
-      htbh = #{htbh,jdbcType=VARCHAR}
764
+      htbh = #{htbh,jdbcType=VARCHAR},
765
+      cblx = #{cblx,jdbcType=VARCHAR},
766
+      ysid = #{ysid,jdbcType=VARCHAR}
737
     where id = #{id,jdbcType=INTEGER}
767
     where id = #{id,jdbcType=INTEGER}
738
   </update>
768
   </update>
739
   
769
   

+ 34 - 0
src/main/java/com/chinaitop/depot/business/model/BusinessNoticeReceive.java

@@ -23,6 +23,8 @@ public class BusinessNoticeReceive {
23
     private String pzmc;
23
     private String pzmc;
24
     private Integer isSheet;
24
     private Integer isSheet;
25
     private String htbh;
25
     private String htbh;
26
+    private String cblx;
27
+    private String ysid;
26
 
28
 
27
     /**
29
     /**
28
      * 0是性质转变单
30
      * 0是性质转变单
@@ -823,4 +825,36 @@ public class BusinessNoticeReceive {
823
 		this.htbh = htbh;
825
 		this.htbh = htbh;
824
 	}
826
 	}
825
 
827
 
828
+	/**
829
+	 * 储备类型(1市储,2区储)
830
+	 * @return
831
+	 */
832
+	public String getCblx() {
833
+		return cblx;
834
+	}
835
+
836
+	/**
837
+	 * 储备类型(1市储,2区储)
838
+	 * @param cblx
839
+	 */
840
+	public void setCblx(String cblx) {
841
+		this.cblx = cblx;
842
+	}
843
+
844
+	/**
845
+	 * 市平台验收数据ID
846
+	 * @return
847
+	 */
848
+	public String getYsid() {
849
+		return ysid;
850
+	}
851
+
852
+	/**
853
+	 * 市平台验收数据ID
854
+	 * @param ysid
855
+	 */
856
+	public void setYsid(String ysid) {
857
+		this.ysid = ysid;
858
+	}
859
+
826
 }
860
 }

+ 4 - 2
src/main/java/com/chinaitop/depot/business/service/ReceiveNoticeService.java

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

+ 3 - 2
src/main/java/com/chinaitop/depot/business/service/impl/ReceiveNoticeServiceImpl.java

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