From 1cc696ee83bb48b2c0a7719019d15f790cf2a33b Mon Sep 17 00:00:00 2001 From: "0.0" <1092404103.qq.com> Date: Thu, 17 Aug 2023 10:49:43 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=89=98=E7=9B=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../warehouse/entity/WarehouseTrayEntity.java | 127 ++++++++++++++++++ .../logpm/warehouse/vo/WarehouseTrayVO.java | 48 +++++++ .../basicdata/mapper/BasicdataTrayMapper.xml | 2 +- .../WarehouseGoodsAllocationController.java | 36 ++--- .../WarehouseGoodsAllocationMapper.java | 6 + .../mapper/WarehouseGoodsAllocationMapper.xml | 4 + .../IWarehouseGoodsAllocationService.java | 9 +- .../WarehouseGoodsAllocationServiceImpl.java | 7 + 8 files changed, 219 insertions(+), 20 deletions(-) create mode 100644 blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseTrayEntity.java create mode 100644 blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseTrayVO.java diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseTrayEntity.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseTrayEntity.java new file mode 100644 index 000000000..c04ca783f --- /dev/null +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseTrayEntity.java @@ -0,0 +1,127 @@ +/* + * 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 io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.tenant.mp.TenantEntity; + +/** + * 托盘 实体类 + * + * @author tjj + * @since 2023-05-25 + */ +@Data +@TableName("logpm_warehouse_tray") +@ApiModel(value = "BasicdataTray对象", description = "托盘") +@EqualsAndHashCode(callSuper = true) +public class WarehouseTrayEntity 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 palletCode; + + /** + * 托盘名称 + */ + @ApiModelProperty(value = "托盘名称") + private String palletName; + /** + * 仓库编号 + */ + @ApiModelProperty(value = "仓库编号") + private Long warehouseId; + /** + * 托盘状态;1-空闲；2-货物；3-损毁；4-流通；5 + */ + @ApiModelProperty(value = "托盘状态;1-空闲；2-货物；3-损毁；4-流通；5") + private String trayStatus; + + /** + * 类型;木托 铁托 台面托 + */ + @ApiModelProperty(value = "类型;木托 铁托 台面托") + private Integer type; + + /** + * 托盘旧ID + */ + @ApiModelProperty(value = "托盘旧ID") + private Integer oldId; + + + /** + * 托盘旧托盘码 + */ + @ApiModelProperty(value = "托盘旧托盘码") + private String oldQrCode; + + /** + * 破损照片 + */ + @ApiModelProperty(value = "破损照片") + private String damagedPhotos; + + /** + * 破损备注 + */ + @ApiModelProperty(value = "破损备注") + private String damagedNote; + + + @ApiModelProperty(value = "目前所在仓库") + private Long nowWarehouseId; + + + /** + * 禁用状态（1-否,2-是） + */ + @ApiModelProperty(value = "禁用状态（1-否,2-是）") + private Integer disableType; + +} diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseTrayVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseTrayVO.java new file mode 100644 index 000000000..f28270a20 --- /dev/null +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseTrayVO.java @@ -0,0 +1,48 @@ +/* + * 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.WarehouseTrayEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 托盘 视图实体类 + * + * @author tjj + * @since 2023-05-25 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class WarehouseTrayVO extends WarehouseTrayEntity { + private static final long serialVersionUID = 1L; + + /** + * 仓库名称 + */ + @ApiModelProperty(value = "仓库名称") + private String warehouseName; + + /** + * 禁用状态（值） + */ + @ApiModelProperty(value = "禁用状态（值）") + private String disableTypeName; + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml index d42926bee..c9443183a 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml @@ -188,7 +188,7 @@ JOIN logpm_distribution_stock_list ldsl ON lwtgl.association_id = ldsl.id left join (logpm_warehouse_updown_goods lwug join logpm_warehouse_goods_allocation lwga on lwug.allocation_id =lwga.id) on lwug.association_id = ldsl.id WHERE - ldsl.is_deleted = 0 and lwtgl.is_deleted = 0 = 0 and lwtgl.association_type = 4 and lwtgl.tray_id = #{param.id} + ldsl.is_deleted = 0 and lwtgl.is_deleted = 0 and lwtgl.association_type = 4 and lwtgl.tray_id = #{param.id} select ldpl.* from logpm_distribution_parcel_list ldpl WHERE ldpl.order_package_grounding_status ='10' and ldpl.is_deleted = 0 + + diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseGoodsAllocationService.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseGoodsAllocationService.java index 6b1fe7670..9aa4305d9 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseGoodsAllocationService.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseGoodsAllocationService.java @@ -19,12 +19,9 @@ package com.logpm.warehouse.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.logpm.warehouse.dto.UpShelfOrderDTO; import com.logpm.warehouse.entity.WarehouseGoodsAllocationEntity; -import com.logpm.warehouse.vo.WarehouseGoodsAllocationVO; +import com.logpm.warehouse.vo.*; import com.logpm.warehouse.excel.WarehouseGoodsAllocationExcel; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.logpm.warehouse.vo.WarehouseStockArticleCopyVO; -import com.logpm.warehouse.vo.WarehouseVisCargo; -import com.logpm.warehouse.vo.WarehouseVisualizationVO; import org.springblade.core.mp.base.BaseService; import org.springblade.core.mp.support.Query; @@ -79,4 +76,8 @@ public interface IWarehouseGoodsAllocationService extends BaseService selectwrap(WarehouseGoodsAllocationVO warehouseGoodsAllocation, IPage page); + /** + * 货位 查询托盘 + */ + IPage selectTray(WarehouseTrayVO warehouseGoodsAllocation, IPage page); } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseGoodsAllocationServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseGoodsAllocationServiceImpl.java index cae6d6d25..1a1f6e6a1 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseGoodsAllocationServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseGoodsAllocationServiceImpl.java @@ -146,4 +146,11 @@ public class WarehouseGoodsAllocationServiceImpl extends BaseServiceImpl selectTray(WarehouseTrayVO warehouseTrayVO, IPage page) { + //查询未在货位的托盘 + List list = baseMapper.selectTray(page,warehouseTrayVO); + return page.setRecords(list); + } + }