1.配置文件

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsAreaController.java

@@ -260,7 +260,7 @@ public class BasicdataGoodsAreaController extends BladeController {
 	public void visualizationwarehouse(@ApiIgnore @RequestParam Map<String, Object> visualization, HttpServletResponse response) {
 		Long areaId = Long.valueOf((String) visualization.get("areaId"));
 		log.info("areaId>>>>>>>>>>>>>{}",areaId);
-		basicdataGoodsAreaService.visualizationwarehouse(areaId,response);
+		basicdataGoodsAreaService.visualizationwarehouse(1,areaId,response);
 		//ExcelUtil.exports(response, "货区数据" + DateUtil.time(), "货区数据表", list, BasicdataGoodsAreaexportExcel.class);
 	}
 

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdatavisualizationSheetOne.java

@@ -9,7 +9,7 @@ import lombok.Data;
 import java.io.Serializable;
 
 /**
- * 车辆照片信息表 Excel实体类
+ * 货区导出 Excel实体类
  *
  * @author lmy
  * @since 2023-09-11

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdatavisualizationSheetThree.java

@@ -9,7 +9,7 @@ import lombok.Data;
 import java.io.Serializable;
 
 /**
- * 车辆照片信息表 Excel实体类
+ * 货区导出 Excel实体类
  *
  * @author lmy
  * @since 2023-09-11

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdatavisualizationSheetTwo.java

@@ -9,7 +9,7 @@ import lombok.Data;
 import java.io.Serializable;
 
 /**
- * 车辆照片信息表 Excel实体类
+ * 货区导出 Excel实体类
  *
  * @author lmy
  * @since 2023-09-11

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdatavisualizationZreoSheetOne.java

@@ -0,0 +1,69 @@
+package com.logpm.basicdata.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 货区零担导出 Excel实体类
+ *
+ * @author lmy
+ * @since 2023-09-11
+ */
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class BasicdatavisualizationZreoSheetOne implements Serializable {
+
+	/**
+	 * 运单号
+	 */
+	@ColumnWidth(40)
+	@ExcelProperty("运单号")
+	private String waybillNumber;
+	/**
+	 * 货物名称
+	 */
+	@ColumnWidth(40)
+	@ExcelProperty("货物名称")
+	private String goodsName;
+	/**
+	 * 托盘码
+	 */
+	@ColumnWidth(40)
+	@ExcelProperty("托盘码")
+	private String trayCode;
+
+	/**
+	 * 库位号
+	 */
+	@ColumnWidth(30)
+	@ExcelProperty("库位号")
+	private String positionInfo;
+
+	/**
+	 * 数量
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("数量")
+	private String num;
+
+	/**
+	 * 上架时间
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("上架时间")
+	private String upTime;
+
+	/**
+	 * 上架人
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("上架人")
+	private String upUser;
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdatavisualizationZreoSheetTwo.java

@@ -0,0 +1,71 @@
+package com.logpm.basicdata.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 货区零担导出 Excel实体类
+ *
+ * @author lmy
+ * @since 2023-09-11
+ */
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class BasicdatavisualizationZreoSheetTwo implements Serializable {
+
+	/**
+	 * 库位号
+	 */
+	@ColumnWidth(40)
+	@ExcelProperty("库位号")
+	private String positionInfo;
+
+	/**
+	 * 一级品类
+	 */
+	@ColumnWidth(40)
+	@ExcelProperty("一级品类")
+	private String firsts;
+
+	/**
+	 * 二级品类
+	 */
+	@ColumnWidth(40)
+	@ExcelProperty("二级品类")
+	private String second;
+
+	/**
+	 * 三级品类
+	 */
+	@ColumnWidth(30)
+	@ExcelProperty("三级品类")
+	private String thirdProduct;
+
+	/**
+	 * 订单自编号
+	 */
+	@ColumnWidth(30)
+	@ExcelProperty("订单自编号")
+	private String orderCode;
+
+	/**
+	 * 物料名称
+	 */
+	@ColumnWidth(30)
+	@ExcelProperty("物料名称")
+	private String materialName;
+
+	/**
+	 * 数量
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("数量")
+	private String num;
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataGoodsAreaService.java

@@ -117,7 +117,7 @@ public interface IBasicdataGoodsAreaService extends BaseService<BasicdataGoodsAr
 	 *
 	 * @return
 	 */
-	void visualizationwarehouse(Long areaId, HttpServletResponse response);
+	void visualizationwarehouse(Integer type,Long areaId, HttpServletResponse response);
 
 	/**
 	 * 查询当前操作人仓库下的备货区信息

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAreaServiceImpl.java

@@ -321,9 +321,10 @@ public class BasicdataGoodsAreaServiceImpl extends BaseServiceImpl<BasicdataGood
 	}
 
 	@Override
-	public void visualizationwarehouse(Long areaId, HttpServletResponse response) {
+	public void visualizationwarehouse(Integer type,Long areaId, HttpServletResponse response) {
 		//设置数据库格式
 		baseMapper.sqlMode();
+		if (type ==1){
 		//sheetOne
 		List<BasicdatavisualizationSheetOne> basicdatavisualizationSheetOnes = baseMapper.exportWarehouseByorderId(areaId);
 		//sheetTwo
@@ -365,9 +366,13 @@ public class BasicdataGoodsAreaServiceImpl extends BaseServiceImpl<BasicdataGood
 			}
 			// 关流
 			excelWriter.finish();
+
 		} catch (IOException var6) {
 			log.error("导出错误>>>>>>{}",var6);
 			return;
+		}
+		}else {
+
 		}
 		//return warehouseGoodsAreaList;
 	}

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/config/RedissonConfig.java

@@ -0,0 +1,35 @@
+package com.logpm.warehouse.config;
+
+import org.redisson.Redisson;
+import org.redisson.config.Config;
+import org.springblade.core.redis.cache.BladeRedis;
+import org.springblade.core.tool.utils.SpringUtil;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
+
+@Configuration
+public class RedissonConfig {
+
+	@Bean
+	public Redisson redisson() {
+		// 单机模式
+		Config config = new Config();
+
+		BladeRedis bean = SpringUtil.getBean(BladeRedis.class);
+
+		RedisConnectionFactory connectionFactory = bean.getRedisTemplate().getConnectionFactory();
+
+		LettuceConnectionFactory factory = (LettuceConnectionFactory) connectionFactory;
+
+		String hostName = factory.getHostName();
+		int port = factory.getPort();
+		String password = factory.getPassword();
+
+		config.useSingleServer().setAddress("redis://"+hostName+":"+port).setDatabase(2);
+		config.useSingleServer().setPassword(password);
+		return (Redisson) Redisson.create(config);
+	}
+
+}