通知单

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

@@ -822,4 +822,47 @@ public class BusinessDeliveryStorageNoticeController {
         }
         return modelMap;
     }
+    
+    /**
+     * 新--通知单选择计划
+     */
+    @RequestMapping(value="/getJhList", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+	@ApiOperation(value="*计划列表", notes = "查询数据列表，支持分页")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
+		@ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
+		@ApiImplicitParam(name = "planType", value = "计划类型/1: 粮食2: 油料", paramType = "query"),
+		@ApiImplicitParam(name = "orgId", value = "单位id", paramType = "query"),
+		@ApiImplicitParam(name = "inOurOut", value = "出库1/入库2", paramType = "query")
+	})
+    public PageInfo<Map<String,Object>> getJhList(Integer pageNum, Integer pageSize,Integer inOurOut,Integer planType,
+            Integer orgId) {
+    	
+    	List<Map<String,Object>> list = deliveryStorageNoticeService.getJhList(pageNum,pageSize,inOurOut,planType,orgId);
+        PageInfo<Map<String,Object>> pageInfo = new PageInfo<>(list);
+        
+        return pageInfo;
+    }
+    
+    /**
+     * 
+     * @param pageNum
+     * @param pageSize
+     * @param inOurOut
+     * @param planType
+     * @param orgId
+     * @return
+     */
+    @RequestMapping(value="/getJhMxList", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+	@ApiOperation(value="*计划明细列表", notes = "查询数据列表，支持分页")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "jhId", value = "计划id", paramType = "query"),
+		@ApiImplicitParam(name = "orgId", value = "单位id", paramType = "query"),
+		@ApiImplicitParam(name = "inOurOut", value = "出库1/入库2", paramType = "query")
+	})
+    public List<Map<String,Object>> getJhMxList(Integer jhId, Integer inOurOut,Integer orgId) {
+            
+        return deliveryStorageNoticeService.getJhMxList(jhId,inOurOut,orgId);
+    }
+    
 }

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

@@ -124,4 +124,8 @@ public interface BusinessDeliveryStorageNoticeMapper {
     List<Map<String,Object>> uploadNoticeData(Map<String,Object> map);
 
 	List<Map<String, Object>> getNoticeData(Map<String, Object> mapCondition);
+
+	List<Map<String, Object>> getJhList(Map<String, Object> map);
+
+	List<Map<String, Object>> getJhMxList(Map<String, Object> map);
 }

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

@@ -1243,4 +1243,40 @@
   	select id from business_customer where name = #{deliveryCustomer} and 
   	identification = #{identification} and org_id = #{orgId}
   </select>
+  
+  <select id="getJhList" parameterType="java.util.Map" resultType="java.util.Map">
+  		SELECT
+			b.id,
+			b.unit_info_id,
+			b.plan_name,
+			b.rotation_year,
+			b.plan_type,
+			b.plan_year,
+			a.plan_number,
+			a.start_date,
+			a.end_date,
+			a.create_time
+		FROM
+				province_all.biz_rp_issuance a 
+		LEFT JOIN depot_qh.business_rp_report b on a.rp_report_id  = b.id
+		left join depot_qh.org_info c on  b.unit_info_id = c.unit_info_id
+		where c.org_id= #{orgId} and b.plan_type = #{planType}
+  </select>
+  
+  <select id="getJhMxList" parameterType="java.util.Map" resultType="java.util.Map">
+  		SELECT
+			*
+		FROM
+			<if test="inOurOut != null">
+				<if test="inOurOut == 1">
+					business_rp_outbound
+			    </if>
+			    <if test="inOurOut == 2">
+					business_rp_inbound
+			    </if>
+			</if>
+		WHERE
+			org_id = #{orgId}
+		AND rp_report_id = #{jhId} 
+  </select>
 </mapper>

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

@@ -29,7 +29,7 @@
     <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="agreement_number" property="agreementNumber" jdbcType="VARCHAR" /> -->
     <result column="incoming_type" property="incomingType" jdbcType="INTEGER" />
     <result column="htbh" property="htbh" jdbcType="VARCHAR" />
   </resultMap>
@@ -95,7 +95,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,agreement_number,incoming_type,htbh
+    out_price, out_count, out_detail_total_price, out_remaining_number,jstzd_id,incoming_type,htbh
   </sql>
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.business.model.BusinessStoreWareDetailExample" >
     select
