1

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

@@ -115,12 +115,13 @@ public class StorageBgzzController {
     	@ApiImplicitParam(name="jznd", value="记账年度", required=true, paramType="query"),
     	@ApiImplicitParam(name="jzyf", value="记账月份", paramType="query"),
     	@ApiImplicitParam(name="jzzy", value="摘要", paramType="query"),
-    	@ApiImplicitParam(name="orgId", value="库ID", paramType="query")
+    	@ApiImplicitParam(name="orgId", value="库ID", paramType="query"),
+    	@ApiImplicitParam(name="ylorcpl", value="原粮或成品粮(0:原粮,1:成品粮)", paramType="query")
     })
-	public List<StorageFcbgz> selectCrkDetail(Integer lsxz, Integer lspz, String jzzy, String jzyf, String jznd, String orgId) {
+	public List<StorageFcbgz> selectFcbgzDetail(Integer lsxz, Integer lspz, String jzzy, String jzyf, String jznd, String orgId, String ylorcpl) {
 		List<StorageFcbgz> list = null;
 		try {
-			list = storageFcbgzService.selectFcbgzDetail(lsxz, lspz, jzzy, jzyf, jznd, orgId);
+			list = storageFcbgzService.selectFcbgzDetail(lsxz, lspz, jzzy, jzyf, jznd, orgId, ylorcpl);
 		} catch (Exception e) {
 			logger.error(e.getMessage(), e);
 		}

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

@@ -622,7 +622,7 @@
 	    where data_type=2
 	    and org_id=#{orgId,jdbcType=INTEGER}
 	    and lyxz=#{lyxz,jdbcType=INTEGER}
-	    and jznd=#{jznd,jdbcType=VARCHAR}
+	    and jznd=#{top_jznd,jdbcType=VARCHAR}
 	    and ylorcpl=#{ylorcpl,jdbcType=VARCHAR}
 	) c on c.org_id=a.org_id and c.jznd=a.jznd
 	left join (

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

@@ -113,10 +113,11 @@ public interface StorageFcbgzService {
 	 * @param jzyf 记账月份
 	 * @param jznd 记账年度
 	 * @param orgId 库ID
+	 * @param ylorcpl 原粮或成品粮(0:原粮,1:成品粮)
 	 * @return
 	 * @throws Exception
 	 */
-	List<StorageFcbgz> selectFcbgzDetail(Integer lsxz, Integer lspz, String jzzy, String jzyf, String jznd, String orgId) throws Exception;
+	List<StorageFcbgz> selectFcbgzDetail(Integer lsxz, Integer lspz, String jzzy, String jzyf, String jznd, String orgId, String ylorcpl) throws Exception;
 
 	/**
 	 * 手动生成一个货位的年度结转数据

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

@@ -34,12 +34,13 @@ public class BgzzUtilsServiceImpl {
 		return list;
 	}
 
-	public List<StorageBgzz> getList(Integer orgId, Integer lsxz, String jznd, String dataType, String jzyf) {
+	public List<StorageBgzz> getList(Integer orgId, Integer lsxz, String jznd, String dataType, String jzyf, String ylorcpl) {
 		StorageBgzzExample example = new StorageBgzzExample();
 		StorageBgzzExample.Criteria criteria = example.createCriteria();
 		criteria.andOrgIdEqualTo(orgId);
 		criteria.andDataTypeEqualTo(dataType);
 		criteria.andJzndEqualTo(jznd);
+		criteria.andYlorcplEqualTo(ylorcpl);
 		if (StringUtils.isNotBlank(jzyf)) {
 			criteria.andJzyfEqualTo(jzyf);
 		}

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

@@ -393,8 +393,9 @@ public class StorageBgzzServiceImpl implements StorageBgzzService {
 		if (null != lsxz) {
 			map.put("lyxz", lsxz);
 		}
-		if (StringUtils.isNotBlank(jznd)) {
+		if (StringUtils.isNotBlank(jznd)) {//当前年度
 			map.put("jznd", jznd);
+			map.put("top_jznd", Integer.parseInt(jznd)-1);//上次结转年度
 		}
 		if (StringUtils.isNotBlank(ylorcpl)) {
 			map.put("ylorcpl", ylorcpl);
@@ -420,7 +421,7 @@ public class StorageBgzzServiceImpl implements StorageBgzzService {
 
 		/** 先查上一年的结转数据  start  **/
 		Integer top_year = Integer.parseInt(jznd)-1;
-		List<StorageBgzz> top_year_jz_list = bgzzUtilsServiceImpl.getList(orgId, lsxz, top_year.toString(), StorageFcbgzUtils.DATA_TYPE_2, null);
+		List<StorageBgzz> top_year_jz_list = bgzzUtilsServiceImpl.getList(orgId, lsxz, top_year.toString(), StorageFcbgzUtils.DATA_TYPE_2, null, ylorcpl);
 		StorageBgzz top_year_jz = null;
 		if (null != top_year_jz_list && top_year_jz_list.size() > 0) {
 			top_year_jz = top_year_jz_list.get(0);
@@ -453,13 +454,13 @@ public class StorageBgzzServiceImpl implements StorageBgzzService {
 		for (int i = 0; i < 12; i++) {
 			//从1-12月依次查， 先查每月的明细
 			String jzyf = jznd+"-"+String.format("%02d", i+1).trim();
-			jznd_month_jz_list = bgzzUtilsServiceImpl.getList(orgId, lsxz, jznd, StorageFcbgzUtils.DATA_TYPE_0, jzyf);
+			jznd_month_jz_list = bgzzUtilsServiceImpl.getList(orgId, lsxz, jznd, StorageFcbgzUtils.DATA_TYPE_0, jzyf, ylorcpl);
 			if (null != jznd_month_jz_list && jznd_month_jz_list.size() > 0) {
 				for (StorageBgzz f_day : jznd_month_jz_list) {
 					list.add(f_day);
 				}
 				//查询这个月的合计数据
-				jznd_month_jz_sum_list = bgzzUtilsServiceImpl.getList(orgId, lsxz, jznd, StorageFcbgzUtils.DATA_TYPE_1, jzyf);
+				jznd_month_jz_sum_list = bgzzUtilsServiceImpl.getList(orgId, lsxz, jznd, StorageFcbgzUtils.DATA_TYPE_1, jzyf, ylorcpl);
 				if (null != jznd_month_jz_sum_list && jznd_month_jz_sum_list.size() > 0) {
 					list.add(jznd_month_jz_sum_list.get(0));
 				}
@@ -472,7 +473,7 @@ public class StorageBgzzServiceImpl implements StorageBgzzService {
 
 
 		/** 查[jznd]年的年合计数据  start  **/
-		List<StorageBgzz> jznd_year_jz_sum_list = bgzzUtilsServiceImpl.getList(orgId, lsxz, jznd, StorageFcbgzUtils.DATA_TYPE_2, null); //[jznd]年的合计
+		List<StorageBgzz> jznd_year_jz_sum_list = bgzzUtilsServiceImpl.getList(orgId, lsxz, jznd, StorageFcbgzUtils.DATA_TYPE_2, null, ylorcpl); //[jznd]年的合计
 		if (null != jznd_year_jz_sum_list && jznd_year_jz_sum_list.size() > 0) {
 			year_jz_obj = jznd_year_jz_sum_list.get(0);
 			list.add(year_jz_obj);

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

@@ -865,11 +865,12 @@ public class StorageFcbgzServiceImpl implements StorageFcbgzService {
 	}
 
 	@Override
-	public List<StorageFcbgz> selectFcbgzDetail(Integer lsxz, Integer lspz, String jzzy, String jzyf, String jznd, String orgId) throws Exception {
+	public List<StorageFcbgz> selectFcbgzDetail(Integer lsxz, Integer lspz, String jzzy, String jzyf, String jznd, String orgId, String ylorcpl) throws Exception {
 		StorageFcbgzExample example = new StorageFcbgzExample();
 		StorageFcbgzExample.Criteria criteria = example.createCriteria();
 		criteria.andDataTypeEqualTo(StorageFcbgzUtils.DATA_TYPE_0);//普通账
 		criteria.andDataStatusEqualTo(StorageFcbgzUtils.DATA_STATUS_0);//已记账审核
+		criteria.andYlorcplEqualTo(ylorcpl);
 		if (StringUtils.isNotBlank(orgId)) {
 			criteria.andOrgIdEqualTo(orgId);
 		}