1

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

@@ -49,10 +49,11 @@ public class StorageBgzzController {
     	@ApiImplicitParam(name="pageSize", value="每页显示条数", paramType="query"),
     	@ApiImplicitParam(name="lsxz", value="粮食性质", required=true, paramType="query"),
     	@ApiImplicitParam(name="jznd", value="记账年度", required=true, paramType="query"),
-    	@ApiImplicitParam(name="orgId", value="库ID", required=true, paramType="query")
+    	@ApiImplicitParam(name="orgId", value="库ID", required=true, paramType="query"),
+    	@ApiImplicitParam(name="ylorcpl", value="原粮或成品粮(0:原粮,1:成品粮)", required=true, paramType="query")
     })
 	public PageInfo<BgzzListObject> getListFcbgz(Integer pageNum, Integer pageSize, 
-			Integer lsxz, String jznd, Integer orgId) {
+			Integer lsxz, String jznd, Integer orgId, String ylorcpl) {
 
 		List<BgzzListObject> list = null;
 
@@ -60,7 +61,7 @@ public class StorageBgzzController {
 			if (pageNum!=null && pageSize!=null) {
 				PageHelper.startPage(pageNum, pageSize);
 			}
-			list = storageBgzzService.selectBgzzList(lsxz, jznd, orgId);
+			list = storageBgzzService.selectBgzzList(lsxz, jznd, orgId, ylorcpl);
 		} catch (Exception e) {
 			logger.error(e.getMessage(), e);
 		}
@@ -74,12 +75,13 @@ public class StorageBgzzController {
 	@ApiImplicitParams({
     	@ApiImplicitParam(name="orgId", value="库ID", required=true, paramType="query"),
     	@ApiImplicitParam(name="lsxz", value="粮食性质ID", required=true, paramType="query"),
-    	@ApiImplicitParam(name="jznd", value="记账年度", required=true, paramType="query")
+    	@ApiImplicitParam(name="jznd", value="记账年度", required=true, paramType="query"),
+    	@ApiImplicitParam(name="ylorcpl", value="原粮或成品粮(0:原粮,1:成品粮)", required=true, paramType="query")
     })
-	public Map<String, Object> queryJzList(Integer orgId, Integer lsxz, String jznd) {
+	public Map<String, Object> queryJzList(Integer orgId, Integer lsxz, String jznd, String ylorcpl) {
 		Map<String, Object> map = new HashMap<>();
 		try {
-			map = storageBgzzService.queryJzList(orgId, lsxz, jznd);
+			map = storageBgzzService.queryJzList(orgId, lsxz, jznd, ylorcpl);
 		} catch (Exception e) {
 			logger.error(e.getMessage(), e);
 		}
@@ -128,13 +130,14 @@ public class StorageBgzzController {
 	@RequestMapping(value="/exportBgzz", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
 	@ApiOperation(value="导出一个货位的分仓保管账报表数据", notes = "")
 	@ApiImplicitParams({
-			@ApiImplicitParam(name = "orgId", value = "库id", required=true, paramType = "query"),
-			@ApiImplicitParam(name = "lsxz", value = "粮食性质", required=true, paramType = "query"),
-			@ApiImplicitParam(name = "jznd", value = "记账年度", required=true, paramType = "query")
+		@ApiImplicitParam(name = "orgId", value = "库id", required=true, paramType = "query"),
+		@ApiImplicitParam(name = "lsxz", value = "粮食性质", required=true, paramType = "query"),
+		@ApiImplicitParam(name = "jznd", value = "记账年度", required=true, paramType = "query"),
+		@ApiImplicitParam(name="ylorcpl", value="原粮或成品粮(0:原粮,1:成品粮)", required=true, paramType="query")
 	})
-	public void exportBgzz(HttpServletResponse response,HttpServletRequest request, Integer orgId, Integer lsxz, String jznd){
+	public void exportBgzz(HttpServletResponse response,HttpServletRequest request, Integer orgId, Integer lsxz, String jznd, String ylorcpl){
 		try {
-			HSSFWorkbook workbook = storageBgzzService.exportBgzz(lsxz, jznd, orgId);
+			HSSFWorkbook workbook = storageBgzzService.exportBgzz(lsxz, jznd, orgId, ylorcpl);
 			String fileName = jznd+"年保管总账报表";
 			// 获取输出流
 			OutputStream os = response.getOutputStream();

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

@@ -36,18 +36,20 @@ public interface StorageBgzzService {
 	 * @param lsxz 粮食性质
 	 * @param jznd 记账年度
 	 * @param orgId 库ID
+	 * @param ylorcpl 原粮或成品粮(0:原粮,1:成品粮)
 	 * @return
 	 */
-	List<BgzzListObject> selectBgzzList(Integer lsxz, String jznd, Integer orgId) throws Exception;
+	List<BgzzListObject> selectBgzzList(Integer lsxz, String jznd, Integer orgId, String ylorcpl) throws Exception;
 
 	/**
 	 * 保管总账点记账
 	 * @param orgId 库ID
 	 * @param lsxz 粮食性质ID
 	 * @param jznd 记账年度
+	 * @param ylorcpl 原粮或成品粮(0:原粮,1:成品粮)
 	 * @return
 	 */
-	Map<String, Object> queryJzList(Integer orgId, Integer lsxz, String jznd) throws Exception;
+	Map<String, Object> queryJzList(Integer orgId, Integer lsxz, String jznd, String ylorcpl) throws Exception;
 
 	/**
 	 * 记账保存
@@ -60,8 +62,9 @@ public interface StorageBgzzService {
 	 * @param lsxz 粮食性质
 	 * @param jznd 记账年度
 	 * @param orgId 库ID
+	 * @param ylorcpl 原粮或成品粮(0:原粮,1:成品粮)
 	 * @return
 	 * @throws Exception
 	 */
-	HSSFWorkbook exportBgzz(Integer lsxz, String jznd, Integer orgId) throws Exception;
+	HSSFWorkbook exportBgzz(Integer lsxz, String jznd, Integer orgId, String ylorcpl) throws Exception;
 }

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

@@ -388,7 +388,7 @@ public class StorageBgzzServiceImpl implements StorageBgzzService {
 	}
 
 	@Override
-	public List<BgzzListObject> selectBgzzList(Integer lsxz, String jznd, Integer orgId) throws Exception {
+	public List<BgzzListObject> selectBgzzList(Integer lsxz, String jznd, Integer orgId, String ylorcpl) throws Exception {
 		Map<String, Object> map = new HashMap<>();
 		if (null != lsxz) {
 			map.put("lyxz", lsxz);
@@ -396,6 +396,9 @@ public class StorageBgzzServiceImpl implements StorageBgzzService {
 		if (StringUtils.isNotBlank(jznd)) {
 			map.put("jznd", jznd);
 		}
+		if (StringUtils.isNotBlank(ylorcpl)) {
+			map.put("ylorcpl", ylorcpl);
+		}
 		if (null != orgId) {
 			map.put("orgId", orgId);
 		}
@@ -404,7 +407,7 @@ public class StorageBgzzServiceImpl implements StorageBgzzService {
 	}
 
 	@Override
-	public Map<String, Object> queryJzList(Integer orgId, Integer lsxz, String jznd) throws Exception {
+	public Map<String, Object> queryJzList(Integer orgId, Integer lsxz, String jznd, String ylorcpl) throws Exception {
 		Map<String, Object> map = new HashMap<>();
 
 		/**
@@ -501,8 +504,8 @@ public class StorageBgzzServiceImpl implements StorageBgzzService {
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public HSSFWorkbook exportBgzz(Integer lsxz, String jznd, Integer orgId) throws Exception {
-		Map<String, Object> map = queryJzList(orgId, lsxz, jznd);
+	public HSSFWorkbook exportBgzz(Integer lsxz, String jznd, Integer orgId, String ylorcpl) throws Exception {
+		Map<String, Object> map = queryJzList(orgId, lsxz, jznd, ylorcpl);
 		List<StorageBgzz> list = (List<StorageBgzz>) map.get("list");
 
 		HSSFWorkbook wb = new HSSFWorkbook();

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

@@ -604,7 +604,7 @@ public class StorageFcbgzServiceImpl implements StorageFcbgzService {
 
 		Map<String,Object> map = queryJzList(ch, hwh, lsxz, jznd, ylorcpl);
 		List<StorageFcbgz> list = (List<StorageFcbgz>) map.get("list");
-		
+
 		HSSFWorkbook wb = new HSSFWorkbook();
 		String name = "报表";
 		HSSFSheet sheet = wb.createSheet(name);
@@ -626,11 +626,6 @@ public class StorageFcbgzServiceImpl implements StorageFcbgzService {
 		CellRangeAddress rangeAddress9 = new CellRangeAddress(2,2,4,4);//粮食品种
 		CellRangeAddress rangeAddress10 = new CellRangeAddress(2,2,5,5);//收入数量
 		CellRangeAddress rangeAddress11 = new CellRangeAddress(2,2,6,6);//支出数量
-//		CellRangeAddress rangeAddress12 = new CellRangeAddress(2,2,7,7);//损耗
-//		CellRangeAddress rangeAddress13 = new CellRangeAddress(2,2,8,8);//溢余
-//		CellRangeAddress rangeAddress14 = new CellRangeAddress(2,2,9,9);//库存数量
-//		CellRangeAddress rangeAddress15 = new CellRangeAddress(2,2,10,10);//记账员
-//		CellRangeAddress rangeAddress16 = new CellRangeAddress(2,2,11,11);//审核人
 		CellRangeAddress rangeAddress12 = new CellRangeAddress(2,2,7,7);//库存数量
 		CellRangeAddress rangeAddress13 = new CellRangeAddress(2,2,8,8);//记账员
 		CellRangeAddress rangeAddress14 = new CellRangeAddress(2,2,9,9);//审核人
@@ -657,10 +652,6 @@ public class StorageFcbgzServiceImpl implements StorageFcbgzService {
 		sheet.setColumnWidth(5, 20*256);
 		sheet.setColumnWidth(6, 15*256);
 		sheet.setColumnWidth(7, 15*256);
-//		sheet.setColumnWidth(8, 15*256);
-//		sheet.setColumnWidth(9, 15*256);
-//		sheet.setColumnWidth(10, 25*256);
-//		sheet.setColumnWidth(11, 25*256);
 		sheet.setColumnWidth(8, 25*256);
 		sheet.setColumnWidth(9, 25*256);
 
@@ -692,13 +683,7 @@ public class StorageFcbgzServiceImpl implements StorageFcbgzService {
 		//第一行
 		HSSFRow sheetRow0 = sheet.createRow(0);
 		HSSFCell row0cell0 = sheetRow0.createCell(0);
-		String titles = "";
-		if(lsxz == 6877 || lsxz == 6878) {
-			titles = "天津市储备粮分仓保管账";
-		} else if(lsxz == 3052) {
-			titles = "天津市商品粮分仓保管账";
-		}
-		row0cell0.setCellValue(titles);
+		row0cell0.setCellValue("天津市成品储备粮分仓保管账");
 		row0cell0.setCellStyle(contentStyle);
 
 		//第二行
@@ -714,7 +699,7 @@ public class StorageFcbgzServiceImpl implements StorageFcbgzService {
 		row1cell0.setCellValue("单位名称："+orgName);
 		row1cell1.setCellValue("仓号-货位："+cfhwmc);
 		row1cell2.setCellValue("记账年度："+jznd);
-		row1cell3.setCellValue("单位：公斤");
+		row1cell3.setCellValue("单位：吨");
 
 		//第三行
 		HSSFRow sheetRow2 = sheet.createRow(2);
@@ -728,8 +713,6 @@ public class StorageFcbgzServiceImpl implements StorageFcbgzService {
 		HSSFCell row2cell7 = sheetRow2.createCell(7);
 		HSSFCell row2cell8 = sheetRow2.createCell(8);
 		HSSFCell row2cell9 = sheetRow2.createCell(9);
-//		HSSFCell row2cell10 = sheetRow2.createCell(10);
-//		HSSFCell row2cell11 = sheetRow2.createCell(11);
 		row2cell0.setCellStyle(contentStyle);
 		row2cell1.setCellStyle(contentStyle);
 		row2cell2.setCellStyle(contentStyle);
@@ -740,8 +723,6 @@ public class StorageFcbgzServiceImpl implements StorageFcbgzService {
 		row2cell7.setCellStyle(contentStyle);
 		row2cell8.setCellStyle(contentStyle);
 		row2cell9.setCellStyle(contentStyle);
-//		row2cell10.setCellStyle(contentStyle);
-//		row2cell11.setCellStyle(contentStyle);
 		row2cell0.setCellValue("记账日期");
 		row2cell1.setCellValue("记账凭证");
 		row2cell2.setCellValue("摘要");
@@ -749,11 +730,6 @@ public class StorageFcbgzServiceImpl implements StorageFcbgzService {
 		row2cell4.setCellValue("粮食品种");
 		row2cell5.setCellValue("收入数量");
 		row2cell6.setCellValue("支出数量");
-//		row2cell7.setCellValue("损耗");
-//		row2cell8.setCellValue("溢余");
-//		row2cell9.setCellValue("库存数量");
-//		row2cell10.setCellValue("记账员");
-//		row2cell11.setCellValue("审核人");
 		row2cell7.setCellValue("库存数量");
 		row2cell8.setCellValue("记账员");
 		row2cell9.setCellValue("审核人");