@@ -136,7 +136,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,agreement_number,incoming_type,htbh
+      out_detail_total_price, out_remaining_number,jstzd_id,incoming_type,htbh
       )
     values (#{id,jdbcType=INTEGER}, #{zid,jdbcType=INTEGER}, #{type,jdbcType=VARCHAR}, 
       #{houseId,jdbcType=INTEGER}, #{houseName,jdbcType=VARCHAR}, #{warehouseId,jdbcType=INTEGER}, 
@@ -147,7 +147,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},#{htbh,jdbcType=VARCHAR})
+      ,#{incomingType,jdbcType=INTEGER},#{htbh,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.chinaitop.depot.business.model.BusinessStoreWareDetail" >
     insert into business_store_ware_detail
@@ -233,9 +233,6 @@
       <if test="jstzdId != null" >
         jstzd_id,
       </if>
-      <if test="agreementNumber != null" >
-        agreement_number,
-      </if>
       <if test="incomingType != null" >
         incoming_type,
       </if>
@@ -325,9 +322,6 @@
       <if test="jstzdId != null" >
         #{jstzdId,jdbcType=VARCHAR},
       </if>
-      <if test="agreementNumber  != null" >
-        #{agreementNumber,jdbcType=VARCHAR},
-      </if>
       <if test="incomingType != null" >
         #{incomingType,jdbcType=INTEGER},
       </if>
@@ -426,9 +420,6 @@
       <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>
@@ -468,7 +459,7 @@
       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},agreement_number = #{record.agreementNumber,jdbcType=VARCHAR},
+      jstzd_id = #{record.jstzdId,jdbcType=VARCHAR},
       incoming_type = #{record.incomingType,jdbcType=INTEGER},
       htbh = #{record.htbh,jdbcType=VARCHAR}
     <if test="_parameter != null" >
@@ -556,9 +547,6 @@
       <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>
@@ -596,7 +584,6 @@
       out_detail_total_price = #{outDetailTotalPrice,jdbcType=VARCHAR},
       out_remaining_number = #{outRemainingNumber,jdbcType=VARCHAR},
       jstzd_id = #{jstzdId,jdbcType=VARCHAR},
-      agreement_number = #{agreementNumber,jdbcType=VARCHAR},
       incoming_type = #{incomingType,jdbcType=INTEGER},
       htbh = #{htbh,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}

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

@@ -6,7 +6,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 
 public class BusinessStoreWareDetail {
 	
-	private String agreementNumber;//协议编号
+	//private String agreementNumber;//协议编号
 	private Integer incomingType;//入库类型
 	private String htbh;//合同编号
 
@@ -18,13 +18,13 @@ public class BusinessStoreWareDetail {
 		this.incomingType = incomingType;
 	}
 
-	public String getAgreementNumber() {
+	/*public String getAgreementNumber() {
 	    return agreementNumber;
 	}
 
 	public void setAgreementNumber(String agreementNumber) {
 		this.agreementNumber = agreementNumber;
-	}
+	}*/
 
     private Integer id;
 

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

@@ -125,4 +125,9 @@ public interface BusinessDeliveryStorageNoticeService {
 	List<BusinessDeliveryStorageNotice> queryNoticeChangeList(Integer userId, Integer pageNum, Integer pageSize);
 
 	List<BusinessDeliveryStorageNotice> getChangeDetailList(Integer id, String type);
+
+	List<Map<String, Object>> getJhList(Integer pageNum, Integer pageSize, Integer inOurOut, Integer planType,
+			Integer orgId);
+
+	List<Map<String, Object>> getJhMxList(Integer jhId, Integer inOurOut,Integer orgId);
 }

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

@@ -1472,5 +1472,35 @@ public class BusinessDeliveryStorageNoticeServiceImpl implements BusinessDeliver
         return null;
 	}
 
+
+	@Override
+	public List<Map<String, Object>> getJhList(Integer pageNum, Integer pageSize, Integer inOurOut, Integer planType,
+			Integer orgId) {
+		// TODO Auto-generated method stub
+		
+		if(pageNum!=null && pageSize!=null){
+            PageHelper.startPage(pageNum, pageSize);
+        }
+		
+		Map<String,Object> map = new HashMap<String,Object>();
+		map.put("inOurOut", inOurOut);
+		map.put("planType", planType);
+		map.put("orgId", orgId);
+
+		return businessDeliveryStorageNoticeMapper.getJhList(map);
+	}
+
+
+	@Override
+	public List<Map<String, Object>> getJhMxList(Integer jhId, Integer inOurOut,Integer orgId) {
+		// TODO Auto-generated method stub
+		Map<String,Object> map = new HashMap<String,Object>();
+		map.put("jhId", jhId);
+		map.put("inOurOut", inOurOut);
+		map.put("orgId", orgId);
+
+		return businessDeliveryStorageNoticeMapper.getJhMxList(map);
+	}
+
     
 }