1

src/main/java/com/chinaitop/depot/device/controller/StorageJsglController.java

@@ -40,16 +40,17 @@ public class StorageJsglController {
         @ApiImplicitParam(name = "jslx", value = "结算类型(0:入库,1:出库)", paramType = "query"),
         @ApiImplicitParam(name = "houseId", value = "仓房", paramType = "query"),
         @ApiImplicitParam(name = "warehouseId", value = "货位", paramType = "query"),
-        @ApiImplicitParam(name = "ywlx", value = "业务类型(0:散粮,1:非散粮)", paramType = "query")
+        @ApiImplicitParam(name = "ywlx", value = "业务类型(0:散粮,1:非散粮)", paramType = "query"),
+        @ApiImplicitParam(name = "htbh", value = "合同/通知单编号", paramType = "query")
     })
     public PageInfo<StorageJsgl> getPageInfoList(Integer pageNum, Integer pageSize, String jslx, 
-    		Integer houseId, Integer warehouseId, Integer orgId, String ywlx) {
+    		Integer houseId, Integer warehouseId, Integer orgId, String ywlx, String htbh) {
 
         if (pageNum != null && pageSize != null) PageHelper.startPage(pageNum, pageSize);
 
         List<StorageJsgl> list = null;
 		try {
-			list = storageJsglService.findByCondition(houseId, warehouseId, orgId, jslx, ywlx);
+			list = storageJsglService.findByCondition(houseId, warehouseId, orgId, jslx, ywlx, htbh);
 		} catch (Exception e) {
 			e.printStackTrace();
 		}

src/main/java/com/chinaitop/depot/device/service/StorageJsglService.java

@@ -13,10 +13,11 @@ public interface StorageJsglService {
 	 * @param orgId 组织机构
 	 * @param jslx 结算类型
 	 * @param ywlx 业务类型(0:散粮,1:非散粮)
+	 * @param htbh 合同编号
 	 * @return
 	 * @throws Exception
 	 */
-	List<StorageJsgl> findByCondition(Integer houseId, Integer warehouseId, Integer orgId, String jslx, String ywlx) throws Exception;
+	List<StorageJsgl> findByCondition(Integer houseId, Integer warehouseId, Integer orgId, String jslx, String ywlx, String htbh) throws Exception;
 
 	/**
 	 * 按主键查询

src/main/java/com/chinaitop/depot/device/service/impl/StorageJsglServiceImpl.java

@@ -26,7 +26,7 @@ public class StorageJsglServiceImpl implements StorageJsglService {
 	private DepotBusinessFeignService depotBusinessFeignService;
 
 	@Override
-	public List<StorageJsgl> findByCondition(Integer houseId, Integer warehouseId, Integer orgId, String jslx, String ywlx) throws Exception {
+	public List<StorageJsgl> findByCondition(Integer houseId, Integer warehouseId, Integer orgId, String jslx, String ywlx, String htbh) throws Exception {
 		StorageJsglExample example = new StorageJsglExample();
 		Criteria criteria = example.createCriteria();
 		if (null != houseId) {
@@ -44,6 +44,9 @@ public class StorageJsglServiceImpl implements StorageJsglService {
 		if (StringUtils.isNotBlank(ywlx)) {
 			criteria.andYwlxEqualTo(ywlx);
 		}
+		if (StringUtils.isNotBlank(htbh)) {
+			criteria.andHtbhEqualTo(htbh);
+		}
 		example.setOrderByClause("bcjssj desc");
 		List<StorageJsgl> list = storageJsglMapper.selectByExample(example);
 		return list;