fix：

1.增加托盘导出 【包件的】
2.增加预对账单 2c的品类件数

blade-service-api/logpm-basicdata-api/pom.xml

@@ -23,6 +23,11 @@
             <artifactId>hutool-all</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-starter-excel</artifactId>
+        </dependency>
+
     </dependencies>
 
 

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/TrayInventoryExcelVO.java

@@ -0,0 +1,59 @@
+package com.logpm.basicdata.vo;
+
+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;
+
+/**
+ * 托盘库存品信息导出
+ */
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class TrayInventoryExcelVO {
+
+	@ExcelProperty(value = "SKU")
+	private String sku;
+
+	/**
+	 * 物料名称
+	 */
+	@ExcelProperty(value = "物料名称")
+	private String materialName;
+	/**
+	 * 物料编号
+	 */
+	@ExcelProperty(value = "物料编号")
+	private String materialCode;
+
+
+	@ExcelProperty(value = "规格")
+	private String cargoNorms;
+
+	@ExcelProperty(value = "单位")
+	private String cargoUnit;
+
+
+	@ExcelProperty(value = "仓库名称")
+	private String warehouseName;
+
+	@ExcelProperty(value = "商场名称")
+	private String marketName;
+
+	@ExcelProperty(value = "所在库位")
+	private String positionCode;
+
+	@ExcelProperty(value = "数量")
+	private String num;
+
+	@ExcelProperty(value = "操作时间")
+	private String operateTime;
+
+	@ExcelProperty(value = "操作人")
+	private String operateUserName;
+
+
+}

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/TrayPackageExcelVO.java

@@ -0,0 +1,124 @@
+package com.logpm.basicdata.vo;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.format.DateTimeFormat;
+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 io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 托盘包件信息导出
+ */
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class TrayPackageExcelVO implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 服务号
+	 */
+	@ExcelProperty(value = "服务号")
+//	@DateTimeFormat("yyyy-MM-dd")
+	private String serviceNumber;
+
+	/**
+	 * 运单号
+	 */
+	@ExcelProperty(value = "运单号")
+	private String waybillNumber;
+
+	/**
+	 * 订单自编号
+	 */
+	@ExcelProperty(value = "订单自编号")
+	private String orderCode;
+
+	/**
+	 * 包条码
+	 */
+	@ExcelProperty(value = "包条码")
+	private String orderPackageCode;
+
+	/**
+	 * 商城名称
+	 */
+	@ExcelProperty(value = "商城名称")
+	private String marketName;
+
+	/**
+	 * 是否串货
+	 */
+	@ExcelProperty(value = "是否串货")
+	private String fleeingName;
+
+	/**
+	 * 仓库
+	 */
+	@ExcelProperty(value = "仓库")
+	private String warehouseName;
+
+
+	/**
+	 * 一级品
+	 */
+	@ExcelProperty(value = "一级品")
+	private String firsts;
+
+	/**
+	 * 二级品
+	 */
+	@ExcelProperty(value = "二级品")
+	private String second;
+	/**
+	 * 三级品
+	 */
+	@ExcelProperty(value = "三级品")
+	private String thirdProduct;
+
+	/**
+	 * 物料名称
+	 */
+	@ExcelProperty(value = "物料名称")
+	private String materialName;
+	/**
+	 * 物料编号
+	 */
+	@ExcelProperty(value = "物料编号")
+	private String materialCode;
+	/**
+	 * 品牌名称
+	 */
+	@ExcelProperty(value = "品牌名称")
+	private String brandName;
+
+	/**
+	 * 货位信息
+	 */
+	@ExcelProperty(value = "货位信息")
+	private String goodsAllocation;
+
+
+	/**
+	 * 操作时间
+	 */
+	@ExcelProperty(value = "操作时间")
+	@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
+	private Date operateTime;
+
+	/**
+	 * 操作人（v）
+	 */
+	@ExcelProperty(value = "操作人")
+	private String operateUserName;
+}
+
+
+

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

