1.批量导出货区

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

@@ -22,6 +22,7 @@ import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
 import com.logpm.basicdata.excel.BasicdataGoodsAllocationExcel;
 import com.logpm.basicdata.excel.BasicdataGoodsAreaExcel;
 import com.logpm.basicdata.excel.BasicdataGoodsAreaImporter;
+import com.logpm.basicdata.excel.BasicdataGoodsAreaexportExcel;
 import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
 import com.logpm.basicdata.service.IBasicdataGoodsAreaService;
 import com.logpm.basicdata.service.IBasicdataWarehouseService;
@@ -216,10 +217,10 @@ public class BasicdataGoodsAreaController extends BladeController {
 	@ApiOperationSupport(order = 9)
 	@ApiOperation(value = "导出数据", notes = "传入warehouseGoodsArea")
 	public void exportWarehouseGoodsArea(@ApiIgnore @RequestParam Map<String, Object> basicdataGoodsArea, HttpServletResponse response) {
-		Long id =Long.valueOf((String)basicdataGoodsArea.get("id"));
+		List<Long> ids = Func.toLongList((String)basicdataGoodsArea.get("ids"));
-		log.info("basicdataGoodsArea>>>>>>>>>>>>>{}",id);
+		log.info("basicdataGoodsArea>>>>>>>>>>>>>{}",ids);
-		List<BasicdataGoodsAreaExcel> list = basicdataGoodsAreaService.exportWarehouseGoodsArea(id);
+		List<BasicdataGoodsAreaexportExcel> list = basicdataGoodsAreaService.exportWarehouseGoodsArea(ids);
-		ExcelUtil.export(response, "货区数据" + DateUtil.time(), "货区数据表", list, BasicdataGoodsAreaExcel.class);
+		ExcelUtil.export(response, "货区数据" + DateUtil.time(), "货区数据表", list, BasicdataGoodsAreaexportExcel.class);
 	}
 
 

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

@@ -0,0 +1,43 @@
+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;
+
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class BasicdataGoodsAreaexportExcel implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+
+	/**
+	 * 货区名称
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("货区名称")
+	private String areaName;
+	/**
+	 * 货架名称
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("货架名称")
+	private String shelfName;
+	/**
+	 * 货位
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("货位")
+	private String allocationName;
+	/**
+	 * 数量
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("数量")
+	private String allocationNub;
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.java

@@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.logpm.basicdata.entity.BasicdataGoodsAreaEntity;
 import com.logpm.basicdata.excel.BasicdataGoodsAreaExcel;
+import com.logpm.basicdata.excel.BasicdataGoodsAreaexportExcel;
 import com.logpm.basicdata.vo.BasicdataGoodsAreaVO;
 import com.logpm.basicdata.vo.BasicdataNodeVO;
 import com.logpm.basicdata.vo.BasicdataWarehouseVO;
@@ -52,7 +53,7 @@ public interface BasicdataGoodsAreaMapper extends BaseMapper<BasicdataGoodsAreaE
 	 * @param id
 	 * @return
 	 */
-	List<BasicdataGoodsAreaExcel> exportWarehouseGoodsArea(@Param("id") Long id);
+	List<BasicdataGoodsAreaexportExcel> exportWarehouseGoodsArea(@Param("ids") List<Long> id);
 
 	IPage<BasicdataGoodsAreaVO> getBasicdataGoodsAreaList(IPage<Object> page,@Param("po") Map<String, Object> basicdataGoodsArea);
 

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.xml

@@ -133,7 +133,7 @@
             </if>
         </where>
     </select>
-    <select id="exportWarehouseGoodsArea" resultType="com.logpm.basicdata.excel.BasicdataGoodsAreaExcel">
+    <select id="exportWarehouseGoodsArea" resultType="com.logpm.basicdata.excel.BasicdataGoodsAreaexportExcel">
         SELECT
             lwga2.headline areaName,
             lwgs.goods_shelf_name shelfName,
@@ -145,7 +145,13 @@
                 JOIN logpm_warehouse_goods_area lwga2 on lwga2.id = lwga.goods_area_id
                 LEFT JOIN logpm_warehouse_updown_goods lwug  on lwug.allocation_id =  lwga.id
         <where>
-            lwga.is_deleted =0 and lwga2.id = #{id}
+            lwga.is_deleted =0
+            <if test="ids != null and @org.apache.commons.collections4.CollectionUtils@isNotEmpty(ids)">
+                and lwga2.id in
+                <foreach collection="ids" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
         </where>
         GROUP BY lwga.id
     </select>

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

@@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.logpm.basicdata.entity.BasicdataGoodsAreaEntity;
 import com.logpm.basicdata.excel.BasicdataGoodsAreaExcel;
+import com.logpm.basicdata.excel.BasicdataGoodsAreaexportExcel;
 import com.logpm.basicdata.vo.BasicdataGoodsAreaVO;
 import com.logpm.basicdata.vo.BasicdataNodeVO;
 import com.logpm.basicdata.vo.BasicdataWarehouseVO;
@@ -51,10 +52,10 @@ public interface IBasicdataGoodsAreaService extends BaseService<BasicdataGoodsAr
 	/**
 	 * 导出数据
 	 *
-	 * @param Id
+	 * @param ids
 	 * @return
 	 */
-	List<BasicdataGoodsAreaExcel> exportWarehouseGoodsArea(Long Id);
+	List<BasicdataGoodsAreaexportExcel> exportWarehouseGoodsArea(List<Long> ids);
 
 	/**
 	 *

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

@@ -28,6 +28,7 @@ import com.logpm.basicdata.entity.BasicdataGoodsAreaEntity;
 import com.logpm.basicdata.entity.BasicdataGoodsShelfEntity;
 import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
 import com.logpm.basicdata.excel.BasicdataGoodsAreaExcel;
+import com.logpm.basicdata.excel.BasicdataGoodsAreaexportExcel;
 import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
 import com.logpm.basicdata.mapper.BasicdataGoodsAllocationMapper;
 import com.logpm.basicdata.mapper.BasicdataGoodsAreaMapper;
@@ -94,8 +95,9 @@ public class BasicdataGoodsAreaServiceImpl extends BaseServiceImpl<BasicdataGood
 
 
 	@Override
-	public List<BasicdataGoodsAreaExcel> exportWarehouseGoodsArea(Long id) {
+	public List<BasicdataGoodsAreaexportExcel> exportWarehouseGoodsArea(List<Long> ids) {
-		List<BasicdataGoodsAreaExcel> warehouseGoodsAreaList = baseMapper.exportWarehouseGoodsArea(id);
+		List<BasicdataGoodsAreaexportExcel> warehouseGoodsAreaList = baseMapper.exportWarehouseGoodsArea(ids);
+		log.info("warehouseGoodsAreaList>>>>>>>>>>>{}",warehouseGoodsAreaList);
 		//warehouseGoodsAreaList.forEach(warehouseGoodsArea -> {
 		//	warehouseGoodsArea.setTypeName(DictCache.getValue(DictEnum.YES_NO, WarehouseGoodsArea.getType()));
 		//});