From a87ee2a86d394ccd6a63cb28997837b3480b8979 Mon Sep 17 00:00:00 2001 From: "0.0" <1092404103.qq.com> Date: Mon, 28 Aug 2023 09:22:36 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=89=AB=E6=8F=8F=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/WarehouseScanRecordEntity.java | 161 ++++++++++++++++++ .../warehouse/vo/WarehouseScanRecordVO.java | 36 ++++ .../controller/WarehouseStockController.java | 5 +- .../mapper/WarehouseStockMapper.java | 3 +- .../warehouse/mapper/WarehouseStockMapper.xml | 7 +- .../service/IWarehouseStockService.java | 3 +- .../impl/WarehouseStockServiceImpl.java | 3 +- .../wrapper/WarehouseScanWrapper.java | 47 +++++ 8 files changed, 258 insertions(+), 7 deletions(-) create mode 100644 blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseScanRecordEntity.java create mode 100644 blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseScanRecordVO.java create mode 100644 blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/wrapper/WarehouseScanWrapper.java diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseScanRecordEntity.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseScanRecordEntity.java new file mode 100644 index 000000000..abcb7727c --- /dev/null +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseScanRecordEntity.java @@ -0,0 +1,161 @@ +package com.logpm.warehouse.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springblade.core.tenant.mp.TenantEntity; + +import java.util.Date; + +@Data +public class WarehouseScanRecordEntity extends TenantEntity { + /** + * 订单自编号 + */ + @ApiModelProperty(value = "订单自编号") + private String orderCode; + /** + * 仓库 + */ + @ApiModelProperty(value = "仓库") + private String warehouse; + + @ApiModelProperty(value = "仓库ID") + private Long warehouseId; + /** + * 状态 + */ + @ApiModelProperty(value = "状态") + private Integer conditions; + /** + * 包条码 + */ + @ApiModelProperty(value = "包条码") + private String orderPackageCode; + /** + * 货区信息 + */ + @ApiModelProperty(value = "货区信息") + private String cargoTitle; + + /** + * 货位信息 + */ + @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 orderPackageStatus; + + @ApiModelProperty(value = "包件冻结状态") + private String orderPackageFreezeStatus; + + @ApiModelProperty(value = "包件冻结状态") + private String orderPackageReservationStatus; + + + + @ApiModelProperty(value = "备货状态") + private String orderPackageStockupStatus; + + @ApiModelProperty(value = "上架状态") + private String orderPackageGroundingStatus; + + +} diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseScanRecordVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseScanRecordVO.java new file mode 100644 index 000000000..168a42d67 --- /dev/null +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseScanRecordVO.java @@ -0,0 +1,36 @@ +package com.logpm.warehouse.vo; + + +import com.logpm.warehouse.entity.WarehouseScanRecordEntity; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + + +@Data +@EqualsAndHashCode(callSuper = true) +public class WarehouseScanRecordVO extends WarehouseScanRecordEntity { + /** + * 节点名称 + */ + @ApiModelProperty(value = "节点名称") + private String nodeName; + + /** + * 操作时间 + */ + @ApiModelProperty(value = "操作时间") + private String operatorTime; + /** + * 操作人 + */ + @ApiModelProperty(value = "操作人") + private String operatorName; + + /** + * 扫描相亲 + */ + @ApiModelProperty(value = "扫描相亲") + private String scanNodeMsg; +} diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseStockController.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseStockController.java index 41cf4a95c..a5d1263ac 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseStockController.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseStockController.java @@ -16,6 +16,7 @@ */ package com.logpm.warehouse.controller; +import com.logpm.warehouse.vo.WarehouseScanRecordVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; @@ -86,8 +87,8 @@ public class WarehouseStockController extends BladeController { @GetMapping("/page") @ApiOperationSupport(order = 3) @ApiOperation(value = "分页", notes = "传入WarehouseStock") - public R> page(WarehouseStockVO WarehouseStock, Query query) { - IPage pages = warehouseStockService.selectWarehouseStockPage(Condition.getPage(query), WarehouseStock); + public R> page(WarehouseStockVO WarehouseStock, Query query) { + IPage pages = warehouseStockService.selectWarehouseStockPage(Condition.getPage(query), WarehouseStock); return R.data(pages); } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseStockMapper.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseStockMapper.java index 6353e797c..4a6b6da45 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseStockMapper.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseStockMapper.java @@ -17,6 +17,7 @@ package com.logpm.warehouse.mapper; import com.logpm.warehouse.entity.WarehouseStockEntity; +import com.logpm.warehouse.vo.WarehouseScanRecordVO; import com.logpm.warehouse.vo.WarehouseStockVO; import com.logpm.warehouse.excel.WarehouseStockExcel; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -40,7 +41,7 @@ public interface WarehouseStockMapper extends BaseMapper { * @param WarehouseStock * @return */ - List selectWarehouseStockPage(IPage page, WarehouseStockVO WarehouseStock); + List selectWarehouseStockPage(IPage page,@Param("param") WarehouseStockVO WarehouseStock); /** diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseStockMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseStockMapper.xml index 78cedb6ed..9a911d971 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseStockMapper.xml +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseStockMapper.xml @@ -45,8 +45,11 @@ - + select * from view_scan_record + + is_deleted =0 + diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseStockService.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseStockService.java index 914026d93..72fd73904 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseStockService.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseStockService.java @@ -18,6 +18,7 @@ package com.logpm.warehouse.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.logpm.warehouse.entity.WarehouseStockEntity; +import com.logpm.warehouse.vo.WarehouseScanRecordVO; import com.logpm.warehouse.vo.WarehouseStockVO; import com.logpm.warehouse.excel.WarehouseStockExcel; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -38,7 +39,7 @@ public interface IWarehouseStockService extends BaseService selectWarehouseStockPage(IPage page, WarehouseStockVO WarehouseStock); + IPage selectWarehouseStockPage(IPage page, WarehouseStockVO WarehouseStock); /** diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseStockServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseStockServiceImpl.java index 926ff6746..cc74532a7 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseStockServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseStockServiceImpl.java @@ -17,6 +17,7 @@ package com.logpm.warehouse.service.impl; import com.logpm.warehouse.entity.WarehouseStockEntity; +import com.logpm.warehouse.vo.WarehouseScanRecordVO; import com.logpm.warehouse.vo.WarehouseStockVO; import com.logpm.warehouse.excel.WarehouseStockExcel; import com.logpm.warehouse.mapper.WarehouseStockMapper; @@ -37,7 +38,7 @@ import java.util.List; public class WarehouseStockServiceImpl extends BaseServiceImpl implements IWarehouseStockService { @Override - public IPage selectWarehouseStockPage(IPage page, WarehouseStockVO WarehouseStock) { + public IPage selectWarehouseStockPage(IPage page, WarehouseStockVO WarehouseStock) { return page.setRecords(baseMapper.selectWarehouseStockPage(page, WarehouseStock)); } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/wrapper/WarehouseScanWrapper.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/wrapper/WarehouseScanWrapper.java new file mode 100644 index 000000000..1caad2dec --- /dev/null +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/wrapper/WarehouseScanWrapper.java @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * ReWarehouse and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * ReWarehouses of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * ReWarehouses 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 Warehouse. + * 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 com.logpm.warehouse.entity.WarehouseStockEntity; +import com.logpm.warehouse.vo.WarehouseScanRecordVO; +import com.logpm.warehouse.vo.WarehouseStockVO; +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; + +import java.util.Objects; + +/** + * 备货扫描记录 包装类,返回视图层所需的字段 + * + * @author lmy + * @since 2023-08-24 + */ +public class WarehouseScanWrapper extends BaseEntityWrapper { + + public static WarehouseScanWrapper build() { + return new WarehouseScanWrapper(); + } + + @Override + public WarehouseScanRecordVO entityVO(WarehouseScanRecordVO warehouseScanRecordVO) { + + + return warehouseScanRecordVO; + } + + +}