新增查询封仓后的出库质检接口

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

@@ -638,7 +638,7 @@ public class StorageQualitycheckController {
         	if (pageNum!=null && pageSize!=null) {
         		PageHelper.startPage(pageNum, pageSize);
         	}
-			list = storageQualitycheckService.getList(houseId, wareId, checkType, checkResult, historyStatus, orgId, processState);
+			list = storageQualitycheckService.getList(houseId, wareId, checkType, checkResult, historyStatus, orgId, processState, null, null);
 			pageInfo = new PageInfo<StorageQualitycheck>(list);
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -828,4 +828,23 @@ public class StorageQualitycheckController {
 
         return retMap;
     }
+    
+    @RequestMapping(value="/findConditionCkCheck", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+    @ApiOperation(value="查询一个货位在封仓后的出库检验数据", notes = "")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "houseId", value = "仓房ID", paramType = "query"),
+            @ApiImplicitParam(name = "wareId", value = "货位ID", paramType = "query"),
+            @ApiImplicitParam(name = "checkType", value = "检验类型", paramType = "query")
+    })
+    public Map<String, Object> findConditionCkCheck(Integer houseId, Integer wareId, String checkType){
+
+    	Map<String, Object> retMap = new HashMap<>();
+    	try {
+    		retMap = storageQualitycheckService.findConditionCkCheck(houseId, wareId, checkType);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+
+        return retMap;
+    }
 }

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

@@ -63,9 +63,17 @@ public interface StorageQualitycheckMapper {
     Map<String, Object> getcheckById(Integer id);
 
     /**
-     * 查询出入库应急端的URL地址
+     * 查询出入库应急端的URL全地址
      * @param orgId
      * @return
      */
 	String findConditionCrkYjdUrl(Integer orgId);
+
+	/**
+	 * 查询当前仓房的最后一条封仓数据的封仓时间
+	 * @param houseId 仓房ID
+	 * @param wareId 货位ID
+	 * @return
+	 */
+	String findConditionFcsj(Map<String, Object> paramMap);
 }

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

@@ -2182,7 +2182,21 @@
     and bswd.type = "notice"
   </select>
 
-  <select id="findId" resultType="java.lang.String" parameterType="java.lang.String">
+  <select id="findConditionCrkYjdUrl" resultType="java.lang.String" parameterType="java.lang.String">
      select intranet_url from t_url_config where org_id=#{orgId,jdbcType=VARCHAR} and user_type='2'
   </select>
+  
+  <select id="findConditionFcsj" parameterType="java.util.Map" resultType="java.lang.String">
+      select to_char(datas.accept_date, 'yyyy-MM-dd HH24:mi:ss') fcsj from (
+          select accept_date, Row_Number() OVER (partition by storehouse_id, warehouse_id order by accept_date desc) rank from storage_grain_card 
+          where sfmc='1'
+          <if test="houseId != null">
+          and storehouse_id=#{houseId,jdbcType=VARCHAR}
+          </if>
+          <if test="warehouseId != null">
+          and warehouse_id=#{warehouseId,jdbcType=VARCHAR}
+          </if>
+      ) as datas 
+      where 1=1 and datas.rank=1
+  </select>
 </mapper>

src/main/java/com/chinaitop/depot/storage/service/StorageQualitycheckService.java

@@ -153,11 +153,14 @@ public interface StorageQualitycheckService {
 	 * @param historyStatus 数据状态(0:新数据,1:已归档数据)
 	 * @param orgId 组织机构ID
 	 * @param processState 1扦样化验待处理 2化验已处理
+	 * @param isdx 0:大于,1小于
+	 * @param isdx 0:大于,1小于
+	 * @param checkTime 检验时间
 	 * @return
 	 * @throws Exception
 	 */
 	List<StorageQualitycheck> getList(Integer houseId, Integer wareId, String checkType, String checkResult,
-			Integer historyStatus, Integer orgId, Integer processState) throws Exception;
+			Integer historyStatus, Integer orgId, Integer processState, String isdx, String checkTime) throws Exception;
 
 	/**
 	 * 按条件查询质检数据详情
@@ -172,4 +175,13 @@ public interface StorageQualitycheckService {
 	 */
 	Map<String, Object> queryCheckDataDetail(Integer houseId, Integer wareId, String checkType, 
 			Integer historyStatus, Integer orgId, Integer processState) throws Exception;
+
+	/**
+	 * 查询一个货位在封仓后的出库检验数据
+	 * @param houseId
+	 * @param wareId
+	 * @return
+	 * @throws Exception
+	 */
+	Map<String, Object> findConditionCkCheck(Integer houseId, Integer wareId, String checkType) throws Exception;
 }

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

