From fe89838ee13ddc282c1794860d39fdedb6b7f38f Mon Sep 17 00:00:00 2001 From: "0.0" <1092404103.qq.com> Date: Wed, 18 Oct 2023 10:08:56 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=B7=BB=E5=8A=A0=E6=89=98=E7=9B=98=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BasicdataGoodsAreaController.java | 2 -- .../service/impl/BasicdataGoodsAreaServiceImpl.java | 3 ++- .../distribution/mapper/DistributionParcelListMapper.xml | 6 ++++-- .../service/impl/WarehouseGoodsAllocationServiceImpl.java | 8 ++++---- 4 files changed, 10 insertions(+), 9 deletions(-) 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 aa7f25d91..60eea97d0 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 @@ -114,7 +114,6 @@ public class BasicdataGoodsAreaController extends BladeController { @GetMapping("/getNode") public R> getNode() { List pages = basicdataGoodsAreaService.getNode(); - log.info("pages>>>>>>>>>>>>>>{}",pages); return R.data(pages); } @@ -124,7 +123,6 @@ public class BasicdataGoodsAreaController extends BladeController { @GetMapping("/getAreaoption") public R> getAreaoption() { List pages = basicdataGoodsAreaService.getAreaoption(); - log.info("pages>>>>>>>>>>>>>>{}",pages); return R.data(pages); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAreaServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAreaServiceImpl.java index 5ae9794fc..50b11ded5 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAreaServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAreaServiceImpl.java @@ -319,9 +319,10 @@ public class BasicdataGoodsAreaServiceImpl extends BaseServiceImpl collect = myWatchWarehouse.stream() .map(BasicdataWarehouseEntity::getId) .collect(Collectors.toList()); - //查询货架 + //查询货区（除开备货区） List basicdataGoodsAreaEntities = basicdataGoodsAreaMapper.selectList(new QueryWrapper().lambda() .eq(BasicdataGoodsAreaEntity::getIsDeleted,0) + .eq(BasicdataGoodsAreaEntity::getAreaType,2) .in(collect.size()>0,BasicdataGoodsAreaEntity::getWarehouseId,collect) ); return basicdataGoodsAreaEntities; diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml index a3d4b330d..18fa1058a 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml @@ -512,15 +512,17 @@ ldpl.order_package_code orderPackageCode, ldpl.warehouse warehouse, ldpl.firsts firsts, - ldpl.SECOND SECOND, + ldpl.second second , ldpl.third_product thirdProduct, ldpl.material_name materialName, ldpl.order_package_status orderPackageStatus, - lwug.position_code goodsAllocation + lwug.position_code goodsAllocation, + lwtg.tray_code pallet FROM logpm_distribution_parcel_list ldpl JOIN logpm_distribution_stock_article ldsa ON ldpl.stock_article_id = ldsa.id LEFT JOIN logpm_warehouse_updown_goods lwug ON lwug.association_id = ldpl.id + left join logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldpl.id ldsa.is_deleted = 0 AND ldpl.conditions =1 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 891cb8d5c..c59950b8b 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 @@ -309,27 +309,27 @@ public class WarehouseGoodsAllocationServiceImpl extends BaseServiceImpl().lambda() .eq(WarehouseGoodsAllocationEntity::getIsDeleted, 0) .eq(null != areaId,WarehouseGoodsAllocationEntity::getGoodsAreaId, areaId) .eq(null != shelfId,WarehouseGoodsAllocationEntity::getGoodsShelfId, shelfId) ).intValue(); - //查询所有使用货位 + //查询所有使用货位(除开备货区) Integer employNub = baseMapper.selectCount(new QueryWrapper().lambda() .eq(WarehouseGoodsAllocationEntity::getIsDeleted, 0) .eq(WarehouseGoodsAllocationEntity::getAllocationStatus, 2) .eq(null != areaId,WarehouseGoodsAllocationEntity::getGoodsAreaId, areaId) .eq(null != shelfId,WarehouseGoodsAllocationEntity::getGoodsShelfId, shelfId) ).intValue(); - //查询所有禁用 + //查询所有禁用(除开备货区) Integer disableNub = baseMapper.selectCount(new QueryWrapper().lambda() .eq(WarehouseGoodsAllocationEntity::getIsDeleted, 0) .eq(WarehouseGoodsAllocationEntity::getEnableStatus, 2) .eq(null != areaId,WarehouseGoodsAllocationEntity::getGoodsAreaId, areaId) .eq(null != shelfId,WarehouseGoodsAllocationEntity::getGoodsShelfId, shelfId) ).intValue(); - //查询可用货位 + //查询可用货位(除开备货区) Integer unusedNub = baseMapper.selectCount(new QueryWrapper().lambda() .eq(WarehouseGoodsAllocationEntity::getIsDeleted, 0) .eq(WarehouseGoodsAllocationEntity::getEnableStatus, 1)