From 559988617d46e8e4123a0d53d7a21409c6638008 Mon Sep 17 00:00:00 2001 From: "0.0" <1092404103.qq.com> Date: Wed, 18 Oct 2023 16:34:10 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/logpm/warehouse/vo/QuestDetailVO.java | 59 ++++++++++++++++++- .../BasicdataGoodsAreaController.java | 4 +- .../mapper/BasicdataGoodsAreaMapper.java | 16 ++--- .../mapper/BasicdataGoodsAreaMapper.xml | 16 ++--- .../service/IBasicdataGoodsAreaService.java | 2 +- .../impl/BasicdataGoodsAreaServiceImpl.java | 18 +++--- .../controller/TaskQuestController.java | 6 +- .../warehouse/mapper/TaskQuestMapper.java | 6 +- .../warehouse/mapper/TaskQuestMapper.xml | 39 +++++++++--- .../warehouse/service/ITaskQuestService.java | 6 +- .../service/impl/TaskQuestServiceImpl.java | 51 +++++++++++++--- 11 files changed, 167 insertions(+), 56 deletions(-) diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/QuestDetailVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/QuestDetailVO.java index e4ba66770..c7e952057 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/QuestDetailVO.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/QuestDetailVO.java @@ -63,7 +63,62 @@ public class QuestDetailVO extends QuestDetailEntity { // +// /** +// * 货位 +// */ +// @ApiModelProperty(value = "货位") +// private String goodsAllocation; // -// -// List list = new ArrayList<>(); +// /** +// * 托盘码 +// */ +// @ApiModelProperty(value = "托盘码") +// private String trayCode; + + + /* ----------- 包条 --------------------- */ + + + /** + * 品牌 + */ + @ApiModelProperty(value = "品牌") + private String brandName; + + /** + * 一级品 + */ + @ApiModelProperty(value = "一级品") + private String firsts; + + /** + * 二级品 + */ + @ApiModelProperty(value = "二级品") + private String second; + + /** + * 三级品 + */ + @ApiModelProperty(value = "三级品") + private String thirdProduct; + + + + /** + * 发站仓 + */ + @ApiModelProperty(value = "发站仓") + private String sendWarehouseName; + + /** + * 收货单位 + */ + @ApiModelProperty(value = "发站仓") + private String consigneeUnit; + + + /* ----------- 库存品 --------------------- */ + + } 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 60eea97d0..7ef862fee 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 @@ -256,9 +256,9 @@ public class BasicdataGoodsAreaController extends BladeController { @ApiOperationSupport(order = 9) @ApiOperation(value = "导出数据", notes = "传入warehouseGoodsArea") public void visualizationwarehouse(@ApiIgnore @RequestParam Map visualization, HttpServletResponse response) { - Long areaId = Long.valueOf((String) visualization.get("areaId")); + Long warehouseId = Long.valueOf((String) visualization.get("areaId")); Integer type = Integer.valueOf((String) visualization.get("type")); - basicdataGoodsAreaService.visualizationwarehouse(type,areaId,response); + basicdataGoodsAreaService.visualizationwarehouse(type,warehouseId,response); //ExcelUtil.exports(response, "货区数据" + DateUtil.time(), "货区数据表", list, BasicdataGoodsAreaexportExcel.class); } 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 804b29b2a..8fd88a6e3 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 @@ -70,13 +70,13 @@ public interface BasicdataGoodsAreaMapper extends BaseMapper selectFirstNode(@Param("array") List collect); - List exportWarehouseByorderId(@Param("areaId") Long areaId); + List exportWarehouseByorderId(@Param("warehouseId") Long warehouseId); void sqlMode(); - List exportWarehouseByallocation(@Param("areaId") Long areaId); + List exportWarehouseByallocation(@Param("warehouseId") Long warehouseId); - List exportWarehouseByStrip(@Param("areaId") Long areaId); + List exportWarehouseByStrip(@Param("warehouseId") Long warehouseId); /** * 查询仓库下的备货区 @@ -91,13 +91,13 @@ public interface BasicdataGoodsAreaMapper extends BaseMapper getBasicdataGoodsAreaListdict(@Param("array") List collect); - List exportWarehouseByCKStrip(@Param("areaId") Long areaId); + List exportWarehouseByCKStrip(@Param("warehouseId") Long warehouseId); - List exportWarehouseByKCallocation(@Param("areaId") Long areaId); + List exportWarehouseByKCallocation(@Param("warehouseId") Long warehouseId); - List exportWarehouseByCKService(@Param("areaId") Long areaId); + List exportWarehouseByCKService(@Param("warehouseId") Long warehouseId); - List exportWarehouseByWaybillNumber(@Param("areaId") Long areaId); + List exportWarehouseByWaybillNumber(@Param("warehouseId") Long warehouseId); - List exportWarehouseZreoByallocation(@Param("areaId") Long areaId); + List exportWarehouseZreoByallocation(@Param("warehouseId") Long warehouseId); } 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 bf79b8cfe..98e612f18 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 @@ -195,7 +195,7 @@ JOIN logpm_distribution_parcel_list ldpl ON ldpl.stock_article_id = ldsa.id JOIN logpm_warehouse_updown_goods lwug ON lwug.association_id = ldpl.id - ldpl.warehouse_id =#{areaId} + ldpl.warehouse_id =#{warehouseId} GROUP BY ldsa.order_code, lwug.position_code @@ -220,7 +220,7 @@ JOIN logpm_distribution_parcel_list ldpl ON lwug.association_id = ldpl.id - ldpl.warehouse_id =#{areaId} + ldpl.warehouse_id =#{warehouseId} GROUP BY lwug.position_code; @@ -251,7 +251,7 @@ left JOIN logpm_distribution_stock_article ldsa on ldsa.id = ldpl.stock_article_id LEFT JOIN logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldpl.id - ldpl.warehouse_id =#{areaId} + ldpl.warehouse_id =#{warehouseId}