@@ -16,6 +16,10 @@
  */
 package com.logpm.basicdata.controller;
 
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.write.metadata.WriteSheet;
+import com.alibaba.excel.write.metadata.style.WriteCellStyle;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
@@ -23,18 +27,17 @@ import com.logpm.basicdata.dto.BasicdataTrayDTO;
 import com.logpm.basicdata.entity.BasicdataTrayEntity;
 import com.logpm.basicdata.excel.BasicdataTrayExcel;
 import com.logpm.basicdata.service.IBasicdataTrayService;
-import com.logpm.basicdata.vo.BasicdataStockArticleVO;
-import com.logpm.basicdata.vo.BasicdataTrayVO;
-import com.logpm.basicdata.vo.WarehouseParcelListVO;
-import com.logpm.basicdata.vo.WarehouseStockListVO;
+import com.logpm.basicdata.vo.*;
 import com.logpm.basicdata.wrapper.BasicdataTrayWrapper;
 import com.logpm.basicdata.wrapper.WarehouseParcelListWrapper;
 import com.logpm.basicdata.wrapper.WarehouseStockListWrapper;
+import com.sun.deploy.net.URLEncoder;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import lombok.extern.log4j.Log4j2;
+import org.apache.poi.ss.usermodel.HorizontalAlignment;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.excel.util.ExcelUtil;
 import org.springblade.core.mp.support.Condition;
@@ -49,6 +52,7 @@ import springfox.documentation.annotations.ApiIgnore;
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 
@@ -266,7 +270,6 @@ public class BasicdataTrayController extends BladeController {
 
 
 		String ids = (String) map.get("ids");
-//		System.out.println(ids);
 		trayService.downloadCodePDF(Func.toLongList(ids), response);
 		return ;
 	}
@@ -287,4 +290,75 @@ public class BasicdataTrayController extends BladeController {
 		ExcelUtil.export(response, "托盘数据" + DateUtil.time(), "托盘数据表", list, BasicdataTrayExcel.class);
 	}
 
+
+	/**
+	 * 导出托盘上的 包件  库存品  零担信息
+	 * @param response
+	 * @param id 托盘ID
+	 */
+	@GetMapping("/exportTrayData")
+	@ApiOperationSupport(order = 9)
+	@ApiOperation(value = "导出数据", notes = "传入BasicdataTray")
+	public void exportTrayData(@ApiIgnore @RequestParam Long id, HttpServletResponse response) {
+
+
+		// 查询托盘
+		BasicdataTrayEntity oneById = trayService.getById(id);
+
+		String fileName = "excel文件名";
+		String sheetName1 = "包件列表";
+		String sheetName2 = "库存品列表";
+		String sheetName3 = "零担列表";
+
+		ExcelWriter excelWriter =null;
+		//查询包件
+		try {
+			// 包件列表
+			List<TrayPackageExcelVO> data1 = trayService.exportPackage(oneById.getId());
+
+			// 库存列表
+			List<TrayInventoryExcelVO> data2 = trayService.exportInventory(oneById.getId());
+			// 零担列表
+			//todo 缺少零担的数据导出
+
+
+
+
+
+//		List<x'zExportDetailExcel> exportUser1Excels = exportService.querySheet1();
+//		List<ExportStatisticsExcel> exportUser2Excels = exportService.querySheet2();
+//		//表头样式
+			WriteCellStyle headWriteCellStyle = new WriteCellStyle();
+//		//设置表头居中对齐
+			headWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.CENTER);
+//		//内容样式
+			WriteCellStyle contentWriteCellStyle = new WriteCellStyle();
+//		//设置内容靠左对齐
+			contentWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.LEFT);
+			response.setContentType("application/vnd.ms-excel");
+			response.setCharacterEncoding("utf-8");
+			//可以防止中文乱码,和easyexcel没有关系
+			fileName = URLEncoder.encode(fileName,"utf-8");
+			response.setHeader("Content-disposition","attachment;filename=" + fileName + ".xlsx");
+			 excelWriter = EasyExcel.write(response.getOutputStream()).build();
+			 EasyExcel.writerSheet(0,sheetName1).head(TrayPackageExcelVO.class).build();
+			EasyExcel.writerSheet(1,sheetName2).head(TrayInventoryExcelVO.class).build();
+			WriteSheet writeSheet = EasyExcel.writerSheet(2,sheetName2).head(TrayPackageExcelVO.class).build();
+
+			excelWriter.write(data1,writeSheet);
+			excelWriter.write(data2,writeSheet);
+
+		} catch (IOException e) {
+			throw new RuntimeException(e);
+		} finally {
+			excelWriter.finish();
+		}
+//		writeSheet = EasyExcel.writerSheet(1,sheetName2).head(ExportUser2Excel.class).build();
+//		excelWriter.write(exportStatisticsExcels,writeSheet);
+//		//千万别忘记关流,finish会帮忙关流
+//
+
+	}
+
+
 }

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

