1

src/main/java/com/chinaitop/depot/basic/controller/BasicWarehouseController.java

@@ -451,4 +451,20 @@ public class BasicWarehouseController {
 		return map;
 	}
 
+	@RequestMapping(value="/getCrkStatusList", method=RequestMethod.GET)
+	@ApiOperation(value="按条件查询某种货位状态的数据", notes = "")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "lylx", value = "粮油类型(0:原粮,1:成品粮)", required=true, paramType = "query"),
+		@ApiImplicitParam(name = "crkStatus", value = "货位状态值1空仓,2入库中,3封仓,4出库中", required=true, paramType = "query"),
+		@ApiImplicitParam(name = "orgId", value = "库ID", required=true, paramType = "query")
+	})
+	public List<BasicWarehouse> getCrkStatusList(String lylx, String crkStatus, Integer orgId) {
+		List<BasicWarehouse> list = null;
+		try {
+			list = basicWarehouseService.getCrkStatusList(lylx, crkStatus, orgId);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return list;
+	}
 }

src/main/java/com/chinaitop/depot/basic/mapper/BasicWarehouseMapper.java

@@ -76,4 +76,11 @@ public interface BasicWarehouseMapper {
 	 * @return
 	 */
 	List<Map<String, Object>> selectWareAndTank(Map<String, Object> param);
+
+	/**
+	 * 按条件查询某种货位状态的数据
+	 * @param ware
+	 * @return
+	 */
+	List<BasicWarehouse> getCrkStatusList(BasicWarehouse ware);
 }

src/main/java/com/chinaitop/depot/basic/mapper/BasicWarehouseMapper.xml

@@ -726,4 +726,26 @@
       and #{zhywsj} > check_time
     </if>
   </update>
+  <select id="getCrkStatusList" parameterType="com.chinaitop.depot.basic.model.BasicWarehouseExample" resultMap="BaseResultMap">
+    select 
+		b.storehouse_name depot_name,
+		a.warehouse_name,
+		a.crk_status
+	from basic_warehouse a 
+	left join basic_storehouse b on b.storehouse_id=a.storehouse_id
+	where 1=1 and a.del_flag=1
+	and a.org_id=#{orgId,jdbcType=INTEGER}
+	and a.lylx=#{lylx,jdbcType=VARCHAR}
+	and a.crk_status=#{crkStatus,jdbcType=VARCHAR}
+	union all 
+	select 
+		a.storagetank_Name depot_name,
+		a.storagetank_Name warehouse_name,
+		a.crk_status
+	from basic_tank a 
+	where 1=1 and a.del_flag=1
+	and a.org_id=#{orgId,jdbcType=INTEGER}
+	and a.lylx=#{lylx,jdbcType=VARCHAR}
+	and a.crk_status=#{crkStatus,jdbcType=VARCHAR}
+  </select>
 </mapper>

src/main/java/com/chinaitop/depot/basic/service/BasicWarehouseService.java

@@ -105,4 +105,13 @@ public interface BasicWarehouseService {
 	 * @return
 	 */
 	Map<String, Object> getWareOrTank(String sptDataId) throws Exception;
+
+	/**
+	 * 按条件查询某种货位状态的数据
+	 * @param lylx 粮油类型(0:原粮,1:成品粮)
+	 * @param crkStatus 货位状态值1空仓,2入库中,3封仓,4出库中
+	 * @param orgId 库ID
+	 * @return
+	 */
+	List<BasicWarehouse> getCrkStatusList(String lylx, String crkStatus, Integer orgId);
 }

src/main/java/com/chinaitop/depot/basic/service/impl/BasicWarehouseServiceImpl.java

@@ -368,4 +368,14 @@ public class BasicWarehouseServiceImpl implements BasicWarehouseService {
 		return map;
 	}
 
+	@Override
+	public List<BasicWarehouse> getCrkStatusList(String lylx, String crkStatus, Integer orgId) {
+		BasicWarehouse ware = new BasicWarehouse();
+		ware.setLylx(lylx);
+		ware.setCrkStatus(crkStatus);
+		ware.setOrgId(orgId);
+		List<BasicWarehouse> list = warehouseMapper.getCrkStatusList(ware);
+		return list;
+	}
+
 }