.

src/main/java/com/chinaitop/depot/storage/controller/StorageChangeStoragehouseRopController.java

@@ -122,9 +122,12 @@ public class StorageChangeStoragehouseRopController {
 			@ApiImplicitParam(name = "changehouseNo", value = "倒仓单号", paramType = "query"),
 			@ApiImplicitParam(name = "applyTimeA", value = "申请日期A", paramType = "query"),
 			@ApiImplicitParam(name = "applyTimeB", value = "申请日期B", paramType = "query"),
-			@ApiImplicitParam(name = "orgId", value = "单位ID", paramType = "query") })
+			@ApiImplicitParam(name = "orgId", value = "单位ID", paramType = "query"),
+			@ApiImplicitParam(name = "dcch", value = "导出仓号", paramType = "query"),
+			@ApiImplicitParam(name = "dchwh", value = "导出货位号", paramType = "query")
+	})
 	public PageInfo<StorageChangeStoragehouseRop> getListRop(Integer pageNum, Integer pageSize, String changehouseNo,
-		String applyTimeA, String applyTimeB, Integer orgId) {
+		String applyTimeA, String applyTimeB, Integer orgId, Integer dcch, Integer dchwh) {
 		StorageChangeStoragehouseRopExample StorageChangeStoragehouseRopExample = new StorageChangeStoragehouseRopExample();
 		com.chinaitop.depot.storage.model.StorageChangeStoragehouseRopExample.Criteria Criteria = StorageChangeStoragehouseRopExample.createCriteria();
 		if (pageNum != null && pageSize != null) {
@@ -146,6 +149,12 @@ public class StorageChangeStoragehouseRopController {
 		if (orgId != null && !"".equals(orgId)) {
 			Criteria.andOrgIdEqualTo(orgId);
 		}
+		if (null != dcch) {
+			Criteria.andOutStorehouseEqualTo(dcch);
+		}
+		if (null != dchwh) {
+			Criteria.andOutWarehouseEqualTo(dchwh);
+		}
 		StorageChangeStoragehouseRopExample.setOrderByClause("create_time asc");
 		List<StorageChangeStoragehouseRop> list = storageChangeStoragehouseRopService.selectByExample(StorageChangeStoragehouseRopExample);
 		PageInfo<StorageChangeStoragehouseRop> pageInfo = new PageInfo<StorageChangeStoragehouseRop>(list);

src/main/java/com/chinaitop/depot/storage/mapper/StorageQualitycheckMapper.java

@@ -67,7 +67,7 @@ public interface StorageQualitycheckMapper {
      * @param orgId
      * @return
      */
-	String findConditionCrkYjdUrl(Integer orgId);
+	String findConditionCrkYjdUrl(String orgId);
 
 	/**
 	 * 查询当前仓房的最后一条封仓数据的封仓时间

src/main/java/com/chinaitop/depot/storage/model/StorageChangeStoragehouseRop.java

@@ -390,7 +390,7 @@ public class StorageChangeStoragehouseRop {
     }
 
     /**
-     * 粮食数量(公斤)
+     * 完成粮食数量(公斤)
      * @return food_number 粮食数量(公斤)
      */
     public String getFoodNumber() {
@@ -398,7 +398,7 @@ public class StorageChangeStoragehouseRop {
     }
 
     /**
-     * 粮食数量(公斤)
+     * 完成粮食数量(公斤)
      * @param foodNumber 粮食数量(公斤)
      */
     public void setFoodNumber(String foodNumber) {

src/main/java/com/chinaitop/depot/storage/service/impl/StorageQualitycheckServiceImpl.java

@@ -406,7 +406,7 @@ public class StorageQualitycheckServiceImpl implements StorageQualitycheckServic
 	@Override
 	public void pushQualitycheckLsdj_crk(StorageQualitycheck qualitycheck, String ws_path) throws Exception {
 		if ("0".equals(qualitycheck.getTypeUpdate())) {//只有粮食自检才走这里
-			String crk_yjd_url = qualitycheckMapper.findConditionCrkYjdUrl(qualitycheck.getOrgId());
+			String crk_yjd_url = qualitycheckMapper.findConditionCrkYjdUrl(qualitycheck.getOrgId().toString());
 			if (StringUtils.isNotBlank(crk_yjd_url)) {
 				//拼接完整URL
 				int end = crk_yjd_url.indexOf("/Base");