@@ -28,6 +28,7 @@ import com.logpm.basicdata.vo.WarehouseParcelListVO;
 import com.logpm.basicdata.vo.WarehouseStockListVO;
 import com.logpm.warehouse.vo.WarehouseTrayQRCode;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.data.domain.Page;
 
 import java.util.List;
 import java.util.Map;
@@ -70,7 +71,7 @@ public interface BasicdataTrayMapper extends BaseMapper<BasicdataTrayEntity> {
 	/**
 	 * 托盘 查看零担列表
 	 */
-	List<BasicdataStockArticleVO> selectlclList(IPage<BasicdataStockArticleVO> page, @Param("param") BasicdataTrayDTO basicdataTray);
+	IPage<BasicdataStockArticleVO> selectlclList(IPage<BasicdataStockArticleVO> page, @Param("param") BasicdataTrayDTO basicdataTray);
 	/**
 	 * 托盘 历史包条详情
 	 */
@@ -88,4 +89,8 @@ public interface BasicdataTrayMapper extends BaseMapper<BasicdataTrayEntity> {
 	 */
 	WarehouseTrayQRCode getTray(@Param("id") Long id);
 	List<WarehouseTrayQRCode> getTrayByIds(@Param("ids") List<Long>  ids);
+
+	List<WarehouseParcelListVO> exportPackage(@Param("id") Long id);
+
+	List<WarehouseStockListVO> exportInventory(@Param("id") Long id);
 }

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

@@ -106,24 +106,21 @@
         ldpl.material_name materialName,
         ldpl.material_code materialCode,
         ldpl.brand_name brandName,
-        lwug.position_code positionCode,
         ldpl.order_package_freeze_status orderPackageFreezeStatus,
         ldpl.order_package_status orderPackageStatus,
         ldpl.order_package_grounding_status orderPackageGroundingStatus,
         ldpl.order_package_stockup_status orderPackageStockupStatus,
         ldpl.order_package_reservation_status orderPackageReservationStatus,
         ldpl.order_package_loading_status orderPackageLoadingStatus,
-        lwga.column_num columnNum,
-        lwga.layer_num layerNum,
         lwtg.create_time operateTime,
         lwtg.create_user operateUser,
         lwtg.is_fleeing isFleeing,
+        ldpl.goods_allocation as goodsAllocation,
         ldsa.mall_name
         FROM
         logpm_warehouse_tray_goods lwtg
         JOIN logpm_distribution_parcel_list ldpl ON lwtg.association_id = ldpl.id
         JOIN logpm_distribution_stock_article ldsa ON ldpl.stock_article_id  = ldsa.id
-        left join ( logpm_warehouse_updown_goods lwug join logpm_warehouse_goods_allocation lwga on lwug.allocation_id = lwga.id ) on lwug.association_id = ldpl.id
         <where>
             ldpl.is_deleted = 0  and lwtg.is_deleted = 0 and  lwtg.association_type = 3 and  lwtg.tray_id = #{param.id}
             <if test="param.orderPackageCode !=null and param.orderPackageCode != ''">
@@ -223,9 +220,7 @@
         lww.consignee_name consigneePerson,
         lww.consignee_address consigneeAddress,
         lww.consignee_mobile consigneeMobile,
-        lwug.position_code positionCode,
-        lwga.column_num columnNum,
-        lwga.layer_num layerNum,
+        ldsa.allocation positionCode,
         lwtg.num num,
         lwtg.create_time operateTime,
         lwtg.create_user operateUser
@@ -233,7 +228,6 @@
         logpm_warehouse_tray_goods lwtg
         JOIN logpm_distribution_stock_article ldsa ON lwtg.association_id = ldsa.id
         LEFT join logpm_warehouse_waybill lww   on  lww.waybill_no = ldsa.waybill_number
-        LEFT JOIN ( logpm_warehouse_updown_goods lwug JOIN logpm_warehouse_goods_allocation lwga ON lwug.allocation_id = lwga.id ) ON lwug.association_id = ldsa.id
         <where>
             ldsa.is_deleted = 0  and lwtg.is_deleted = 0 and  lwtg.association_type = 1  and  lwtg.tray_id = #{param.id}
             <if test="param.dealerName !=null and param.dealerName != ''">
@@ -252,7 +246,7 @@
                 and ldsa.consignee_address  like concat('%',#{param.consigneeAddress},'%')
             </if>
               <if test="param.positionCode !=null and param.positionCode != ''">
-                and lwug.position_code  like concat('%',#{param.positionCode},'%')
+                and ldsa.allocation  like concat('%',#{param.positionCode},'%')
             </if>
         </where>
     </select>
@@ -436,6 +430,64 @@
 
 
     </select>
+    <select id="exportPackage" resultType="com.logpm.basicdata.vo.WarehouseParcelListVO">
+        SELECT
+        ldpl.service_number serviceNumber,
+        ldpl.waybill_number waybillNumber,
+        ldpl.order_package_code orderPackageCode,
+        ldpl.order_code,
+        ldpl.warehouse warehouse,
+        ldpl.firsts firsts,
+        ldpl.SECOND SECOND,
+        ldpl.third_product thirdProduct,
+        ldpl.material_name materialName,
+        ldpl.material_code materialCode,
+        ldpl.brand_name brandName,
+        ldpl.order_package_freeze_status orderPackageFreezeStatus,
+        ldpl.order_package_status orderPackageStatus,
+        ldpl.order_package_grounding_status orderPackageGroundingStatus,
+        ldpl.order_package_stockup_status orderPackageStockupStatus,
+        ldpl.order_package_reservation_status orderPackageReservationStatus,
+        ldpl.order_package_loading_status orderPackageLoadingStatus,
+        lwtg.create_time operateTime,
+        lwtg.create_user operateUser,
+        lwtg.is_fleeing isFleeing,
+        ldpl.goods_allocation as goodsAllocation,
+        ldsa.mall_name
+        FROM
+        logpm_warehouse_tray_goods lwtg
+        JOIN logpm_distribution_parcel_list ldpl ON lwtg.association_id = ldpl.id
+        JOIN logpm_distribution_stock_article ldsa ON ldpl.stock_article_id  = ldsa.id
+        <where>
+        ldpl.is_deleted = 0  and lwtg.is_deleted = 0 and  lwtg.association_type = 3 and  lwtg.tray_id = #{id}
+        </where>
+
+    </select>
+    <select id="exportInventory" resultType="com.logpm.basicdata.vo.WarehouseStockListVO">
+
+        SELECT
+        ldsl.sku sku,
+        ldsl.description_goods descriptionGoods,
+        ldsl.cargo_number cargoNumber,
+        ldsl.cargo_unit cargoUnit,
+        ldsl.cargo_norms cargoNorms,
+        ldsl.market_name marketName,
+        ldsl.warehouse_name warehouseName,
+        lwga.qr_code positionCode,
+        lwtg.create_time operateTime,
+        lwtg.num num,
+        lwtg.create_user operateUser
+        FROM
+        logpm_warehouse_tray_goods lwtg
+        JOIN logpm_distribution_stock_list ldsl ON lwtg.association_id = ldsl.material_id AND lwtg.incoming_batch = ldsl.incoming_batch
+        LEFT JOIN logpm_warehouse_tary_allocation AS lwta ON lwtg.tray_id = lwta.tray_id
+        LEFT JOIN logpm_warehouse_updown_goods AS lwug ON lwta.allocation_id = lwug.allocation_id
+        LEFT JOIN logpm_warehouse_goods_allocation AS lwga ON lwga.id = lwug.allocation_id
+        <where>
+        ldsl.is_deleted = 0 and lwtg.is_deleted = 0 and  lwtg.association_type = 4 and  lwtg.tray_id = #{id}
+        </where>
+
+    </select>
 
 
 </mapper>

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

@@ -21,10 +21,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.logpm.basicdata.dto.BasicdataTrayDTO;
 import com.logpm.basicdata.entity.BasicdataTrayEntity;
 import com.logpm.basicdata.excel.BasicdataTrayExcel;
-import com.logpm.basicdata.vo.BasicdataStockArticleVO;
-import com.logpm.basicdata.vo.BasicdataTrayVO;
-import com.logpm.basicdata.vo.WarehouseParcelListVO;
-import com.logpm.basicdata.vo.WarehouseStockListVO;
+import com.logpm.basicdata.vo.*;
 import com.logpm.warehouse.vo.WarehouseTraybarCode;
 import org.springblade.core.mp.base.BaseService;
 import org.springblade.core.tool.api.R;
@@ -130,4 +127,8 @@ public interface IBasicdataTrayService extends BaseService<BasicdataTrayEntity>
 	 * @return
 	 */
 	Boolean vacantBycodes(List<String> codes,String remark);
+
+	List<TrayPackageExcelVO> exportPackage(Long id);
+
+	List<TrayInventoryExcelVO> exportInventory(Long id);
 }

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

@@ -16,7 +16,10 @@
  */
 package com.logpm.basicdata.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -39,10 +42,7 @@ import com.logpm.basicdata.mapper.BasicdataTrayMapper;
 import com.logpm.basicdata.mapper.BasicdataWarehouseMapper;
 import com.logpm.basicdata.service.IBasicdataTrayService;
 import com.logpm.basicdata.service.IBasicdataWarehouseService;
-import com.logpm.basicdata.vo.BasicdataStockArticleVO;
-import com.logpm.basicdata.vo.BasicdataTrayVO;
-import com.logpm.basicdata.vo.WarehouseParcelListVO;
-import com.logpm.basicdata.vo.WarehouseStockListVO;
+import com.logpm.basicdata.vo.*;
 import com.logpm.warehouse.feign.IWarehouseTrayGoodsClient;
 import com.logpm.warehouse.vo.WarehouseTrayQRCode;
 import com.logpm.warehouse.vo.WarehouseTraybarCode;
@@ -58,6 +58,9 @@ import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.system.entity.User;
+import org.springblade.system.feign.ISysClient;
+import org.springblade.system.feign.IUserClient;
 import org.springframework.beans.BeanUtils;
 import org.springframework.data.repository.init.ResourceReader;
 import org.springframework.http.MediaType;
@@ -73,6 +76,7 @@ import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 托盘 服务实现类
@@ -85,20 +89,18 @@ import java.util.Map;
 @Log4j2
 public class BasicdataTrayServiceImpl extends BaseServiceImpl<BasicdataTrayMapper, BasicdataTrayEntity> implements IBasicdataTrayService {
 
-	private BasicdataTrayMapper trayMapper;
+	private final BasicdataTrayMapper trayMapper;
 
+	private final IBasicdataCodeClient basicdataCodeClient;
 
-	private IBasicdataCodeClient basicdataCodeClient;
+	private final BasicdataWarehouseMapper basicdataWarehouseMapper;
 
-	private BasicdataWarehouseMapper basicdataWarehouseMapper;
+  	private final IWarehouseTrayGoodsClient warehouseTrayGoodsClient;
 
-  	private IWarehouseTrayGoodsClient warehouseTrayGoodsClient;
+	 private final IBasicPrintTemplateClient basicPrintTemplateClient;
+	 private final IUserClient userClient;
 
 
-	 private IBasicPrintTemplateClient basicPrintTemplateClient;
-
-	private IBasicdataWarehouseService basicdataWarehouseService;
-
 
 
 	@Override
@@ -182,8 +184,25 @@ public class BasicdataTrayServiceImpl extends BaseServiceImpl<BasicdataTrayMappe
 
 	@Override
 	public IPage<BasicdataStockArticleVO> getlclList(IPage<BasicdataStockArticleVO> page, BasicdataTrayDTO basicdataTray) {
-		List<BasicdataStockArticleVO> list = trayMapper.selectlclList(page,basicdataTray);
-		return page.setRecords(list);
+		IPage<BasicdataStockArticleVO> data = trayMapper.selectlclList(page,basicdataTray);
+		List<BasicdataStockArticleVO> records = data.getRecords();
+		//获取所有的操作人ID
+		List<Long> operateUserIds = records.stream().map(BasicdataStockArticleVO::getOperateUser).collect(Collectors.toList());
+		R<List<User>> listR = userClient.userInfoByIds(AuthUtil.getTenantId(), CollUtil.join(operateUserIds, StrUtil.COMMA));
+
+		for (BasicdataStockArticleVO record : records) {
+			if (listR.isSuccess() && listR.getData() != null) {
+				for (User datum : listR.getData()) {
+					if(datum.getId().equals(record.getOperateUser())){
+						record.setOperateUserName(datum.getRealName());
+					}
+				}
+
+			}
+		}
+
+
+		return data;
 	}
 
 	@Override
@@ -369,4 +388,33 @@ public class BasicdataTrayServiceImpl extends BaseServiceImpl<BasicdataTrayMappe
 		return true;
 	}
 
+	@Override
+	public List<TrayPackageExcelVO> exportPackage(Long id) {
+
+//		List<WarehouseParcelListVO>	list = trayMapper.selectPackageList(page,basicdataTray)
+		List<WarehouseParcelListVO>	list = trayMapper.exportPackage(id);
+		List<TrayPackageExcelVO> data = new ArrayList<>();
+		for (WarehouseParcelListVO warehouseParcelListVO : list) {
+			TrayPackageExcelVO trayPackageExcelVO = BeanUtil.copyProperties(warehouseParcelListVO, TrayPackageExcelVO.class);
+			trayPackageExcelVO.setFleeingName(0==warehouseParcelListVO.getIsFleeing()?"正常":"串货");
+			data.add(trayPackageExcelVO);
+
+		}
+
+		return data;
+	}
+
+	@Override
+	public List<TrayInventoryExcelVO> exportInventory(Long id) {
+
+//		List<WarehouseStockListVO> list =trayMapper.selectInventoryList(page,basicdataTray);
+		List<WarehouseStockListVO> list =trayMapper.exportInventory(id);
+		List<TrayInventoryExcelVO> data = new ArrayList<>();
+		for (WarehouseStockListVO warehouseStockListVO : list) {
+			TrayInventoryExcelVO trayInventoryExcelVO = BeanUtil.copyProperties(warehouseStockListVO, TrayInventoryExcelVO.class);
+			data.add(trayInventoryExcelVO);
+		}
+
+		return data;
+	}
 }

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/vo/StatisticsOrderInfoExportVO.java

@@ -85,6 +85,11 @@ public class StatisticsOrderInfoExportVO implements Serializable {
 	@ExcelProperty(value = "品类名称")
 	private String goodsName; // 物料品类
 
+
+	@ExcelProperty(value = "品类件数")
+	private String goodsNum; // 物料品类
+
+
 	@ExcelProperty(value = "品类单价")
 	private String goodsPrice; // 物料品类