滞留列表

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

@@ -26,6 +26,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import org.springblade.core.tenant.mp.TenantEntity;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 
@@ -168,6 +169,7 @@ public class WarehouseRetentionScanEntity extends TenantEntity {
 	 * 滞留扫描时间
 	 */
 	@ApiModelProperty(value = "滞留扫描时间")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	private Date retentionScanTime;
 	/**
 	 * 滞留方式 1-PDA、2-PC

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

@@ -16,6 +16,7 @@
  */
 package com.logpm.warehouse.controller;
 
+import com.logpm.warehouse.dto.WarehouseRetentionScanDTO;
 import com.logpm.warehouse.entity.WarehouseRetentionScanEntity;
 import com.logpm.warehouse.excel.WarehouseRetentionScanExcel;
 import com.logpm.warehouse.service.IWarehouseRetentionScanService;
@@ -89,7 +90,7 @@ public class WarehouseRetentionScanController extends BladeController {
 	@GetMapping("/page")
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "分页", notes = "传入warehouseRetentionScan")
-	public R<IPage<WarehouseRetentionScanVO>> page(WarehouseRetentionScanVO warehouseRetentionScan, Query query) {
+	public R<IPage<WarehouseRetentionScanVO>> page(WarehouseRetentionScanDTO warehouseRetentionScan, Query query) {
 		IPage<WarehouseRetentionScanVO> pages = warehouseRetentionScanService.selectWarehouseRetentionRecordPage(Condition.getPage(query), warehouseRetentionScan);
 		return R.data(pages);
 	}
@@ -141,14 +142,10 @@ public class WarehouseRetentionScanController extends BladeController {
 	@GetMapping("/export-warehouseRetentionScan")
 	@ApiOperationSupport(order = 9)
 	@ApiOperation(value = "导出数据", notes = "传入warehouseRetentionScan")
-	public void exportWarehouseRetentionScan(@ApiIgnore @RequestParam Map<String, Object> warehouseRetentionScan, BladeUser bladeUser, HttpServletResponse response) {
+	public void exportWarehouseRetentionScan(WarehouseRetentionScanDTO warehouseRetentionScan,HttpServletResponse response) {
-		QueryWrapper<WarehouseRetentionScanEntity> queryWrapper = Condition.getQueryWrapper(warehouseRetentionScan, WarehouseRetentionScanEntity.class);
+		List<WarehouseRetentionScanExcel> warehouseRetentionScanExcelList = warehouseRetentionScanService.getExportWarehouseRetentionScanList(warehouseRetentionScan);
-		//if (!AuthUtil.isAdministrator()) {
+
-		//	queryWrapper.lambda().eq(WarehouseRetentionScan::getTenantId, bladeUser.getTenantId());
+		ExcelUtil.export(response, "滞留扫描记录数据" + DateUtil.time(), "滞留扫描记录数据表", warehouseRetentionScanExcelList, WarehouseRetentionScanExcel.class);
-		//}
-		queryWrapper.lambda().eq(WarehouseRetentionScanEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
-		List<WarehouseRetentionScanExcel> list = warehouseRetentionScanService.exportWarehouseRetentionRecord(queryWrapper);
-		ExcelUtil.export(response, "滞留扫描记录数据" + DateUtil.time(), "滞留扫描记录数据表", list, WarehouseRetentionScanExcel.class);
 	}
 
 }

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

@@ -20,6 +20,8 @@ import com.logpm.warehouse.entity.WarehouseRetentionScanEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.List;
+
 /**
  * 滞留扫描记录 数据传输对象实体类
  *
@@ -31,4 +33,21 @@ import lombok.EqualsAndHashCode;
 public class WarehouseRetentionScanDTO extends WarehouseRetentionScanEntity {
 	private static final long serialVersionUID = 1L;
 
+	/**
+	 * 日期搜索
+	 */
+	private String scanDate;
+
+	/**
+	 * 日期区间搜索
+	 */
+	private String scanDateStart;
+
+	/**
+	 * 日期区间搜索
+	 */
+	private String scanDateEnd;
+
+	private List<Long> warehouseListId;
+
 }

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

@@ -41,161 +41,107 @@ public class WarehouseRetentionScanExcel 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 trainNumber;
+
 	/**
-	 * 订单ID
+	 * 预约单号
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("订单ID")
-	private Long orderId;
-	/**
-	 * 库存品ID
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("库存品ID")
-	private Long inventoryId;
-	/**
-	 * 滞留类型 1-包件、2-零担(这里会关联到具体的品类)、3-库存品
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("滞留类型 1-包件、2-零担(这里会关联到具体的品类)、3-库存品")
-	private Integer conditions;
-	/**
-	 * 物料编码(库存品)
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("物料编码(库存品)")
-	private String materialNumber;
-	/**
-	 * 物料名称(库存品)
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("物料名称(库存品)")
+	@ExcelProperty("预约单号")
-	private String materialName;
+	private String reservationCode;
+
 	/**
-	 * 预约客户ID
+	 * 预约单号
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("预约客户ID")
+	@ExcelProperty("运单号")
-	private Long reservationId;
+	private String waybillNumber;
+
 	/**
 	 * 订单自编号(库存品没有)
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("订单自编号(库存品没有)")
+	@ExcelProperty("订单自编号")
 	private String orderCode;
+
 	/**
-	 * 预约单号
+	 * 包条码
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("预约单号")
-	private String reservationCode;
-	/**
-	 * 扫描类型:1-包件、2-订单、3-托盘、4...
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("扫描类型:1-包件、2-订单、3-托盘、4...")
+	@ExcelProperty("包条码")
-	private Integer scanType;
+	private String orderPackageCode;
+
 	/**
-	 * 包件ID
+	 * 物料编码(库存品)
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("包件ID")
+	@ExcelProperty("物料编码")
-	private Long orderPackageId;
+	private String materialNumber;
+
+
 	/**
-	 * 包条码
+	 * 物料名称(库存品)
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("包条码")
+	@ExcelProperty("物料名称")
-	private String orderPackageCode;
+	private String materialName;
+
 	/**
-	 * 滞留数量
+	 * 滞留扫描时间
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("滞留数量")
+	@ExcelProperty("滞留扫描时间")
-	private Integer retentionQuantity;
+	private Date retentionScanTime;
+
 	/**
 	 * 滞留扫描操作人名称
 	 */
 	@ColumnWidth(20)
 	@ExcelProperty("滞留扫描操作人名称")
 	private String retentionScanUsername;
+
 	/**
-	 * 滞留扫描操作人Id
+	 * 滞留数量
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("滞留扫描操作人Id")
+	@ExcelProperty("滞留数量")
-	private String retentionScanUserId;
+	private Integer retentionQuantity;
+
+
 	/**
-	 * 滞留操作备注
+	 * 订单自编号(库存品没有)
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("滞留操作备注")
+	@ExcelProperty("仓库")
-	private String remarks;
+	private String warehouseName;
+
 	/**
-	 * 滞留扫描时间
+	 * 滞留方式 1-PDA、2-PC
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("滞留扫描时间")
+	@ExcelProperty("滞留方式 1-PDA、2-PC")
-	private Date retentionScanTime;
+	private String retentionWay;
+
+
 	/**
-	 * 滞留方式 1-PDA、2-PC
+	 * 滞留类型
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("滞留方式 1-PDA、2-PC")
+	@ExcelProperty("滞留货物类型")
-	private Integer retentionWay;
+	private String conditions;
+
+
 	/**
-	 * 配送任务ID
+	 * 滞留操作备注
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("配送任务ID")
+	@ExcelProperty("备注")
-	private Long deliveryListId;
+	private String remarks;
 
 }

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

@@ -16,6 +16,7 @@
  */
 package com.logpm.warehouse.mapper;
 
+import com.logpm.warehouse.dto.WarehouseRetentionScanDTO;
 import com.logpm.warehouse.entity.WarehouseRetentionRecordEntity;
 import com.logpm.warehouse.entity.WarehouseRetentionScanEntity;
 import com.logpm.warehouse.excel.WarehouseRetentionScanExcel;
@@ -43,7 +44,7 @@ public interface WarehouseRetentionScanMapper extends BaseMapper<WarehouseRetent
 	 * @param warehouseRetentionScanVO
 	 * @return
 	 */
-	List<WarehouseRetentionScanVO> selectWarehouseRetentionRecordPage(IPage page, WarehouseRetentionScanVO warehouseRetentionScanVO);
+	List<WarehouseRetentionScanVO> selectWarehouseRetentionRecordPage(IPage page,@Param("param") WarehouseRetentionScanDTO warehouseRetentionScanVO);
 
 
 	/**
@@ -54,4 +55,11 @@ public interface WarehouseRetentionScanMapper extends BaseMapper<WarehouseRetent
 	 */
 	List<WarehouseRetentionScanExcel> exportWarehouseRetentionRecord(@Param("ew") Wrapper<WarehouseRetentionScanEntity> queryWrapper);
 
+	/**
+	 * 查询导出列表数据
+	 * @param warehouseRetentionScan
+	 * @return
+	 */
+	List<WarehouseRetentionScanExcel> getExportWarehouseRetentionScanList(@Param("param") WarehouseRetentionScanDTO warehouseRetentionScan);
+
 }

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

@@ -41,12 +41,118 @@
 
 
     <select id="selectWarehouseRetentionRecordPage" resultMap="warehouseRetentionRecordResultMap">
-        select * from logpm_warehouse_retention_scan where is_deleted = 0 ORDER BY create_time DESC
+        select * from logpm_warehouse_retention_scan
+        <where>
+            is_deleted = 0
+            <if test="param.orderCode != null and param.orderCode != ''">
+                AND order_code like concat(#{param.orderCode},'%')
+            </if>
+            <if test="param.trainNumber != null and param.trainNumber != ''">
+                AND train_number like concat(#{param.trainNumber},'%')
+            </if>
+            <if test="param.reservationCode != null and param.reservationCode != ''">
+                AND reservation_code like concat(#{param.reservationCode},'%')
+            </if>
+            <if test="param.reservationCode != null and param.reservationCode != ''">
+                AND reservation_code like concat(#{param.reservationCode},'%')
+            </if>
+            <if test="param.waybillNumber != null and param.waybillNumber != ''">
+                AND waybill_number like concat(#{param.waybillNumber},'%')
+            </if>
+            <if test="param.orderPackageCode != null and param.orderPackageCode != ''">
+                AND order_package_code like concat(#{param.orderPackageCode},'%')
+            </if>
+            <if test="param.materialNumber != null and param.materialNumber != ''">
+                AND material_number like concat(#{param.materialNumber},'%')
+            </if>
+            <if test="param.materialName != null and param.materialName != ''">
+                AND material_name like concat(#{param.materialName},'%')
+            </if>
+            <if test="param.warehouseListId != null ">
+                AND warehouse_id IN
+                <foreach collection="param.warehouseListId" item="item" index="index" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="param.scanDate != null ">
+                AND DATE_FORMAT(create_time,'%y%m%d') = DATE_FORMAT(#{param.scanDate},'%y%m%d')
+            </if>
+            <if test="param.scanDateStart != null ">
+                AND DATE_FORMAT(create_time,'%y%m%d') BETWEEN DATE_FORMAT(#{param.scanDateStart},'%y%m%d') AND DATE_FORMAT(#{param.scanDateEnd},'%y%m%d')
+            </if>
+        </where>
+        ORDER BY create_time DESC
     </select>
 
 
     <select id="exportWarehouseRetentionRecord" resultType="com.logpm.warehouse.excel.WarehouseRetentionScanExcel">
         SELECT * FROM logpm_warehouse_retention_scan ${ew.customSqlSegment}
     </select>
+    <select id="getExportWarehouseRetentionScanList"
+            resultType="com.logpm.warehouse.excel.WarehouseRetentionScanExcel">
+        SELECT
+        train_number AS trainNumber,
+        order_code AS orderCode,
+        reservation_code AS reservationCode,
+        waybill_number AS waybillNumber,
+        order_package_code AS orderPackageCode,
+        material_number AS materialNumber,
+        material_name AS materialName,
+        retention_scan_time AS retentionScanTime,
+        retention_scan_username AS retentionScanUsername,
+        retention_quantity AS retentionQuantity,
+        warehouse_name AS warehouseName,
+        CASE retention_way
+        WHEN 1 THEN '扫描'
+        WHEN 2 THEN '文员'
+        END retentionWay,
+        CASE conditions
+        WHEN 1 THEN '包件'
+        WHEN 2 THEN '库存品'
+        WHEN 1 THEN '零担'
+        END conditions
+        FROM
+        logpm_warehouse_retention_scan
+        <where>
+            is_deleted = 0
+            <if test="param.orderCode != null and param.orderCode != ''">
+                AND order_code like concat(#{param.orderCode},'%')
+            </if>
+            <if test="param.trainNumber != null and param.trainNumber != ''">
+                AND train_number like concat(#{param.trainNumber},'%')
+            </if>
+            <if test="param.waybillNumber != null and param.waybillNumber != ''">
+                AND waybill_number like concat(#{param.waybillNumber},'%')
+            </if>
+            <if test="param.reservationCode != null and param.reservationCode != ''">
+                AND reservation_code like concat(#{param.reservationCode},'%')
+            </if>
+            <if test="param.reservationCode != null and param.reservationCode != ''">
+                AND reservation_code like concat(#{param.reservationCode},'%')
+            </if>
+            <if test="param.orderPackageCode != null and param.orderPackageCode != ''">
+                AND order_package_code like concat(#{param.orderPackageCode},'%')
+            </if>
+            <if test="param.materialNumber != null and param.materialNumber != ''">
+                AND material_number like concat(#{param.materialNumber},'%')
+            </if>
+            <if test="param.materialName != null and param.materialName != ''">
+                AND material_name like concat(#{param.materialName},'%')
+            </if>
+            <if test="param.warehouseListId != null ">
+                AND warehouse_id IN
+                <foreach collection="param.warehouseListId" item="item" index="index" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="param.scanDate != null ">
+                AND DATE_FORMAT(create_time,'%y%m%d') = DATE_FORMAT(#{param.scanDate},'%y%m%d')
+            </if>
+            <if test="param.scanDateStart != null ">
+                AND DATE_FORMAT(create_time,'%y%m%d') BETWEEN DATE_FORMAT(#{param.scanDateStart},'%y%m%d') AND DATE_FORMAT(#{param.scanDateEnd},'%y%m%d')
+            </if>
+        </where>
+        ORDER BY create_time DESC
+    </select>
 
 </mapper>

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

@@ -61,7 +61,7 @@ public class WarehouseRetentionScanServiceImpl extends BaseServiceImpl<Warehouse
 //	private IWarehouseRetentionRecordService retentionRecordService;
 
 	@Override
-	public IPage<WarehouseRetentionScanVO> selectWarehouseRetentionRecordPage(IPage<WarehouseRetentionScanVO> page, WarehouseRetentionScanVO warehouseRetentionScanVO) {
+	public IPage<WarehouseRetentionScanVO> selectWarehouseRetentionRecordPage(IPage<WarehouseRetentionScanVO> page, WarehouseRetentionScanDTO warehouseRetentionScanVO) {
 		BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
 		List<Long> list = new ArrayList<>();
 		if (Func.isEmpty(myCurrentWarehouse)){
@@ -73,6 +73,10 @@ public class WarehouseRetentionScanServiceImpl extends BaseServiceImpl<Warehouse
 		}else {
 			list.add(myCurrentWarehouse.getId());
 		}
+		if (list.isEmpty()) {
+			return page.setRecords(null);
+		}
+		warehouseRetentionScanVO.setWarehouseListId(list);
 		return page.setRecords(baseMapper.selectWarehouseRetentionRecordPage(page, warehouseRetentionScanVO));
 	}
 
@@ -86,6 +90,26 @@ public class WarehouseRetentionScanServiceImpl extends BaseServiceImpl<Warehouse
 		return warehouseRetentionRecordList;
 	}
 
+	@Override
+	public List<WarehouseRetentionScanExcel> getExportWarehouseRetentionScanList(WarehouseRetentionScanDTO warehouseRetentionScan) {
+		BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
+		List<Long> list = new ArrayList<>();
+		if (Func.isEmpty(myCurrentWarehouse)){
+			List<BasicdataWarehouseEntity> warehouseList = warehouseClient.getMyWarehouseList();
+			if (!warehouseList.isEmpty()){
+				List<Long> warehouseIds = warehouseList.stream().map(BasicdataWarehouseEntity::getId).collect(Collectors.toList());
+				list.addAll(warehouseIds);
+			}
+		}else {
+			list.add(myCurrentWarehouse.getId());
+		}
+		if (list.isEmpty()) {
+			return null;
+		}
+		warehouseRetentionScan.setWarehouseListId(list);
+		return baseMapper.getExportWarehouseRetentionScanList(warehouseRetentionScan);
+		}
+
 //	@Override
 //	public R saveRetentionList(WarehouseRetentionRecordDTO warehouseRetentionRecordDTO) {
 //		BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();