1

src/main/java/com/chinaitop/depot/keeperAccount/controller/StorageFcbgzController.java

@@ -108,17 +108,19 @@ public class StorageFcbgzController {
 	@RequestMapping(value="/selectCrkDetail", method = RequestMethod.GET)
 	@ApiOperation(value="查询保管明细账", notes = "分仓保管账查询明细")
 	@ApiImplicitParams({
-    	@ApiImplicitParam(name="hwh", value="货位ID", required=true, paramType="query"),
+		@ApiImplicitParam(name="ch", value="仓房ID", required=true, paramType="query"),
+		@ApiImplicitParam(name="hwh", value="货位ID", required=true, paramType="query"),
     	@ApiImplicitParam(name="lsxz", value="粮食性质ID", required=true, paramType="query"),
     	@ApiImplicitParam(name="mxpz", value="明细品种ID", required=true, paramType="query"),
     	@ApiImplicitParam(name="jzpz", value="记账凭证", required=true, paramType="query"),
     	@ApiImplicitParam(name="jzzy", value="摘要", required=true, paramType="query"),
-    	@ApiImplicitParam(name="jzrq", value="记账日期", required=true, paramType="query")
+    	@ApiImplicitParam(name="jzrq", value="记账日期", required=true, paramType="query"),
+    	@ApiImplicitParam(name="crklx", value="出入库类型(0:入库,1:出库)", required=true, paramType="query")
     })
-	public List<Map<String, Object>> selectCrkDetail(Integer hwh, Integer lsxz, Integer mxpz, String jzpz, String jzzy, String jzrq) {
+	public List<Map<String, Object>> selectCrkDetail(Integer ch, Integer hwh, Integer lsxz, Integer mxpz, String jzpz, String jzzy, String jzrq, String crklx) {
 		List<Map<String, Object>> list = null;
 		try {
-			list = storageFcbgzService.selectCrkDetail(hwh, lsxz, mxpz, jzpz, jzzy, jzrq);
+			list = storageFcbgzService.selectCrkDetail(ch, hwh, lsxz, mxpz, jzpz, jzzy, jzrq, crklx);
 		} catch (Exception e) {
 			logger.error(e.getMessage(), e);
 		}

src/main/java/com/chinaitop/depot/keeperAccount/mapper/StorageFcbgzMapper.xml

@@ -748,11 +748,18 @@
 	left join lsreport_ts:data_kcgl_kcbd_default c on c.dataid=a.dataid
 	left join lsreport_ts:data_kcgl_kcbd_default d on d.dataid=reverse(b.dataid)
 	where 1=1
+	and a.sjcf=#{ch,jdbcType=VARCHAR}
 	and a.sjhw=#{hwh,jdbcType=VARCHAR}
 	and a.hwxz=#{lsxz,jdbcType=VARCHAR}
 	and a.mxpz=#{mxpz,jdbcType=VARCHAR}
 	and b.rq between #{starttime,jdbcType=VARCHAR} and #{endtime,jdbcType=VARCHAR}
 	and ${wer}
+	<if test="crklx==0">
+	and b.srsl > 0
+	</if>
+	<if test="crklx==1">
+	and b.zcsl > 0
+	</if>
 	order by b.rq
   </select>
 

src/main/java/com/chinaitop/depot/keeperAccount/service/StorageFcbgzService.java

@@ -51,17 +51,19 @@ public interface StorageFcbgzService {
 
 	/**
 	 * 查询保管账明细数据
+	 * @param ch 仓房号
 	 * @param hwh 货位号
 	 * @param lsxz 粮食性质
 	 * @param mxpz 明细品种
 	 * @param jzpz 记账凭账
 	 * @param jzzy 记账摘要
 	 * @param jzrq 记账rq
+	 * @param crklx 出入库类型(0:入库,1:出库)
 	 * @return
 	 * @throws Exception
 	 */
-	List<Map<String, Object>> selectCrkDetail(Integer hwh, Integer lsxz, Integer mxpz, String jzpz, String jzzy,
-			String jzrq) throws Exception;
+	List<Map<String, Object>> selectCrkDetail(Integer ch, Integer hwh, Integer lsxz, Integer mxpz, String jzpz, String jzzy,
+			String jzrq, String crklx) throws Exception;
 
 	/**
 	 * 导出一个货位的分仓保管账报表数据

src/main/java/com/chinaitop/depot/keeperAccount/service/impl/FcbgzUtilsServiceImpl.java

@@ -61,6 +61,7 @@ public class FcbgzUtilsServiceImpl {
 		criteria.andDataTypeEqualTo(dataType);//数据类型
 		criteria.andLyxzEqualTo(f.getLyxz());//粮食性质
 		criteria.andYwlxEqualTo(f.getYwlx());//业务类型
+		criteria.andJzndEqualTo(f.getJznd());//业务类型
 		criteria.andYlorcplEqualTo(f.getYlorcpl());
 
 		if (StorageFcbgzUtils.DATA_TYPE_1.equals(dataType)) {//月合计

src/main/java/com/chinaitop/depot/keeperAccount/service/impl/StorageFcbgzServiceImpl.java

@@ -233,8 +233,8 @@ public class StorageFcbgzServiceImpl implements StorageFcbgzService {
 	}
 
 	@Override
-	public List<Map<String, Object>> selectCrkDetail(Integer hwh, Integer lsxz, Integer mxpz, String jzpz, String jzzy,
-			String jzrq) throws Exception {
+	public List<Map<String, Object>> selectCrkDetail(Integer ch, Integer hwh, Integer lsxz, Integer mxpz, String jzpz, String jzzy,
+			String jzrq, String crklx) throws Exception {
 		Map<String, Object> map = new HashMap<>();
 		Integer ywlx = null;
 		if ("轮换入库".equals(jzzy) || "轮换出库".equals(jzzy) || "出库".equals(jzzy) || "入库".equals(jzzy)) {
@@ -252,10 +252,12 @@ public class StorageFcbgzServiceImpl implements StorageFcbgzService {
 		if ("期初库存".equals(jzzy)) {
 			ywlx = 5;
 		}
+		map.put("ch", ch);
 		map.put("hwh", hwh);
 		map.put("lsxz", lsxz);
 		map.put("mxpz", mxpz);
 		map.put("jzpz", jzpz);
+		map.put("crklx", crklx);
 		map.put("starttime", jzrq+" 00:00:00");
 		map.put("endtime", jzrq+" 23:59:59");
 		switch(ywlx) {
@@ -480,7 +482,7 @@ public class StorageFcbgzServiceImpl implements StorageFcbgzService {
 				if ("0".equals(f.getDataType())) {//普通数据
 					HSSFCell hssfCell0 = hssfRow.createCell(0);
 					hssfCell0.setCellStyle(titleStyle);
-					hssfCell0.setCellValue(f.getJzrq());
+					hssfCell0.setCellValue(ParameterUtil.date2string1(f.getJzrq()));
 					HSSFCell hssfCell1 = hssfRow.createCell(1);
 					hssfCell1.setCellStyle(titleStyle);
 					hssfCell1.setCellValue(f.getJzpz());