1

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

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

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

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

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

@@ -865,7 +865,7 @@ public class StorageFcbgzServiceImpl implements StorageFcbgzService {
 	}
 
 	@Override
-	public List<StorageFcbgz> selectFcbgzDetail(Integer lsxz, Integer lspz, String jzzy, String jzyf, String jznd, String orgId, String ylorcpl) throws Exception {
+	public List<StorageFcbgz> selectFcbgzDetail(Integer lsxz, Integer lspz, String jzzy, String jzyf, String jznd, String orgId, String ylorcpl, String ywlx) throws Exception {
 		StorageFcbgzExample example = new StorageFcbgzExample();
 		StorageFcbgzExample.Criteria criteria = example.createCriteria();
 		criteria.andDataTypeEqualTo(StorageFcbgzUtils.DATA_TYPE_0);//普通账
@@ -889,6 +889,17 @@ public class StorageFcbgzServiceImpl implements StorageFcbgzService {
 		if (StringUtils.isNotBlank(jznd)) {
 			criteria.andJzndEqualTo(jznd);
 		}
+		if ("1".equals(ylorcpl) && "0".equals(ywlx)) {
+			if ("0".equals(ywlx)) {
+				criteria.andJzzyEqualTo("入库");
+			}
+			if ("1".equals(ywlx)) {
+				criteria.andJzzyEqualTo("出库");
+			}
+		}
+		if ("0".equals(ylorcpl)) {
+			
+		}
 		example.setOrderByClause("last_business_date");
 		List<StorageFcbgz> list = storageFcbgzMapper.selectByExample(example);
 		return list;