1.同步

blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/entity/BasicMaterialEntity.java

@@ -142,6 +142,9 @@ public class BasicMaterialEntity extends TenantEntity {
 	@ApiModelProperty(value = "父id")
 	private Long pid;
 
+	@ApiModelProperty(value = "是否隐藏(1-否,2-是)")
+	private Integer hide;
+
 	@ApiModelProperty(value = "包装数量")
 	private String packageNum;
 

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataTrayEntity.java

@@ -101,6 +101,18 @@ public class BasicdataTrayEntity extends TenantEntity {
 	@ApiModelProperty(value = "托盘旧托盘码")
 	private String oldQrCode;
 
+	/**
+	 * 破损照片
+	 */
+	@ApiModelProperty(value = "破损照片")
+	private String damagedPhotos;
+
+	/**
+	 * 破损备注
+	 */
+	@ApiModelProperty(value = "破损备注")
+	private String damagedNote;
+
 	@ApiModelProperty(value = "目前所在仓库")
 	private Long nowWarehouseId;
 

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/WarehouseParcelListEntity.java

@@ -0,0 +1,232 @@
+package com.logpm.basicdata.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+import java.util.Date;
+
+
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+
+
+/**
+ * 在库订单包件清单 实体类
+ *
+ * @author cyz
+ * @since 2023-06-13
+ */
+@Data
+@TableName("logpm_warehouse_parcel_list")
+@ApiModel(value = "WarehouseParcelList对象", description = "在库订单包件清单")
+@EqualsAndHashCode(callSuper = true)
+public class WarehouseParcelListEntity extends TenantEntity {
+
+	/**
+	 * 预留1
+	 */
+	@ApiModelProperty(value = "预留1")
+	private String reserve1;
+	/**
+	 * 预留2
+	 */
+	@ApiModelProperty(value = "预留2")
+	private String reserve2;
+	/**
+	 * 预留3
+	 */
+	@ApiModelProperty(value = "预留3")
+	private String reserve3;
+	/**
+	 * 预留4
+	 */
+	@ApiModelProperty(value = "预留4")
+	private String reserve4;
+	/**
+	 * 预留5
+	 */
+	@ApiModelProperty(value = "预留5")
+	private String reserve5;
+	/**
+	 * 订单自编号
+	 */
+	@ApiModelProperty(value = "订单自编号")
+	private String orderCode;
+	/**
+	 * 仓库
+	 */
+	@ApiModelProperty(value = "仓库")
+	private String warehouse;
+
+	@ApiModelProperty(value = "仓库ID")
+	private Long warehouseId;
+	/**
+	 * 状态
+	 */
+	@ApiModelProperty(value = "状态")
+	private Integer conditions;
+	/**
+	 * 包条码
+	 */
+	@ApiModelProperty(value = "包条码")
+	@TableField("order_package_code")
+	private String orderPackageCode;
+
+	@ApiModelProperty(value = "货区信息")
+	private String cargoTitle;
+
+	@ApiModelProperty(value = "货架信息")
+	private String shelfTitle;
+	/**
+	 * 货位信息
+	 */
+	@ApiModelProperty(value = "货位信息")
+	private String goodsAllocation;
+	/**
+	 * 所在托盘
+	 */
+	@ApiModelProperty(value = "所在托盘")
+	private String pallet;
+	/**
+	 * 一级品
+	 */
+	@ApiModelProperty(value = "一级品")
+	private String firsts;
+	/**
+	 * 二级品
+	 */
+	@ApiModelProperty(value = "二级品")
+	private String second;
+	/**
+	 * 三级品
+	 */
+	@ApiModelProperty(value = "三级品")
+	private String thirdProduct;
+	/**
+	 * 入库时间
+	 */
+	@ApiModelProperty(value = "入库时间")
+	private Date warehouseEntryTimeEnd;
+	/**
+	 * 运单号
+	 */
+	@ApiModelProperty(value = "运单号")
+	private String waybillNumber;
+	/**
+	 * 运单ID
+	 */
+	@ApiModelProperty(value = "运单ID")
+	private String waybillId;
+	/**
+	 * 客户id
+	 */
+	@ApiModelProperty(value = "客户id")
+	@TableField(exist = false)
+	private String marketId;
+	/**
+	 * 物料Id
+	 */
+	@ApiModelProperty(value = "物料ID")
+	private Long materialId;
+
+	/**
+	 * 物料名称
+	 */
+	@ApiModelProperty(value = "物料名称")
+	private String materialName;
+	/**
+	 * 物料编号
+	 */
+	@ApiModelProperty(value = "物料编号")
+	private String materialCode;
+	/**
+	 * 物料单位
+	 */
+	@ApiModelProperty(value = "物料单位")
+	private String materialUnit;
+	/**
+	 * 数量
+	 */
+	@ApiModelProperty(value = "数量")
+	private Integer quantity;
+	/**
+	 * 车次号
+	 */
+	@ApiModelProperty(value = "车次号")
+	private String trainNumber;
+	/**
+	 * 在库订单ID
+	 */
+	@ApiModelProperty(value = "在库订单ID")
+	private Long stockArticleId;
+
+	/**
+	 * 服务号
+	 */
+	@ApiModelProperty(value = "服务号")
+	private String serviceNumber;
+	/**
+	 * 品牌ID
+	 */
+	@ApiModelProperty(value = "品牌ID")
+	private Long brandId;
+	/**
+	 * 品牌名称
+	 */
+	@ApiModelProperty(value = "品牌名称")
+	private String brandName;
+//	/**
+//	 * 配送状态
+//	 */
+//	@ApiModelProperty(value = "配送状态")
+//	private String deliveryState;
+	/**
+	 * 包件状态
+	 */
+	@ApiModelProperty(value = "包件状态")
+	private String orderPackageStatus;
+
+	@ApiModelProperty(value = "包件冻结状态")
+	private String orderPackageFreezeStatus;
+
+	@ApiModelProperty(value = "包件冻结状态")
+	private String orderPackageReservationStatus;
+
+
+
+	@ApiModelProperty(value = "备货状态")
+	private String orderPackageStockupStatus;
+
+	@ApiModelProperty(value = "上架状态")
+	private String orderPackageGroundingStatus;
+
+
+
+
+
+//	/**
+//	 * 配送状态
+//	 */
+//	@ApiModelProperty(value = "配送状态")
+//	private String orderPackageStatus;
+
+}

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

@@ -0,0 +1,63 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.vo;
+
+import com.logpm.basicdata.entity.WarehouseParcelListEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 在库订单包件清单 视图实体类
+ *
+ * @author cyz
+ * @since 2023-06-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class WarehouseParcelListVO extends WarehouseParcelListEntity {
+	private static final long serialVersionUID = 1L;
+
+	private String stockupStatus;
+	private Date stockupDate;
+	private String stockupArea;
+	private String goodsAllocation;
+	/**
+	 * 包件状态名称
+	 */
+	private String orderPackageStatusName;
+	/**
+	 * 包件冻结状态
+	 */
+	private String orderPackageFreezeStatusName;
+	/**
+	 * 包件上架状态
+	 */
+	private String orderPackageGroundingStatusName;
+	/**
+	 * 包件备货状态
+	 */
+	private String orderPackageStockupStatusName;
+
+	/**
+	 * 包件预约状态
+	 */
+	private String orderPackageReservationStatusName;
+
+
+}

blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseRetentionRecordEntity.java

@@ -0,0 +1,140 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.warehouse.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+/**
+ * 滞留记录 实体类
+ *
+ * @author BladeX
+ * @since 2023-08-09
+ */
+@Data
+@TableName("logpm_warehouse_retention_record")
+@ApiModel(value = "WarehouseRetentionRecord对象", description = "滞留记录")
+@EqualsAndHashCode(callSuper = true)
+public class WarehouseRetentionRecordEntity extends TenantEntity {
+
+	/**
+	 * 预留1
+	 */
+	@ApiModelProperty(value = "预留1")
+	private String reserve1;
+	/**
+	 * 预留2
+	 */
+	@ApiModelProperty(value = "预留2")
+	private String reserve2;
+	/**
+	 * 预留3
+	 */
+	@ApiModelProperty(value = "预留3")
+	private String reserve3;
+	/**
+	 * 预留4
+	 */
+	@ApiModelProperty(value = "预留4")
+	private String reserve4;
+	/**
+	 * 预留5
+	 */
+	@ApiModelProperty(value = "预留5")
+	private String reserve5;
+	/**
+	 * 订单自编码
+	 */
+	@ApiModelProperty(value = "订单自编码")
+	private String orderCode;
+	/**
+	 * 包件码
+	 */
+	@ApiModelProperty(value = "包件码")
+	private String packageCode;
+	/**
+	 * 运单号
+	 */
+	@ApiModelProperty(value = "运单号")
+	private String waybillNo;
+	/**
+	 * 滞留车次号
+	 */
+	@ApiModelProperty(value = "滞留车次号")
+	private Long retentionCarId;
+	/**
+	 * 滞留车次号
+	 */
+	@ApiModelProperty(value = "滞留车次号")
+	private String retentionCarNo;
+	/**
+	 * 滞留仓库id
+	 */
+	@ApiModelProperty(value = "滞留仓库id")
+	private Long retentionWarehouseId;
+	/**
+	 * 滞留仓库名称
+	 */
+	@ApiModelProperty(value = "滞留仓库名称")
+	private String retentionWarehouseName;
+	/**
+	 * 滞留类型;1=装车滞留，2=配送滞留，3=取消滞留,4=出库滞留
+	 */
+	@ApiModelProperty(value = "滞留类型;1=装车滞留，2=配送滞留，3=取消滞留,4=出库滞留")
+	private Integer retentionType;
+	/**
+	 * 装车时间
+	 */
+	@ApiModelProperty(value = "装车时间")
+	private Date assembleCarDate;
+	/**
+	 * 装车人id
+	 */
+	@ApiModelProperty(value = "装车人id")
+	private Long assembleCarPersonId;
+	/**
+	 * 装车人名称
+	 */
+	@ApiModelProperty(value = "装车人名称")
+	private String assembleCarPersonName;
+	/**
+	 * 备注
+	 */
+	@ApiModelProperty(value = "备注")
+	private String remark;
+	/**
+	 * 取消滞留人id
+	 */
+	@ApiModelProperty(value = "取消滞留人id")
+	private Long cancelRetentionUserId;
+	/**
+	 * 取消滞留人名称
+	 */
+	@ApiModelProperty(value = "取消滞留人名称")
+	private String cancelRetentionUserName;
+	/**
+	 * 取消滞留备注
+	 */
+	@ApiModelProperty(value = "取消滞留备注")
+	private String cancelRemark;
+
+}

blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseParcelListClient.java

@@ -34,7 +34,7 @@ import java.util.List;
  * @since 2023-06-13
  */
 @FeignClient(
-    value = ModuleNameConstant.APPLICATION_DISTRIBUTION_NAME
+	value = ModuleNameConstant.APPLICATION_WAREHOUSE_NAME
 )
 public interface IWarehouseParcelListClient {
 

blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseRetentionRecordClient.java

@@ -0,0 +1,50 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.warehouse.feign;
+
+import org.springblade.common.constant.ModuleNameConstant;
+import org.springblade.core.mp.support.BladePage;
+import com.logpm.warehouse.entity.WarehouseRetentionRecordEntity;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * 滞留记录 Feign接口类
+ *
+ * @author BladeX
+ * @since 2023-08-09
+ */
+@FeignClient(
+	value = ModuleNameConstant.APPLICATION_WAREHOUSE_NAME
+)
+public interface IWarehouseRetentionRecordClient {
+
+	String API_PREFIX = "retentionRecord/client";
+	String TOP = API_PREFIX + "/top";
+
+	/**
+	 * 获取滞留记录列表
+	 *
+	 * @param current   页号
+	 * @param size      页数
+	 * @return BladePage
+	 */
+	@GetMapping(TOP)
+	BladePage<WarehouseRetentionRecordEntity> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
+
+}

blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseRetentionRecordVO.java

@@ -0,0 +1,35 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.warehouse.vo;
+
+import com.logpm.warehouse.entity.WarehouseRetentionRecordEntity;
+import org.springblade.core.tool.node.INode;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 滞留记录 视图实体类
+ *
+ * @author BladeX
+ * @since 2023-08-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class WarehouseRetentionRecordVO extends WarehouseRetentionRecordEntity {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/BasicMaterialController.java

@@ -16,6 +16,9 @@
  */
 package com.logpm.basic.controller;
 
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.logpm.basic.excel.BasicMaterialImporter;
+import com.mysql.cj.protocol.x.Notice;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -23,10 +26,13 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
 import javax.validation.Valid;
 
+import lombok.extern.log4j.Log4j;
+import lombok.extern.log4j.Log4j2;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -39,7 +45,10 @@ import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.excel.util.ExcelUtil;
 import org.springblade.core.tool.constant.BladeConstant;
+import org.springframework.web.multipart.MultipartFile;
 import springfox.documentation.annotations.ApiIgnore;
+
+import java.util.ArrayList;
 import java.util.Map;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
@@ -54,6 +63,7 @@ import javax.servlet.http.HttpServletResponse;
 @AllArgsConstructor
 @RequestMapping("/material")
 @Api(value = "物料基础信息", tags = "物料基础信息接口")
+@Log4j2
 public class BasicMaterialController extends BladeController {
 
 	private final IBasicMaterialService basicMaterialService;
@@ -127,7 +137,13 @@ public class BasicMaterialController extends BladeController {
 	@ApiOperationSupport(order = 7)
 	@ApiOperation(value = "逻辑删除", notes = "传入ids")
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-		return R.status(basicMaterialService.deleteLogic(Func.toLongList(ids)));
+		//改为修改隐藏状态
+		boolean update = basicMaterialService.update(new UpdateWrapper<BasicMaterialEntity>().lambda()
+			.in(BasicMaterialEntity::getId, Func.toLongList(ids))
+			.set(BasicMaterialEntity::getHide, 2)
+		);
+//		basicMaterialService.deleteLogic(Func.toLongList(ids));
+		return R.status(update);
 	}
 
 
@@ -147,4 +163,26 @@ public class BasicMaterialController extends BladeController {
 		ExcelUtil.export(response, "物料基础信息数据" + DateUtil.time(), "物料基础信息数据表", list, BasicMaterialExcel.class);
 	}
 
+	/**
+	 * 导入物料基础信息
+	 */
+	@PostMapping("import-basicMaterial")
+	@ApiOperationSupport(order = 12)
+	@ApiOperation(value = "导入物料基础信息", notes = "传入excel")
+	public R importWarehousingEntry(MultipartFile file) {
+		log.info("传入>>>>>>>{}",file);
+		BasicMaterialImporter materialImporter = new BasicMaterialImporter(basicMaterialService);
+		ExcelUtil.save(file,materialImporter,BasicMaterialExcel.class);
+//		log.info("read>>>>>>>>>>",read);
+		//	List<BasicMaterialExcel> read = ExcelUtil.read(file, BasicMaterialExcel.class);
+//		ArrayList<BasicMaterialEntity> arrayList = new ArrayList<>();
+//		for (BasicMaterialExcel basicMaterialExcel : read) {
+//			log.info("basicMaterialExcel>>>>>>>",basicMaterialExcel);
+//			BasicMaterialEntity copy = BeanUtil.copy(basicMaterialExcel, BasicMaterialEntity.class);
+//		arrayList.add(copy);
+//		}
+//		basicMaterialService.saveBatch(arrayList);
+		return R.success("操作成功");
+	}
+
 }

blade-service/logpm-basic/src/main/java/com/logpm/basic/excel/BasicMaterialExcel.java

@@ -17,6 +17,7 @@
 package com.logpm.basic.excel;
 
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
@@ -42,48 +43,48 @@ public class BasicMaterialExcel implements Serializable {
 
 	private static final long serialVersionUID = 1L;
 
-	/**
+//	/**
-	 * 租户号
+//	 * 租户号
-	 */
+//	 */
-	@ColumnWidth(20)
+//	@ColumnWidth(20)
-	@ExcelProperty("租户号")
+//	@ExcelProperty("租户号")
-	private String tenantId;
+//	private String tenantId;
-	/**
+//	/**
-	 * 是否已删除
+//	 * 是否已删除
-	 */
+//	 */
-	@ColumnWidth(20)
+//	@ColumnWidth(20)
-	@ExcelProperty("是否已删除")
+//	@ExcelProperty("是否已删除")
-	private Integer isDeleted;
+//	private Integer isDeleted;
-	/**
+//	/**
-	 * 预留1
+//	 * 预留1
-	 */
+//	 */
-	@ColumnWidth(20)
+//	@ColumnWidth(20)
-	@ExcelProperty("预留1")
+//	@ExcelProperty("预留1")
-	private String reserve1;
+//	private String reserve1;
-	/**
+//	/**
-	 * 预留2
+//	 * 预留2
-	 */
+//	 */
-	@ColumnWidth(20)
+//	@ColumnWidth(20)
-	@ExcelProperty("预留2")
+//	@ExcelProperty("预留2")
-	private String reserve2;
+//	private String reserve2;
-	/**
+//	/**
-	 * 预留3
+//	 * 预留3
-	 */
+//	 */
-	@ColumnWidth(20)
+//	@ColumnWidth(20)
-	@ExcelProperty("预留3")
+//	@ExcelProperty("预留3")
-	private String reserve3;
+//	private String reserve3;
-	/**
+//	/**
-	 * 预留4
+//	 * 预留4
-	 */
+//	 */
-	@ColumnWidth(20)
+//	@ColumnWidth(20)
-	@ExcelProperty("预留4")
+//	@ExcelProperty("预留4")
-	private String reserve4;
+//	private String reserve4;
-	/**
+//	/**
-	 * 预留5
+//	 * 预留5
-	 */
+//	 */
-	@ColumnWidth(20)
+//	@ColumnWidth(20)
-	@ExcelProperty("预留5")
+//	@ExcelProperty("预留5")
-	private String reserve5;
+//	private String reserve5;
 	/**
 	 * 产品编码
 	 */
@@ -96,12 +97,16 @@ public class BasicMaterialExcel implements Serializable {
 	@ColumnWidth(20)
 	@ExcelProperty("名称")
 	private String name;
-	/**
+
-	 * 品牌
-	 */
 	@ColumnWidth(20)
-	@ExcelProperty("品牌")
+	@ExcelProperty("sku")
-	private String brand;
+	private String sku;
+//	/**
+//	 * 品牌
+//	 */
+//	@ColumnWidth(20)
+//	@ExcelProperty("品牌")
+//	private String brand;
 	/**
 	 * 属性
 	 */
@@ -162,5 +167,17 @@ public class BasicMaterialExcel implements Serializable {
 	@ColumnWidth(20)
 	@ExcelProperty("备注")
 	private String remark;
+	/**
+	 * 计量单位
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("计量单位")
+	private String logpmUnit;
+
+
+
+	@ColumnWidth(20)
+	@ExcelProperty("包装数量")
+	private String packageNum;
 
 }

blade-service/logpm-basic/src/main/java/com/logpm/basic/excel/BasicMaterialImporter.java

@@ -0,0 +1,32 @@
+package com.logpm.basic.excel;
+
+
+
+import com.logpm.basic.service.IBasicMaterialService;
+
+import lombok.RequiredArgsConstructor;
+import org.springblade.core.excel.support.ExcelImporter;
+
+
+
+import java.util.List;
+
+
+
+/**
+ * @program: LogisticsPlatform-Service
+ * @description:
+ * @author: lmy
+ * @create: 2023-08-09 10:26
+ **/
+@RequiredArgsConstructor
+public class BasicMaterialImporter implements ExcelImporter<BasicMaterialExcel> {
+
+	private final IBasicMaterialService service;
+
+
+	@Override
+	public void save(List<BasicMaterialExcel> data) {
+		service.importMaterial(data);
+	}
+}

blade-service/logpm-basic/src/main/java/com/logpm/basic/service/IBasicMaterialService.java

@@ -48,6 +48,14 @@ public interface IBasicMaterialService extends BaseService<BasicMaterialEntity>
 	 * @return
 	 */
 	List<BasicMaterialExcel> exportBasicMaterial(Wrapper<BasicMaterialEntity> queryWrapper);
+	/**
+	 * 导入数据
+	 *
+	 * @param data
+	 * @return
+	 */
+	void importMaterial(List<BasicMaterialExcel> data);
 
 	Boolean saveOrUpdateOwn(BasicMaterialEntity basicMaterial);
+
 }

blade-service/logpm-basic/src/main/java/com/logpm/basic/service/impl/BasicMaterialServiceImpl.java

@@ -19,7 +19,12 @@ package com.logpm.basic.service.impl;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.ObjectMapper;
 import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.alibaba.fastjson.JSON;
+
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.logpm.basic.entity.BasicMaterialEntity;
 import com.logpm.basic.entity.BasicMaterialLogEntity;
 import com.logpm.basic.service.IBasicMaterialLogService;
@@ -27,6 +32,13 @@ import com.logpm.basic.vo.BasicMaterialVO;
 import com.logpm.basic.excel.BasicMaterialExcel;
 import com.logpm.basic.mapper.BasicMaterialMapper;
 import com.logpm.basic.service.IBasicMaterialService;
+import lombok.extern.log4j.Log4j;
+import lombok.extern.log4j.Log4j2;
+import org.springblade.core.log.exception.ServiceException;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.core.tool.utils.Func;
+import org.springblade.system.entity.DictBiz;
 import lombok.AllArgsConstructor;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.stereotype.Service;
@@ -35,7 +47,13 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springframework.transaction.annotation.Transactional;
 
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 /**
  * 物料基础信息 服务实现类
@@ -45,6 +63,7 @@ import java.util.List;
  */
 @Service
 @AllArgsConstructor
+@Log4j2
 public class BasicMaterialServiceImpl extends BaseServiceImpl<BasicMaterialMapper, BasicMaterialEntity> implements IBasicMaterialService {
 
 	private final IBasicMaterialLogService basicMaterialLogService;
@@ -65,6 +84,24 @@ public class BasicMaterialServiceImpl extends BaseServiceImpl<BasicMaterialMappe
 		return basicMaterialList;
 	}
 
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void importMaterial(List<BasicMaterialExcel> data) {
+		log.info("传入参数>>>>>>>>>>>>>>>>{},>>>>>>>>{}",data);
+		ArrayList<BasicMaterialEntity> arrayList = new ArrayList<>();
+		for (BasicMaterialExcel datum : data) {
+			//去重
+			List<BasicMaterialEntity> basicMaterialEntities = baseMapper.selectList(new QueryWrapper<BasicMaterialEntity>().lambda().eq(BasicMaterialEntity::getProductCode,datum.getProductCode()));
+			if (basicMaterialEntities.size()>0){continue;}
+			BasicMaterialEntity copy = BeanUtil.copy(datum, BasicMaterialEntity.class);
+			arrayList.add(copy);
+		}
+		// 根据对象的value属性进行去重
+		List<BasicMaterialEntity> collect = arrayList.stream().collect(Collectors.toMap(BasicMaterialEntity::getProductCode, Function.identity(), (oldValue, newValue) -> oldValue)).values().stream().collect(Collectors.toList());
+		this.saveBatch(collect);
+
+	}
+
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public Boolean saveOrUpdateOwn(BasicMaterialEntity basicMaterial) {

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

@@ -134,7 +134,6 @@ public class BasicdataGoodsAreaController extends BladeController {
 	@ApiOperation(value = "逻辑删除", notes = "传入ids")
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam List<String> ids) {
 		boolean result = basicdataGoodsAreaService.removeGoodsArea(ids);
-
 		return R.status(result);
 	}
 

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

@@ -21,6 +21,7 @@ import com.logpm.basicdata.entity.BasicdataTrayEntity;
 import com.logpm.basicdata.excel.BasicdataTrayExcel;
 import com.logpm.basicdata.service.IBasicdataTrayService;
 import com.logpm.basicdata.vo.BasicdataTrayVO;
+import com.logpm.basicdata.vo.WarehouseParcelListVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -69,6 +70,16 @@ public class BasicdataTrayController extends BladeController {
 		BasicdataTrayEntity detail = trayService.getOne(Condition.getQueryWrapper(BasicdataTray));
 		return R.data(detail);
 	}
+	/**
+	 * 托盘 包条详情
+	 */
+	@GetMapping("/packageList")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入BasicdataTray")
+	public R<IPage<WarehouseParcelListVO>> packageList(BasicdataTrayVO BasicdataTray, Query query) {
+		IPage<WarehouseParcelListVO> list = trayService.getpackageList(Condition.getPage(query), BasicdataTray);
+		return R.data(list);
+	}
 	/**
 	 * 托盘 分页
 	 */

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

@@ -31,15 +31,14 @@
         <result column="qr_code_url" property="qrCodeUrl"/>
         <result column="template_id" property="templateId"/>
     </resultMap>
-    <update id="removeGoodsShelf">
+    <delete id="removeGoodsShelf">
-        UPDATE logpm_warehouse_goods_shelf
+        delete from logpm_warehouse_goods_shelf
-        SET is_deleted = 1
         WHERE
             NOT EXISTS (
                 SELECT
                     goods_allocation.id  FROM logpm_warehouse_goods_allocation AS goods_allocation  WHERE  goods_allocation.goods_shelf_id = #{id}  AND goods_allocation.is_deleted=0)
           AND id=#{id}
-	</update>
+    </delete>
 
 
     <select id="selectBasicdataGoodsShelfPage" resultMap="BasicdataGoodsShelfResultMap">

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

@@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.logpm.basicdata.entity.BasicdataTrayEntity;
 import com.logpm.basicdata.excel.BasicdataTrayExcel;
 import com.logpm.basicdata.vo.BasicdataTrayVO;
+import com.logpm.basicdata.vo.WarehouseParcelListVO;
 import org.apache.ibatis.annotations.Param;
 import java.util.List;
 import java.util.Map;
@@ -53,4 +54,8 @@ public interface BasicdataTrayMapper extends BaseMapper<BasicdataTrayEntity> {
 	List<BasicdataTrayExcel> exportBasicdataTray(@Param("ew") Wrapper<BasicdataTrayEntity> queryWrapper);
 
 	IPage<BasicdataTrayVO> selectTrayList(IPage<Object> page,@Param("po") Map<String, Object> basicdataTray);
+	/**
+	 * 托盘 查看包件
+	 */
+    List<WarehouseParcelListVO> selectPackageList(IPage<WarehouseParcelListVO> page,@Param("param") BasicdataTrayVO basicdataTray);
 }

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

@@ -65,16 +65,19 @@
         <where>
             tray.is_deleted = '0'
             <if test="po.warehouseId !=null and po.warehouseId != ''">
-                and tray.warehouseId = #{po.warehouseId}
+                and warehouse.id = #{po.warehouseId}
             </if>
             <if test="po.trayStatus !=null and po.trayStatus != ''">
-                and tray.warehouseId = #{po.warehouseId}
+                and tray.tray_status = #{po.trayStatus}
             </if>
             <if test="po.type !=null and po.type != ''">
                 and tray.type = #{po.type}
             </if>
         </where>
     </select>
+    <select id="selectPackageList" resultType="com.logpm.basicdata.vo.WarehouseParcelListVO">
+
+    </select>
 
 
 </mapper>

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

@@ -22,6 +22,7 @@ import com.logpm.basicdata.dto.BasicdataTrayDTO;
 import com.logpm.basicdata.entity.BasicdataTrayEntity;
 import com.logpm.basicdata.excel.BasicdataTrayExcel;
 import com.logpm.basicdata.vo.BasicdataTrayVO;
+import com.logpm.basicdata.vo.WarehouseParcelListVO;
 import org.springblade.core.mp.base.BaseService;
 import java.util.List;
 import java.util.Map;
@@ -65,4 +66,9 @@ public interface IBasicdataTrayService extends BaseService<BasicdataTrayEntity>
 	 * @return
 	 */
 	IPage<BasicdataTrayVO> selectTrayList(IPage<Object> page, Map<String, Object> basicdataTray);
+
+	/**
+	 * 托盘 包条详情
+	 */
+	IPage<WarehouseParcelListVO> getpackageList(IPage<WarehouseParcelListVO> page, BasicdataTrayVO basicdataTray);
 }

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

@@ -20,11 +20,17 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
 import com.logpm.basic.feign.IBasicTenantCodeClient;
 import com.logpm.basicdata.dto.BasicdataTrayDTO;
 import com.logpm.basicdata.entity.BasicdataTrayEntity;
+import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
 import com.logpm.basicdata.excel.BasicdataTrayExcel;
+import com.logpm.basicdata.feign.BasicdataCodeClient;
+import com.logpm.basicdata.feign.IBasicdataCodeClient;
 import com.logpm.basicdata.mapper.BasicdataTrayMapper;
+import com.logpm.basicdata.mapper.BasicdataWarehouseMapper;
 import com.logpm.basicdata.service.IBasicdataTrayService;
 import com.logpm.basicdata.vo.BasicdataTrayVO;
+import com.logpm.basicdata.vo.WarehouseParcelListVO;
 import lombok.AllArgsConstructor;
+import org.springblade.common.constant.CodeNumConstant;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
@@ -54,6 +60,10 @@ public class BasicdataTrayServiceImpl extends BaseServiceImpl<BasicdataTrayMappe
 
 	private IBasicTenantCodeClient tenantCodeClient;
 
+	private IBasicdataCodeClient basicdataCodeClient;
+
+	private BasicdataWarehouseMapper basicdataWarehouseMapper;
+
 	@Override
 	public IPage<BasicdataTrayVO> selectBasicdataTrayPage(IPage<BasicdataTrayVO> page, BasicdataTrayVO BasicdataTray) {
 		return page.setRecords(baseMapper.selectBasicdataTrayPage(page, BasicdataTray));
@@ -76,27 +86,33 @@ public class BasicdataTrayServiceImpl extends BaseServiceImpl<BasicdataTrayMappe
 		BasicdataTrayEntity basicdataTrayEntity =null;
 		boolean result = false;
 		if (Func.isEmpty(basicdataTrayDTO)){
+			log.warn("无参数");
 			return false;
 		}else {
 			Integer number = basicdataTrayDTO.getNumber();
+			//查询仓库编号
+			BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseMapper.selectById(basicdataTrayDTO.getWarehouseId());
+			ArrayList<BasicdataTrayEntity> basicdataTrayEntities = new ArrayList<>();
 			for (Integer i = 0; i < number; i++) {
 				basicdataTrayEntity = new BasicdataTrayEntity();
 				BeanUtils.copyProperties(basicdataTrayDTO,basicdataTrayEntity);
-				String trayCode = tenantCodeClient.shelfCode(AuthUtil.getTenantId(), "6");
+				//String trayCode = tenantCodeClient.shelfCode(AuthUtil.getTenantId(), "6");
-				basicdataTrayEntity.setTrayStatus("1");
+				String trayCode = basicdataCodeClient.getCodeByType(CodeNumConstant.TRAYS,basicdataWarehouseEntity.getWarehouseCode(),null);
-				String uuid = "1" + Func.random(18, RandomType.INT).trim();
+				//	basicdataTrayEntity.setTrayStatus("1");
-				long id = Long.parseLong(uuid);
+				//String uuid = "1" + Func.random(18, RandomType.INT).trim();
-				BladeUser user = AuthUtil.getUser();
+				//long id = Long.parseLong(uuid);
-				basicdataTrayEntity.setCreateUser(user.getUserId());
+//				BladeUser user = AuthUtil.getUser();
-				basicdataTrayEntity.setCreateTime(new Date());
+//				basicdataTrayEntity.setCreateUser(user.getUserId());
-				basicdataTrayEntity.setCreateDept(Long.valueOf(user.getDeptId()));
+//				basicdataTrayEntity.setCreateTime(new Date());
-				basicdataTrayEntity.setTenantId(user.getTenantId());
+//				basicdataTrayEntity.setCreateDept(Long.valueOf(user.getDeptId()));
-				basicdataTrayEntity.setIsDeleted(0);
+//				basicdataTrayEntity.setTenantId(user.getTenantId());
-				basicdataTrayEntity.setStatus(1);
+//				basicdataTrayEntity.setIsDeleted(0);
-				basicdataTrayEntity.setId(id);
+//				basicdataTrayEntity.setStatus(1);
-				basicdataTrayEntity.setPalletCode(trayCode+"--"+id);
+				//	basicdataTrayEntity.setId(id);
-				result = this.save(basicdataTrayEntity);
+				basicdataTrayEntity.setPalletCode(trayCode);
+				basicdataTrayEntities.add(basicdataTrayEntity);
 			}
+			result = this.saveBatch(basicdataTrayEntities);
 		}
 		return result;
 	}
@@ -107,4 +123,11 @@ public class BasicdataTrayServiceImpl extends BaseServiceImpl<BasicdataTrayMappe
 		return trayList;
 	}
 
+	@Override
+	public IPage<WarehouseParcelListVO> getpackageList(IPage<WarehouseParcelListVO> page, BasicdataTrayVO basicdataTray) {
+		List<WarehouseParcelListVO>	list = trayMapper.selectPackageList(page,basicdataTray);
+		return page.setRecords(list);
+	}
+
+
 }

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseRetentionRecordController.java

@@ -0,0 +1,151 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.warehouse.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.warehouse.entity.WarehouseRetentionRecordEntity;
+import com.logpm.warehouse.vo.WarehouseRetentionRecordVO;
+import com.logpm.warehouse.excel.WarehouseRetentionRecordExcel;
+import com.logpm.warehouse.wrapper.WarehouseRetentionRecordWrapper;
+import com.logpm.warehouse.service.IWarehouseRetentionRecordService;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.tool.constant.BladeConstant;
+import springfox.documentation.annotations.ApiIgnore;
+import java.util.Map;
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * 滞留记录 控制器
+ *
+ * @author lmy
+ * @since 2023-08-09
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/warehouseRetentionRecord")
+@Api(value = "滞留记录", tags = "滞留记录接口")
+public class WarehouseRetentionRecordController extends BladeController {
+
+	private final IWarehouseRetentionRecordService warehouseRetentionRecordService;
+
+	/**
+	 * 滞留记录 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入warehouseRetentionRecord")
+	public R<WarehouseRetentionRecordVO> detail(WarehouseRetentionRecordEntity warehouseRetentionRecord) {
+		WarehouseRetentionRecordEntity detail = warehouseRetentionRecordService.getOne(Condition.getQueryWrapper(warehouseRetentionRecord));
+		return R.data(WarehouseRetentionRecordWrapper.build().entityVO(detail));
+	}
+	/**
+	 * 滞留记录 分页
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入warehouseRetentionRecord")
+	public R<IPage<WarehouseRetentionRecordVO>> list(@ApiIgnore @RequestParam Map<String, Object> warehouseRetentionRecord, Query query) {
+		IPage<WarehouseRetentionRecordEntity> pages = warehouseRetentionRecordService.page(Condition.getPage(query), Condition.getQueryWrapper(warehouseRetentionRecord, WarehouseRetentionRecordEntity.class));
+		return R.data(WarehouseRetentionRecordWrapper.build().pageVO(pages));
+	}
+
+	/**
+	 * 滞留记录 自定义分页
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入warehouseRetentionRecord")
+	public R<IPage<WarehouseRetentionRecordVO>> page(WarehouseRetentionRecordVO warehouseRetentionRecord, Query query) {
+		IPage<WarehouseRetentionRecordVO> pages = warehouseRetentionRecordService.selectWarehouseRetentionRecordPage(Condition.getPage(query), warehouseRetentionRecord);
+		return R.data(pages);
+	}
+
+	/**
+	 * 滞留记录 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入warehouseRetentionRecord")
+	public R save(@Valid @RequestBody WarehouseRetentionRecordEntity warehouseRetentionRecord) {
+		return R.status(warehouseRetentionRecordService.save(warehouseRetentionRecord));
+	}
+
+	/**
+	 * 滞留记录 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入warehouseRetentionRecord")
+	public R update(@Valid @RequestBody WarehouseRetentionRecordEntity warehouseRetentionRecord) {
+		return R.status(warehouseRetentionRecordService.updateById(warehouseRetentionRecord));
+	}
+
+	/**
+	 * 滞留记录 新增或修改
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入warehouseRetentionRecord")
+	public R submit(@Valid @RequestBody WarehouseRetentionRecordEntity warehouseRetentionRecord) {
+		return R.status(warehouseRetentionRecordService.saveOrUpdate(warehouseRetentionRecord));
+	}
+
+	/**
+	 * 滞留记录 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(warehouseRetentionRecordService.deleteLogic(Func.toLongList(ids)));
+	}
+
+
+	/**
+	 * 导出数据
+	 */
+	@GetMapping("/export-warehouseRetentionRecord")
+	@ApiOperationSupport(order = 9)
+	@ApiOperation(value = "导出数据", notes = "传入warehouseRetentionRecord")
+	public void exportWarehouseRetentionRecord(@ApiIgnore @RequestParam Map<String, Object> warehouseRetentionRecord, BladeUser bladeUser, HttpServletResponse response) {
+		QueryWrapper<WarehouseRetentionRecordEntity> queryWrapper = Condition.getQueryWrapper(warehouseRetentionRecord, WarehouseRetentionRecordEntity.class);
+		//if (!AuthUtil.isAdministrator()) {
+		//	queryWrapper.lambda().eq(WarehouseRetentionRecord::getTenantId, bladeUser.getTenantId());
+		//}
+		queryWrapper.lambda().eq(WarehouseRetentionRecordEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+		List<WarehouseRetentionRecordExcel> list = warehouseRetentionRecordService.exportWarehouseRetentionRecord(queryWrapper);
+		ExcelUtil.export(response, "滞留记录数据" + DateUtil.time(), "滞留记录数据表", list, WarehouseRetentionRecordExcel.class);
+	}
+
+}

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/WarehouseRetentionRecordDTO.java

@@ -0,0 +1,34 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.warehouse.dto;
+
+import com.logpm.warehouse.entity.WarehouseRetentionRecordEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 滞留记录 数据传输对象实体类
+ *
+ * @author BladeX
+ * @since 2023-08-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class WarehouseRetentionRecordDTO extends WarehouseRetentionRecordEntity {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/excel/WarehouseRetentionRecordExcel.java

@@ -0,0 +1,177 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.warehouse.excel;
+
+
+import lombok.Data;
+
+import java.util.Date;
+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 java.io.Serializable;
+
+
+/**
+ * 滞留记录 Excel实体类
+ *
+ * @author BladeX
+ * @since 2023-08-09
+ */
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class WarehouseRetentionRecordExcel implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 租户号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("租户号")
+	private String 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;
+	/**
+	 * 预留5
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留5")
+	private String reserve5;
+	/**
+	 * 订单自编码
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("订单自编码")
+	private String orderCode;
+	/**
+	 * 包件码
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("包件码")
+	private String packageCode;
+	/**
+	 * 运单号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("运单号")
+	private String waybillNo;
+	/**
+	 * 滞留车次号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("滞留车次号")
+	private Long retentionCarId;
+	/**
+	 * 滞留车次号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("滞留车次号")
+	private String retentionCarNo;
+	/**
+	 * 滞留仓库id
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("滞留仓库id")
+	private Long retentionWarehouseId;
+	/**
+	 * 滞留仓库名称
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("滞留仓库名称")
+	private String retentionWarehouseName;
+	/**
+	 * 滞留类型;1=装车滞留，2=配送滞留，3=取消滞留,4=出库滞留
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("滞留类型;1=装车滞留，2=配送滞留，3=取消滞留,4=出库滞留")
+	private Integer retentionType;
+	/**
+	 * 装车时间
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("装车时间")
+	private Date assembleCarDate;
+	/**
+	 * 装车人id
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("装车人id")
+	private Long assembleCarPersonId;
+	/**
+	 * 装车人名称
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("装车人名称")
+	private String assembleCarPersonName;
+	/**
+	 * 备注
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("备注")
+	private String remark;
+	/**
+	 * 取消滞留人id
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("取消滞留人id")
+	private Long cancelRetentionUserId;
+	/**
+	 * 取消滞留人名称
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("取消滞留人名称")
+	private String cancelRetentionUserName;
+	/**
+	 * 取消滞留备注
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("取消滞留备注")
+	private String cancelRemark;
+
+}

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseRetentionRecordClient.java

@@ -0,0 +1,53 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.warehouse.feign;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import lombok.AllArgsConstructor;
+import org.springblade.core.mp.support.BladePage;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import com.logpm.warehouse.entity.WarehouseRetentionRecordEntity;
+import com.logpm.warehouse.service.IWarehouseRetentionRecordService;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
+
+/**
+ * 滞留记录 Feign实现类
+ *
+ * @author BladeX
+ * @since 2023-08-09
+ */
+@ApiIgnore()
+@RestController
+@AllArgsConstructor
+public class WarehouseRetentionRecordClient implements IWarehouseRetentionRecordClient {
+
+	private final IWarehouseRetentionRecordService warehouseRetentionRecordService;
+
+	@Override
+	@GetMapping(TOP)
+	public BladePage<WarehouseRetentionRecordEntity> top(Integer current, Integer size) {
+		Query query = new Query();
+		query.setCurrent(current);
+		query.setSize(size);
+		IPage<WarehouseRetentionRecordEntity> page = warehouseRetentionRecordService.page(Condition.getPage(query));
+		return BladePage.of(page);
+	}
+
+}

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseRetentionRecordMapper.java

@@ -0,0 +1,54 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.warehouse.mapper;
+
+import com.logpm.warehouse.entity.WarehouseRetentionRecordEntity;
+import com.logpm.warehouse.vo.WarehouseRetentionRecordVO;
+import com.logpm.warehouse.excel.WarehouseRetentionRecordExcel;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
+import java.util.List;
+
+/**
+ * 滞留记录 Mapper 接口
+ *
+ * @author BladeX
+ * @since 2023-08-09
+ */
+public interface WarehouseRetentionRecordMapper extends BaseMapper<WarehouseRetentionRecordEntity> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param warehouseRetentionRecord
+	 * @return
+	 */
+	List<WarehouseRetentionRecordVO> selectWarehouseRetentionRecordPage(IPage page, WarehouseRetentionRecordVO warehouseRetentionRecord);
+
+
+	/**
+	 * 获取导出数据
+	 *
+	 * @param queryWrapper
+	 * @return
+	 */
+	List<WarehouseRetentionRecordExcel> exportWarehouseRetentionRecord(@Param("ew") Wrapper<WarehouseRetentionRecordEntity> queryWrapper);
+
+}

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseRetentionRecordMapper.xml

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.logpm.warehouse.mapper.WarehouseRetentionRecordMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="warehouseRetentionRecordResultMap" type="com.logpm.warehouse.entity.WarehouseRetentionRecordEntity">
+        <result column="id" property="id"/>
+        <result column="tenant_id" property="tenantId"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="status" property="status"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="create_dept" property="createDept"/>
+        <result column="reserve1" property="reserve1"/>
+        <result column="reserve2" property="reserve2"/>
+        <result column="reserve3" property="reserve3"/>
+        <result column="reserve4" property="reserve4"/>
+        <result column="reserve5" property="reserve5"/>
+        <result column="order_code" property="orderCode"/>
+        <result column="package_code" property="packageCode"/>
+        <result column="waybill_no" property="waybillNo"/>
+        <result column="retention_car_id" property="retentionCarId"/>
+        <result column="retention_car_no" property="retentionCarNo"/>
+        <result column="retention_warehouse_id" property="retentionWarehouseId"/>
+        <result column="retention_warehouse_name" property="retentionWarehouseName"/>
+        <result column="retention_type" property="retentionType"/>
+        <result column="assemble_car_date" property="assembleCarDate"/>
+        <result column="assemble_car_person_id" property="assembleCarPersonId"/>
+        <result column="assemble_car_person_name" property="assembleCarPersonName"/>
+        <result column="remark" property="remark"/>
+        <result column="cancel_retention_user_id" property="cancelRetentionUserId"/>
+        <result column="cancel_retention_user_name" property="cancelRetentionUserName"/>
+        <result column="cancel_remark" property="cancelRemark"/>
+    </resultMap>
+
+
+    <select id="selectWarehouseRetentionRecordPage" resultMap="warehouseRetentionRecordResultMap">
+        select * from logpm_warehouse_retention_record where is_deleted = 0
+    </select>
+
+
+    <select id="exportWarehouseRetentionRecord" resultType="com.logpm.warehouse.excel.WarehouseRetentionRecordExcel">
+        SELECT * FROM logpm_warehouse_retention_record ${ew.customSqlSegment}
+    </select>
+
+</mapper>

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseRetentionRecordService.java

@@ -0,0 +1,52 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.warehouse.service;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.logpm.warehouse.entity.WarehouseRetentionRecordEntity;
+import com.logpm.warehouse.vo.WarehouseRetentionRecordVO;
+import com.logpm.warehouse.excel.WarehouseRetentionRecordExcel;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseService;
+import java.util.List;
+
+/**
+ * 滞留记录 服务类
+ *
+ * @author BladeX
+ * @since 2023-08-09
+ */
+public interface IWarehouseRetentionRecordService extends BaseService<WarehouseRetentionRecordEntity> {
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param warehouseRetentionRecord
+	 * @return
+	 */
+	IPage<WarehouseRetentionRecordVO> selectWarehouseRetentionRecordPage(IPage<WarehouseRetentionRecordVO> page, WarehouseRetentionRecordVO warehouseRetentionRecord);
+
+
+	/**
+	 * 导出数据
+	 *
+	 * @param queryWrapper
+	 * @return
+	 */
+	List<WarehouseRetentionRecordExcel> exportWarehouseRetentionRecord(Wrapper<WarehouseRetentionRecordEntity> queryWrapper);
+
+}

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseRetentionRecordServiceImpl.java

@@ -0,0 +1,54 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.warehouse.service.impl;
+
+import com.logpm.warehouse.entity.WarehouseRetentionRecordEntity;
+import com.logpm.warehouse.vo.WarehouseRetentionRecordVO;
+import com.logpm.warehouse.excel.WarehouseRetentionRecordExcel;
+import com.logpm.warehouse.mapper.WarehouseRetentionRecordMapper;
+import com.logpm.warehouse.service.IWarehouseRetentionRecordService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import java.util.List;
+
+/**
+ * 滞留记录 服务实现类
+ *
+ * @author BladeX
+ * @since 2023-08-09
+ */
+@Service
+public class WarehouseRetentionRecordServiceImpl extends BaseServiceImpl<WarehouseRetentionRecordMapper, WarehouseRetentionRecordEntity> implements IWarehouseRetentionRecordService {
+
+	@Override
+	public IPage<WarehouseRetentionRecordVO> selectWarehouseRetentionRecordPage(IPage<WarehouseRetentionRecordVO> page, WarehouseRetentionRecordVO warehouseRetentionRecord) {
+		return page.setRecords(baseMapper.selectWarehouseRetentionRecordPage(page, warehouseRetentionRecord));
+	}
+
+
+	@Override
+	public List<WarehouseRetentionRecordExcel> exportWarehouseRetentionRecord(Wrapper<WarehouseRetentionRecordEntity> queryWrapper) {
+		List<WarehouseRetentionRecordExcel> warehouseRetentionRecordList = baseMapper.exportWarehouseRetentionRecord(queryWrapper);
+		//warehouseRetentionRecordList.forEach(warehouseRetentionRecord -> {
+		//	warehouseRetentionRecord.setTypeName(DictCache.getValue(DictEnum.YES_NO, WarehouseRetentionRecord.getType()));
+		//});
+		return warehouseRetentionRecordList;
+	}
+
+}

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/wrapper/WarehouseRetentionRecordWrapper.java

@@ -0,0 +1,50 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.warehouse.wrapper;
+
+import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.tool.utils.BeanUtil;
+import com.logpm.warehouse.entity.WarehouseRetentionRecordEntity;
+import com.logpm.warehouse.vo.WarehouseRetentionRecordVO;
+import java.util.Objects;
+
+/**
+ * 滞留记录 包装类,返回视图层所需的字段
+ *
+ * @author BladeX
+ * @since 2023-08-09
+ */
+public class WarehouseRetentionRecordWrapper extends BaseEntityWrapper<WarehouseRetentionRecordEntity, WarehouseRetentionRecordVO>  {
+
+	public static WarehouseRetentionRecordWrapper build() {
+		return new WarehouseRetentionRecordWrapper();
+	}
+
+	@Override
+	public WarehouseRetentionRecordVO entityVO(WarehouseRetentionRecordEntity warehouseRetentionRecord) {
+		WarehouseRetentionRecordVO warehouseRetentionRecordVO = Objects.requireNonNull(BeanUtil.copy(warehouseRetentionRecord, WarehouseRetentionRecordVO.class));
+
+		//User createUser = UserCache.getUser(warehouseRetentionRecord.getCreateUser());
+		//User updateUser = UserCache.getUser(warehouseRetentionRecord.getUpdateUser());
+		//warehouseRetentionRecordVO.setCreateUserName(createUser.getName());
+		//warehouseRetentionRecordVO.setUpdateUserName(updateUser.getName());
+
+		return warehouseRetentionRecordVO;
+	}
+
+
+}