1

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

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

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

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

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

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