添加库存品入库明细列表

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionStockListInfoExcel.java

@@ -41,72 +41,40 @@ public class DistributionStockListInfoExcel implements Serializable {
 
 	private static final long serialVersionUID = 1L;
 
+
 	/**
-	 * 租户号
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("租户号")
-	private Long tenantId;
-	/**
-	 * 是否已删除
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("是否已删除")
-	private Integer isDeleted;
-	/**
-	 * 预留1
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("预留1")
-	private String reserve1;
-	/**
-	 * 预留2
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("预留2")
-	private String reserve2;
-	/**
-	 * 预留3
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("预留3")
-	private String reserve3;
-	/**
-	 * 预留4
+	 * 订单自编号
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("预留4")
-	private String reserve4;
+	@ExcelProperty("订单自编号")
+	private String orderCode;
 	/**
-	 * 预留5
+	 * 运单号
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("预留5")
-	private String reserve5;
+	@ExcelProperty("运单号")
+	private String despatch;
+
 	/**
-	 * 订单自编号
+	 * 入库数量
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("订单自编号")
-	private String orderCode;
+	@ExcelProperty("入库数量")
+	private Integer quantityStock;
+
 	/**
-	 * 入库批次号
+	 * 商场名称
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("入库批次号")
-	private String incomingBatch;
+	@ExcelProperty("商场名称")
+	private String marketName;
 	/**
 	 * 服务号
 	 */
 	@ColumnWidth(20)
 	@ExcelProperty("服务号")
 	private String serviceNumber;
-	/**
-	 * 物料Id
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("物料Id")
-	private Long materialId;
+
 	/**
 	 * 物料名称
 	 */
@@ -119,66 +87,29 @@ public class DistributionStockListInfoExcel implements Serializable {
 	@ColumnWidth(20)
 	@ExcelProperty("物料编号")
 	private String cargoNumber;
-	/**
-	 * 物料规格
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("物料规格")
-	private String cargoNorms;
 	/**
 	 * 物料单位
 	 */
 	@ColumnWidth(20)
 	@ExcelProperty("物料单位")
 	private String cargoUnit;
+
 	/**
-	 * 仓库ID
+	 * sku
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("仓库ID")
-	private Long warehouseId;
+	@ExcelProperty("sku")
+	private String sku;
+
+
 	/**
 	 * 仓库名称
 	 */
 	@ColumnWidth(20)
 	@ExcelProperty("仓库名称")
 	private String warehouseName;
-	/**
-	 * 库位信息
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("库位信息")
-	private String storageLocation;
-	/**
-	 * 商城(无用)
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("商城(无用)")
-	private String mallId;
-	/**
-	 * 商城编号(无用)
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("商城编号(无用)")
-	private Long mallCode;
-	/**
-	 * 商城名称(无用)
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("商城名称(无用)")
-	private String mallName;
-	/**
-	 * 入库数量
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("入库数量")
-	private Integer quantityStock;
-	/**
-	 * 门店id
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("门店id")
-	private Long storeId;
+
+
 	/**
 	 * 门店编码
 	 */
@@ -191,149 +122,42 @@ public class DistributionStockListInfoExcel implements Serializable {
 	@ColumnWidth(20)
 	@ExcelProperty("门店名称")
 	private String storeName;
-	/**
-	 * 占用数量
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("占用数量")
-	private Integer quantityOccupied;
-	/**
-	 * 出库数量
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("出库数量")
-	private Integer outboundQuantity;
-	/**
-	 * 物流发运车次
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("物流发运车次")
-	private String despatch;
-	/**
-	 * 在库订单ID
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("在库订单ID")
-	private String stockArticleId;
-	/**
-	 * 工厂车次
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("工厂车次")
-	private String factory;
-	/**
-	 * 品分类
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("品分类")
-	private String category;
-	/**
-	 * 0 没有 1 拆了
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("0 没有 1 拆了")
-	private Byte unpack;
-	/**
-	 * 包件id
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("包件id")
-	private Long parcelListId;
-	/**
-	 * 所属商场
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("所属商场")
-	private Long shoppingMall;
-	/**
-	 * 商场ID
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("商场ID ")
-	private Long marketId;
-	/**
-	 * 商场名称
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("商场名称")
-	private String marketName;
-	/**
-	 * 商场编码
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("商场编码")
-	private String marketCode;
-	/**
-	 * 库存品码
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("库存品码")
-	private String stockListCode;
+
+
+//	/**
+//	 * 工厂车次
+//	 */
+//	@ColumnWidth(20)
+//	@ExcelProperty("工厂车次")
+//	private String factory;
+
 	/**
 	 * 服务类型
 	 */
 	@ColumnWidth(20)
 	@ExcelProperty("服务类型")
-	private String serviceType;
-	/**
-	 * 父ID
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("父ID")
-	private Long pid;
+	private String serviceTypeName;
+;
 	/**
 	 * 品牌名称
 	 */
 	@ColumnWidth(20)
 	@ExcelProperty("品牌名称")
 	private String brandName;
-	/**
-	 * 品牌ID
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("品牌ID")
-	private Long brandId;
+
 	/**
 	 * 入库时间
 	 */
 	@ColumnWidth(20)
 	@ExcelProperty("入库时间")
 	private Date warehousingTime;
-	/**
-	 * 拆包数
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("拆包数")
-	private Integer unpackingQuantity;
-	/**
-	 * 车牌
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("车牌")
-	private String licensePlate;
-	/**
-	 * 托盘ID
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("托盘ID")
-	private Long trayId;
-	/**
-	 * 托盘名称
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("托盘名称")
-	private String trayName;
-	/**
-	 * sku
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("sku")
-	private String sku;
-	/**
-	 *  上架时间
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty(" 上架时间")
-	private Date groundingTime;
+
+//	/**
+//	 * 车牌
+//	 */
+//	@ColumnWidth(20)
+//	@ExcelProperty("车牌")
+//	private String licensePlate;
+
 
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListInfoMapper.java

@@ -50,6 +50,6 @@ public interface DistributionStockListInfoMapper extends BaseMapper<Distribution
 	 * @param queryWrapper
 	 * @return
 	 */
-	List<DistributionStockListInfoExcel> exportDistributionStockListInfo(@Param("ew") Wrapper<DistributionStockListInfoEntity> queryWrapper);
+	List<DistributionStockListInfoVO> exportDistributionStockListInfo(@Param("ew") Wrapper<DistributionStockListInfoEntity> queryWrapper);
 
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListInfoMapper.xml

@@ -68,7 +68,7 @@
     </select>
 
 
-    <select id="exportDistributionStockListInfo" resultType="com.logpm.distribution.excel.DistributionStockListInfoExcel">
+    <select id="exportDistributionStockListInfo" resultType="com.logpm.distribution.vo.DistributionStockListInfoVO">
         SELECT * FROM logpm_distribution_stock_list_info ${ew.customSqlSegment}
     </select>
 

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockListInfoService.java

@@ -46,7 +46,7 @@ public interface IDistributionStockListInfoService extends BaseService<Distribut
 	/**
 	 * 导出数据
 	 *
-	 * @param queryWrapper
+	 * @param distributionStockListInfo
 	 * @return
 	 */
 	List<DistributionStockListInfoExcel> exportDistributionStockListInfo(Map<String, Object> distributionStockListInfo);

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListInfoServiceImpl.java

@@ -24,11 +24,15 @@ import com.logpm.distribution.excel.DistributionStockListInfoExcel;
 import com.logpm.distribution.mapper.DistributionStockListInfoMapper;
 import com.logpm.distribution.service.IDistributionStockListInfoService;
 import com.logpm.distribution.vo.DistributionStockListInfoVO;
+import org.springblade.common.constant.DictBizConstant;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.tool.constant.BladeConstant;
+import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.system.cache.DictBizCache;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -53,11 +57,20 @@ public class DistributionStockListInfoServiceImpl extends BaseServiceImpl<Distri
 		queryWrapper.lambda().eq(DistributionStockListInfoEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
 
 
-		List<DistributionStockListInfoExcel> distributionStockListInfoList = baseMapper.exportDistributionStockListInfo(queryWrapper);
-		//distributionStockListInfoList.forEach(distributionStockListInfo -> {
-		//	distributionStockListInfo.setTypeName(DictCache.getValue(DictEnum.YES_NO, DistributionStockListInfo.getType()));
-		//});
-		return distributionStockListInfoList;
+		List<DistributionStockListInfoVO> distributionStockListInfoList = baseMapper.exportDistributionStockListInfo(queryWrapper);
+		List<DistributionStockListInfoExcel> list = new ArrayList<>();
+		distributionStockListInfoList.forEach(stockListInfo -> {
+//			distributionStockListInfo.setTypeName(DictCache.getValue(DictEnum.YES_NO, DistributionStockListInfo.getType()));
+			DistributionStockListInfoExcel distributionStockListInfoExcel = new DistributionStockListInfoExcel();
+			BeanUtil.copyProperties(stockListInfo,distributionStockListInfoExcel);
+			String value = DictBizCache.getValue(DictBizConstant.DISTRIBUTION_TYPE, stockListInfo.getServiceType());
+			distributionStockListInfoExcel.setServiceTypeName(value);
+
+
+
+			list.add(distributionStockListInfoExcel);
+		});
+		return list;
 	}
 
 }