@@ -405,7 +405,7 @@ public class StorageQualitycheckServiceImpl implements StorageQualitycheckServic
 
 	@Override
 	public void pushQualitycheckLsdj_crk(StorageQualitycheck qualitycheck, String ws_path) throws Exception {
-		if ("0".equals(qualitycheck.getTypeUpdate())) {
+		if ("0".equals(qualitycheck.getTypeUpdate())) {//只有粮食自检才走这里
 			String crk_yjd_url = qualitycheckMapper.findConditionCrkYjdUrl(qualitycheck.getOrgId());
 			if (StringUtils.isNotBlank(crk_yjd_url)) {
 				//拼接完整URL
@@ -429,11 +429,11 @@ public class StorageQualitycheckServiceImpl implements StorageQualitycheckServic
 
 	@Override
 	public List<StorageQualitycheck> getList(Integer houseId, Integer wareId, String checkType, String checkResult,
-			Integer historyStatus, Integer orgId, Integer processState) throws Exception {
+			Integer historyStatus, Integer orgId, Integer processState, String isdx, String checkTime) throws Exception {
 		StorageQualitycheckExample example = new StorageQualitycheckExample();
     	Criteria criteria = example.createCriteria();
 
-    	//0:初检 1：验收 2：质量普查 3：出库,5:第三方检验
+    	//0:初检 1：验收 2：质量普查 3：出库, 4:春秋普查,5:第三方检验
         if (StringUtils.isNotBlank(checkType)){
         	criteria.andTypeUpdateEqualTo(checkType);
         }
@@ -463,9 +463,22 @@ public class StorageQualitycheckServiceImpl implements StorageQualitycheckServic
         if (null != historyStatus) {
         	criteria.andHistoryStatusEqualTo(historyStatus);
         }
+        
+        //按照isdx查询检验时间范围
+        if (StringUtils.isNotBlank(isdx)) {
+        	if ("0".equals(isdx) && StringUtils.isNotBlank(checkTime)) {
+        		criteria.andCheckTimeGreaterThan(ParameterUtil.string2datetime(checkTime));
+        	}
+        	if ("1".equals(isdx) && StringUtils.isNotBlank(checkTime)) {
+        		criteria.andCheckTimeLessThan(ParameterUtil.string2datetime(checkTime));
+        	}
+        }
+
         //查询从质量管理功能里面添加到数据库的数据
         criteria.andFlagTypeIsNull();
 
+        example.setOrderByClause(" check_time desc");
+
         List<StorageQualitycheck> list = qualitycheckMapper.selectByExample(example);
 
 		return list;
@@ -474,7 +487,7 @@ public class StorageQualitycheckServiceImpl implements StorageQualitycheckServic
 	@Override
 	public Map<String, Object> queryCheckDataDetail(Integer houseId, Integer wareId, String checkType,
 			Integer historyStatus, Integer orgId, Integer processState) throws Exception {
-		List<StorageQualitycheck> list = getList(houseId, wareId, checkType, null, historyStatus, orgId, processState);
+		List<StorageQualitycheck> list = getList(houseId, wareId, checkType, null, historyStatus, orgId, processState, null , null);
 		Map<String, Object> retMap = null;
 		if (null != list && list.size() > 0) {
 			Integer id = list.get(0).getId();
@@ -482,4 +495,35 @@ public class StorageQualitycheckServiceImpl implements StorageQualitycheckServic
 		}
 		return retMap;
 	}
+
+	@Override
+	public Map<String, Object> findConditionCkCheck(Integer houseId, Integer wareId, String checkType) throws Exception {
+
+		//查询最近的封仓时间
+		Map<String, Object> paramMap = new HashMap<>();
+		if (null != houseId) {
+			paramMap.put("houseId", houseId);
+		}
+		if (null != wareId) {
+			paramMap.put("warehouseId", wareId);
+		}
+		String fcsj = qualitycheckMapper.findConditionFcsj(paramMap);
+
+		Map<String, Object> resultMap = new HashMap<>();
+		if (StringUtils.isNotBlank(fcsj)) {
+			List<StorageQualitycheck> list = getList(houseId, wareId, checkType, null, null, null, 2, "0" , fcsj);
+			if (null != list && list.size() > 0) {
+				resultMap.put("status", "200");
+				resultMap.put("msg", list);
+			} else {
+				resultMap.put("status", "500");
+				resultMap.put("msg", "未查到封仓之后的出库质检数据");
+			}
+		} else {
+			resultMap.put("status", "500");
+			resultMap.put("msg", "连封仓数据都没查到");
+		}
+
+		return resultMap;
+	}
 }