From c1ec4713d51450877531d16c89a20e8305823970 Mon Sep 17 00:00:00 2001 From: "0.0" <1092404103.qq.com> Date: Tue, 22 Aug 2023 21:53:34 +0800 Subject: [PATCH] =?UTF-8?q?1.=E9=80=89=E6=8B=A9=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logpm/basicdata/vo/BasicdataNodeVO.java | 2 +- .../BasicdataGoodsAllocationController.java | 2 + .../BasicdataGoodsAreaController.java | 23 +++-- .../excel/BasicdataGoodsAreaExcel.java | 99 +++++++++---------- .../mapper/BasicdataGoodsAreaMapper.java | 4 +- .../mapper/BasicdataGoodsAreaMapper.xml | 20 +++- .../mapper/BasicdataGoodsShelfMapper.xml | 3 + .../basicdata/mapper/BasicdataTrayMapper.xml | 3 + .../service/IBasicdataGoodsAreaService.java | 8 +- .../impl/BasicdataGoodsAreaServiceImpl.java | 27 +++-- .../impl/BasicdataGoodsShelfServiceImpl.java | 12 ++- 11 files changed, 130 insertions(+), 73 deletions(-) diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataNodeVO.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataNodeVO.java index 0fd7c4f31..285cef520 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataNodeVO.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataNodeVO.java @@ -19,5 +19,5 @@ public class BasicdataNodeVO { private Boolean leaf ; @ApiModelProperty(value = "仓库货区") - List children; + private List children; } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsAllocationController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsAllocationController.java index 3bff2aed9..c905cb4e9 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsAllocationController.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsAllocationController.java @@ -33,6 +33,7 @@ import javax.imageio.ImageIO; import javax.servlet.http.HttpServletRequest; import javax.validation.Valid; +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; @@ -64,6 +65,7 @@ import javax.servlet.http.HttpServletResponse; @AllArgsConstructor @RequestMapping("/goodsAllocation") @Api(value = "货位", tags = "货位接口") +@Log4j2 public class BasicdataGoodsAllocationController extends BladeController { private final IBasicdataGoodsAllocationService basicdataGoodsAllocationService; diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsAreaController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsAreaController.java index fd0a2dd7c..5827e65bf 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsAreaController.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsAreaController.java @@ -30,6 +30,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import lombok.AllArgsConstructor; import javax.validation.Valid; +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; @@ -57,6 +58,7 @@ import javax.servlet.http.HttpServletResponse; @AllArgsConstructor @RequestMapping("/goodsArea") @Api(value = "货区", tags = "货区接口") +@Log4j2 public class BasicdataGoodsAreaController extends BladeController { private final IBasicdataGoodsAreaService basicdataGoodsAreaService; @@ -84,6 +86,16 @@ public class BasicdataGoodsAreaController extends BladeController { return R.data(WarehouseGoodsAreaWrapper.build().pageVO(list)); } + /** + * 货区 获取货区 + */ + @GetMapping("/getNode") + public R> getNode() { + List pages = basicdataGoodsAreaService.getNode(); + log.info("pages>>>>>>>>>>>>>>{}",pages); + return R.data(pages); + } + /** * 货区 自定义分页 @@ -156,13 +168,10 @@ public class BasicdataGoodsAreaController extends BladeController { @GetMapping("/export-warehouseGoodsArea") @ApiOperationSupport(order = 9) @ApiOperation(value = "导出数据", notes = "传入warehouseGoodsArea") - public void exportWarehouseGoodsArea(@ApiIgnore @RequestParam Map basicdataGoodsArea, BladeUser bladeUser, HttpServletResponse response) { - QueryWrapper queryWrapper = Condition.getQueryWrapper(basicdataGoodsArea, BasicdataGoodsAreaEntity.class); - //if (!AuthUtil.isAdministrator()) { - // queryWrapper.lambda().eq(WarehouseGoodsArea::getTenantId, bladeUser.getTenantId()); - //} - queryWrapper.lambda().eq(BasicdataGoodsAreaEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); - List list = basicdataGoodsAreaService.exportWarehouseGoodsArea(queryWrapper); + public void exportWarehouseGoodsArea(@ApiIgnore @RequestParam Map basicdataGoodsArea, HttpServletResponse response) { + Long id =Long.valueOf((String)basicdataGoodsArea.get("id")); + log.info("basicdataGoodsArea>>>>>>>>>>>>>{}",id); + List list = basicdataGoodsAreaService.exportWarehouseGoodsArea(id); ExcelUtil.export(response, "货区数据" + DateUtil.time(), "货区数据表", list, BasicdataGoodsAreaExcel.class); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataGoodsAreaExcel.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataGoodsAreaExcel.java index 65b26264d..d0aff6f26 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataGoodsAreaExcel.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataGoodsAreaExcel.java @@ -41,71 +41,68 @@ public class BasicdataGoodsAreaExcel 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; + @ExcelProperty("货区") + private String areaName; + /** - * 仓库id + * 货架 */ @ColumnWidth(20) - @ExcelProperty("仓库id") - private String warehouseId; + @ExcelProperty("货架") + private String shelfName; + /** - * 标题 + * 货位名称 */ @ColumnWidth(20) - @ExcelProperty("标题") - private String headline; + @ExcelProperty("货位名称") + private String allocationName; + + /** - * 货区状态；1-启用，2-禁用 + * 货位总件数 */ @ColumnWidth(20) - @ExcelProperty("货区状态；1-启用，2-禁用") - private String areaStatus; + @ExcelProperty("货位总件数") + private Integer allocationNub; + +// +// /** +// * 合同号 +// */ +// @ColumnWidth(20) +// @ExcelProperty("合同号") +// private String orderCode; +// +// /** +// * 品牌 +// */ +// @ColumnWidth(20) +// @ExcelProperty("品牌") +// private String brand; +// /** - * 是否备货区 + * 客户姓名 */ @ColumnWidth(20) - @ExcelProperty("是否备货区") - private Integer isStrageArea; + @ExcelProperty("客户姓名") + private String customerName; +// /** +// * 物料名称 +// */ +// @ColumnWidth(20) +// @ExcelProperty("物料名称") +// private String materialName; +// /** +// * 物料编号 +// */ +// @ColumnWidth(20) +// @ExcelProperty("物料编号") +// private String materialCode; } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.java index f8a75fcb2..a0c1272a8 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.java @@ -49,10 +49,10 @@ public interface BasicdataGoodsAreaMapper extends BaseMapper exportWarehouseGoodsArea(@Param("ew") Wrapper queryWrapper); + List exportWarehouseGoodsArea(@Param("id") Long id); IPage getBasicdataGoodsAreaList(IPage page,@Param("po") Map basicdataGoodsArea); diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.xml index ef02fea49..1511d25ca 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.xml +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.xml @@ -44,9 +44,7 @@ - + + diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsShelfMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsShelfMapper.xml index 933e6d06c..f80ba96c1 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsShelfMapper.xml +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsShelfMapper.xml @@ -92,6 +92,9 @@ and goods_shelf.enable_status = #{po.enableStatus} + + and goods_shelf.goods_shelf_name like concat('%',#{po.goodsShelfName},'%') +