1.修改导出

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

@@ -259,8 +259,8 @@ public class BasicdataGoodsAreaController extends BladeController {
 	@ApiOperation(value = "导出数据", notes = "传入warehouseGoodsArea")
 	public void visualizationwarehouse(@ApiIgnore @RequestParam Map<String, Object> visualization, HttpServletResponse response) {
 		Long areaId = Long.valueOf((String) visualization.get("areaId"));
-		log.info("areaId>>>>>>>>>>>>>{}",areaId);
+		Integer type = Integer.valueOf((String) visualization.get("type"));
-		basicdataGoodsAreaService.visualizationwarehouse(1,areaId,response);
+		basicdataGoodsAreaService.visualizationwarehouse(type,areaId,response);
 		//ExcelUtil.exports(response, "货区数据" + DateUtil.time(), "货区数据表", list, BasicdataGoodsAreaexportExcel.class);
 	}
 

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

@@ -20,51 +20,34 @@ import java.io.Serializable;
 @ContentRowHeight(18)
 public class BasicdatavisualizationKCSheetThree implements Serializable {
 	/**
-	 * 订单自编号
+	 * 客户名称
 	 */
 	@ColumnWidth(30)
-	@ExcelProperty("订单自编号")
+	@ExcelProperty("客户名称")
-	private String orderCode;
+	private String marketName;
 	/**
-	 * 包条码
+	 * 服务号
 	 */
 	@ColumnWidth(40)
-	@ExcelProperty("包条码")
+	@ExcelProperty("服务号")
-	private String orderPackageCode;
+	private String serviceNumber;
+
 
 	/**
-	 * 商场名称
+	 * 货物名称
 	 */
 	@ColumnWidth(40)
-	@ExcelProperty("商场名称")
+	@ExcelProperty("货物名称")
-	private String mallName;
+	private String descriptionGoods;
-	/**
-	 * 客户名称
-	 */
-	@ColumnWidth(40)
-	@ExcelProperty("客户名称")
-	private String customerName;
 
 	/**
-	 * 物料编码
+	 * 货物编码
 	 */
 	@ColumnWidth(30)
-	@ExcelProperty("物料编码")
+	@ExcelProperty("货物编码")
-	private String materialCode;
+	private String cargoNumber;
 
-	/**
-	 * 物料名称
-	 */
-	@ColumnWidth(30)
-	@ExcelProperty("物料名称")
-	private String materialName;
 
-	/**
-	 * 托盘码
-	 */
-	@ColumnWidth(30)
-	@ExcelProperty("托盘码")
-	private String trayCode;
 
 	/**
 	 * 库位号
@@ -74,62 +57,12 @@ public class BasicdatavisualizationKCSheetThree implements Serializable {
 	private String positionInfo;
 
 
-	/**
-	 * 一级品类
-	 */
-	@ColumnWidth(40)
-	@ExcelProperty("一级品类")
-	private String firsts;
-
-	/**
-	 * 一级品类编码
-	 */
-	@ColumnWidth(40)
-	@ExcelProperty("一级品类编码")
-	private String firstsCode;
-
-
-	/**
-	 * 二级品类
-	 */
-	@ColumnWidth(40)
-	@ExcelProperty("二级品类")
-	private String second;
-
-	/**
-	 * 二级品类编码
-	 */
-	@ColumnWidth(40)
-	@ExcelProperty("二级品类编码")
-	private String secondCode;
-
-
-	/**
-	 * 三级品类
-	 */
-	@ColumnWidth(30)
-	@ExcelProperty("三级品类")
-	private String thirdProduct;
-
-	/**
-	 * 三级品类编码
-	 */
-	@ColumnWidth(30)
-	@ExcelProperty("三级品类编码")
-	private String thirdCode;
-
-	/**
-	 * 上架时间
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("上架时间")
-	private String createTime;
 
 	/**
-	 * 上架人
+	 * 数量
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("上架人")
+	@ExcelProperty("数量")
-	private String createUser;
+	private String num;
 
 }

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

@@ -28,32 +28,11 @@ public class BasicdatavisualizationZreoSheetTwo implements Serializable {
 	private String positionInfo;
 
 	/**
-	 * 一级品类
+	 * 运单号
-	 */
-	@ColumnWidth(40)
-	@ExcelProperty("一级品类")
-	private String firsts;
-
-	/**
-	 * 二级品类
-	 */
-	@ColumnWidth(40)
-	@ExcelProperty("二级品类")
-	private String second;
-
-	/**
-	 * 三级品类
-	 */
-	@ColumnWidth(30)
-	@ExcelProperty("三级品类")
-	private String thirdProduct;
-
-	/**
-	 * 订单自编号
 	 */
 	@ColumnWidth(30)
-	@ExcelProperty("订单自编号")
+	@ExcelProperty("运单号")
-	private String orderCode;
+	private String waybillNumber;
 
 	/**
 	 * 物料名称

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

@@ -98,4 +98,6 @@ public interface BasicdataGoodsAreaMapper extends BaseMapper<BasicdataGoodsAreaE
 	List<BasicdatavisualizationKCSheetThree> exportWarehouseByCKService(@Param("areaId") Long areaId);
 
 	List<BasicdatavisualizationZreoSheetOne> exportWarehouseByWaybillNumber(@Param("areaId") Long areaId);
+
+	List<BasicdatavisualizationZreoSheetTwo> exportWarehouseZreoByallocation(@Param("areaId") Long areaId);
 }

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

@@ -319,7 +319,7 @@
                 AND ldsl.incoming_batch = lwug.incoming_batch
                 AND ldsl.market_id = lwug.market_id
         <where>
-            ldpl.warehouse_id =#{areaId}
+            ldsl.warehouse_id =#{areaId}
         </where>
         GROUP BY
             lwug.position_code
@@ -378,4 +378,19 @@
              ) AS subquery
         GROUP BY waybillNumber
     </select>
+    <select id="exportWarehouseZreoByallocation" resultType="com.logpm.basicdata.excel.BasicdatavisualizationZreoSheetTwo">
+        SELECT
+            lwug.position_code AS positionInfo,
+            SUM(lwug.num) AS num,
+            GROUP_CONCAT(ldsa.waybill_number SEPARATOR '、') AS waybillNumber,
+            GROUP_CONCAT(ldsa.description_goods SEPARATOR '、') AS descriptionGoods
+        FROM
+            logpm_distribution_stock_article ldsa
+                JOIN logpm_warehouse_updown_goods lwug ON ldsa.id = lwug.association_id and ldsa.is_zero = '1'
+        <where>
+            ldsa.warehouse_id =#{areaId}
+        </where>
+        GROUP BY
+            lwug.position_code
+    </select>
 </mapper>

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

@@ -443,14 +443,8 @@ public class BasicdataGoodsAreaServiceImpl extends BaseServiceImpl<BasicdataGood
 				}
 			});
 //			//sheetTwo
-//			List<BasicdatavisualizationSheetTwo> basicdatavisualizationSheetTwos = baseMapper.exportWarehouseByallocation(areaId);
+			List<BasicdatavisualizationZreoSheetTwo> basicdatavisualizationSheetTwos = baseMapper.exportWarehouseZreoByallocation(areaId);
-//			basicdatavisualizationSheetTwos.forEach(e->{
+
-//				if (StringUtils.isNotBlank(e.getFirsts())){e.setFirsts(this.countUniqueProperties(e.getFirsts())); }
-//				if (StringUtils.isNotBlank(e.getSecond())){e.setSecond(this.countUniqueProperties(e.getSecond()));}
-//				if (StringUtils.isNotBlank(e.getThirdProduct())){e.setThirdProduct(this.countUniqueProperties(e.getThirdProduct()));}
-//				if (StringUtils.isNotBlank(e.getOrderCode())){e.setOrderCode(this.countUniqueProperties(e.getOrderCode()));}
-//				if (StringUtils.isNotBlank(e.getMaterialName())){e.setMaterialName(this.countUniqueProperties(e.getMaterialName()));}
-//			});
 
 			try {
 				String fileName =	"仓库数据" + DateUtil.time();
@@ -460,8 +454,8 @@ public class BasicdataGoodsAreaServiceImpl extends BaseServiceImpl<BasicdataGood
 				response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
 				// 构造各个sheet页相关信息
 				List<GoodsAreaSheetInfoBean> goodsAreaSheetInfoBeans = new LinkedList<>();
-				goodsAreaSheetInfoBeans.add(new GoodsAreaSheetInfoBean("订单自编号维度",BasicdatavisualizationZreoSheetOne.class,basicdatavisualizationZreoSheetOnes));
+				goodsAreaSheetInfoBeans.add(new GoodsAreaSheetInfoBean("零担维度",BasicdatavisualizationZreoSheetOne.class,basicdatavisualizationZreoSheetOnes));
-//				goodsAreaSheetInfoBeans.add(new GoodsAreaSheetInfoBean("货位维度",BasicdatavisualizationSheetTwo.class,basicdatavisualizationSheetTwos));
+				goodsAreaSheetInfoBeans.add(new GoodsAreaSheetInfoBean("货位维度",BasicdatavisualizationZreoSheetTwo.class,basicdatavisualizationSheetTwos));
 //				goodsAreaSheetInfoBeans.add(new GoodsAreaSheetInfoBean("包条维度",BasicdatavisualizationSheetThree.class,basicdatavisualizationSheetThrees));
 				//	EasyExcel.write(response.getOutputStream(), BasicdataGoodsAreaexportExcel.class).sheet("货区数据表").doWrite(warehouseGoodsAreaList);
 				ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream()).build();