1.添加托盘码

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<List<BasicdataWarehouseVO>> getNode() {
 		List<BasicdataWarehouseVO> pages = basicdataGoodsAreaService.getNode();
-		log.info("pages>>>>>>>>>>>>>>{}",pages);
 		return R.data(pages);
 	}
 
@@ -124,7 +123,6 @@ public class BasicdataGoodsAreaController extends BladeController {
 	@GetMapping("/getAreaoption")
 	public R<List<BasicdataGoodsAreaEntity>> getAreaoption() {
 		List<BasicdataGoodsAreaEntity> pages = basicdataGoodsAreaService.getAreaoption();
-		log.info("pages>>>>>>>>>>>>>>{}",pages);
 		return R.data(pages);
 	}
 

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAreaServiceImpl.java

@@ -319,9 +319,10 @@ public class BasicdataGoodsAreaServiceImpl extends BaseServiceImpl<BasicdataGood
 		List<Long> collect = myWatchWarehouse.stream()
 			.map(BasicdataWarehouseEntity::getId)
 			.collect(Collectors.toList());
-		//查询货架
+		//查询货区（除开备货区）
 		List<BasicdataGoodsAreaEntity> basicdataGoodsAreaEntities = basicdataGoodsAreaMapper.selectList(new QueryWrapper<BasicdataGoodsAreaEntity>().lambda()
 			.eq(BasicdataGoodsAreaEntity::getIsDeleted,0)
+				.eq(BasicdataGoodsAreaEntity::getAreaType,2)
 			.in(collect.size()>0,BasicdataGoodsAreaEntity::getWarehouseId,collect)
 		);
 		return basicdataGoodsAreaEntities;

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
         <where>
             ldsa.is_deleted = 0
           AND ldpl.conditions =1

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseGoodsAllocationServiceImpl.java

@@ -309,27 +309,27 @@ public class WarehouseGoodsAllocationServiceImpl extends BaseServiceImpl<Warehou
 
 	public locationsnubVO getNum(Long areaId,Long shelfId){
 		locationsnubVO locationsnubVO = new locationsnubVO();
-		//查询该货区下的总货位
+		//查询该货区下的总货位(除开备货区)
 		Integer cargoNub = baseMapper.selectCount(new QueryWrapper<WarehouseGoodsAllocationEntity>().lambda()
 			.eq(WarehouseGoodsAllocationEntity::getIsDeleted, 0)
 			.eq(null != areaId,WarehouseGoodsAllocationEntity::getGoodsAreaId, areaId)
 			.eq(null != shelfId,WarehouseGoodsAllocationEntity::getGoodsShelfId, shelfId)
 		).intValue();
-		//查询所有使用货位
+		//查询所有使用货位(除开备货区)
 		Integer employNub = baseMapper.selectCount(new QueryWrapper<WarehouseGoodsAllocationEntity>().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<WarehouseGoodsAllocationEntity>().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<WarehouseGoodsAllocationEntity>().lambda()
 			.eq(WarehouseGoodsAllocationEntity::getIsDeleted, 0)
 			.eq(WarehouseGoodsAllocationEntity::getEnableStatus, 1)