From bbafe7e936816e536d344bc4fe7b198e1b8767bd Mon Sep 17 00:00:00 2001 From: "0.0" <1092404103.qq.com> Date: Thu, 14 Sep 2023 15:53:51 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=8F=91=E8=BD=A6=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vo/app/DistributionAppDeliveryListVO.java | 5 ++ .../vo/WarehouseScanInventoryRecordVO.java | 87 +++++++++++++++++++ .../mapper/DistributionDeliveryListMapper.xml | 15 +--- .../DistributionDeliveryListServiceImpl.java | 1 - .../controller/WarehouseStockController.java | 25 +++++- .../mapper/WarehouseStockMapper.java | 10 ++- .../warehouse/mapper/WarehouseStockMapper.xml | 3 + .../service/IWarehouseStockService.java | 5 ++ .../impl/WarehouseStockServiceImpl.java | 22 +++-- 9 files changed, 152 insertions(+), 21 deletions(-) create mode 100644 blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseScanInventoryRecordVO.java diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppDeliveryListVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppDeliveryListVO.java index 8252cff20..9b3ce790f 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppDeliveryListVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppDeliveryListVO.java @@ -121,6 +121,11 @@ public class DistributionAppDeliveryListVO extends DistributionDeliveryListEntit */ @ApiModelProperty(value = "备货地址") private String stockupArea; + /** + * 发车时间 + */ + @ApiModelProperty(value = "备货地址") + private String departureTime; diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseScanInventoryRecordVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseScanInventoryRecordVO.java new file mode 100644 index 000000000..c74be4049 --- /dev/null +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseScanInventoryRecordVO.java @@ -0,0 +1,87 @@ +package com.logpm.warehouse.vo; + + +import com.logpm.distribution.entity.DistributionStockListEntity; +import com.logpm.warehouse.entity.WarehouseScanRecordEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.List; + + +@Data +@EqualsAndHashCode(callSuper = true) +public class WarehouseScanInventoryRecordVO extends DistributionStockListEntity { + + /** + * 节点名称 + */ + @ApiModelProperty(value = "节点名称") + private String nodeName; + + /** + * 操作时间 + */ + @ApiModelProperty(value = "操作时间") + private String operatorTime; + /** + * 操作人 + */ + @ApiModelProperty(value = "操作人") + private Long operatorId; + + /** + * 操作人(Name) + */ + @ApiModelProperty(value = "操作人(Name)") + private String operatorName; + + /** + * 扫描相亲 + */ + @ApiModelProperty(value = "扫描相亲") + private String scanNodeMsg; + + /** + * 二级扫描类型(扫描详情) + */ + @ApiModelProperty(value = "扫描详情") + private String scanNodeType; + + + /** + * 仓库List + */ + @ApiModelProperty(value = "仓库List") + private List warehouseIdList; + +// /** +// * 包件状态 +// */ +// @ApiModelProperty(value = "包件状态") +// private String orderPackageStatusName; +// +// @ApiModelProperty(value = "包件冻结状态") +// private String orderPackageFreezeStatusName; +// +// @ApiModelProperty(value = "包件冻结状态") +// private String orderPackageReservationStatusName; +// +// +// +// @ApiModelProperty(value = "备货状态") +// private String orderPackageStockupStatusName; +// +// @ApiModelProperty(value = "上架状态") +// private String orderPackageGroundingStatusName; +// +// @ApiModelProperty(value = "装车状态") +// private String orderPackageLoadingStatusName; + +// /** +// * 二级扫描类型（name） +// */ +// @ApiModelProperty(value = "二级扫描类型(name)") +// private String scanNodeTypeName; +} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml index e297266c3..4d2e9efba 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml @@ -670,20 +670,11 @@ where lddl.reservation_id = #{reservationId} and lds.coding =#{barcode} + 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 232643a38..58f6d5356 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 @@ -20,6 +20,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.warehouse.entity.WarehouseStockEntity; import com.logpm.warehouse.excel.WarehouseStockExcel; +import com.logpm.warehouse.vo.WarehouseScanInventoryRecordVO; import com.logpm.warehouse.vo.WarehouseScanRecordVO; import org.springblade.core.mp.base.BaseService; @@ -50,4 +51,8 @@ public interface IWarehouseStockService extends BaseService exportWarehouseStock(Wrapper queryWrapper); + /** + * 库存品扫描记录 自定义分页 + */ + IPage selectWarehouseStockInventoryPage(IPage page, WarehouseScanInventoryRecordVO warehouseScanRecordVO); } 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 e45c8fba5..5e3e05c91 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 @@ -24,6 +24,7 @@ import com.logpm.warehouse.entity.WarehouseStockEntity; import com.logpm.warehouse.excel.WarehouseStockExcel; import com.logpm.warehouse.mapper.WarehouseStockMapper; import com.logpm.warehouse.service.IWarehouseStockService; +import com.logpm.warehouse.vo.WarehouseScanInventoryRecordVO; import com.logpm.warehouse.vo.WarehouseScanRecordVO; import lombok.AllArgsConstructor; import lombok.extern.log4j.Log4j2; @@ -49,12 +50,7 @@ public class WarehouseStockServiceImpl extends BaseServiceImpl selectWarehouseStockPage(IPage page, WarehouseScanRecordVO warehouseScanRecordVO) { - //获取当前登录人仓库 - List myWatchWarehouse = basicdataWarehouseClient.getMyWatchWarehouse(); - List collect = myWatchWarehouse.stream() - .map(BasicdataWarehouseEntity::getId) - .collect(Collectors.toList()); - warehouseScanRecordVO.setWarehouseIdList(collect); + warehouseScanRecordVO.setWarehouseIdList(this.loginPerson()); List warehouseScanRecordVOS = baseMapper.selectWarehouseStockPage(page, warehouseScanRecordVO); // IUserClient userCliient = SpringUtil.getBean(IUserClient.class); // for (WarehouseScanRecordVO warehouseScanRecordVOData : warehouseScanRecordVOS) { @@ -73,4 +69,18 @@ public class WarehouseStockServiceImpl extends BaseServiceImpl selectWarehouseStockInventoryPage(IPage page, WarehouseScanInventoryRecordVO warehouseScanRecordVO) { + warehouseScanRecordVO.setWarehouseIdList(this.loginPerson()); + List warehouseScanInventoryRecordVOList = baseMapper.selectWarehouseStockInventoryPage(page,warehouseScanRecordVO); + return page.setRecords(warehouseScanInventoryRecordVOList); + } + public List loginPerson(){ + //获取当前登录人仓库 + List myWatchWarehouse = basicdataWarehouseClient.getMyWatchWarehouse(); + return myWatchWarehouse.stream() + .map(BasicdataWarehouseEntity::getId) + .collect(Collectors.toList()); + }; + }