1.上架查询订单库位详情

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseUpdownTypeApiController.java

@@ -143,6 +143,47 @@ public class WarehouseUpdownTypeApiController {
 	}
 
 
+	@ResponseBody
+	@PostMapping("/orderUpshelfDetailByAllocationId")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "已上架订单详情", notes = "传入trayTypeDTO")
+	public R orderUpshelfDetailByAllocationId(@RequestBody UpdownTypeDTO updownTypeDTO ) {
+		String method = "###########orderUpshelfDetailByAllocationId: ";
+		log.info(method + "已上架订单详情 updownTypeDTO={}", updownTypeDTO);
+		String orderCode = updownTypeDTO.getOrderCode();
+		Long allocationId = updownTypeDTO.getAllocationId();
+		try{
+
+			BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
+			if(Objects.isNull(myCurrentWarehouse)){
+				log.warn(method+"仓库信息不能为空");
+				return R.fail(403,"仓库信息不能为空");
+			}
+
+			if(Objects.isNull(allocationId)){
+				log.warn(method+"库位id为空 allocationId={}",allocationId);
+				return R.fail(403,"库位id为空");
+			}
+
+			if(StringUtil.isBlank(orderCode)){
+				log.warn(method+"订单编码不能为空 orderCode={}",orderCode);
+				return R.fail(403,"订单编码不能为空");
+			}
+
+			//查询该库位的货物信息
+			List<String> orderPackageCodes = warehouseUpdownTypeService.orderUpshelfDetailByAllocationId(orderCode,allocationId,myCurrentWarehouse.getId());
+			return R.data(orderPackageCodes);
+		}catch (CustomerException e){
+			log.warn(e.message);
+			return R.fail(e.code,e.message);
+		}catch (Exception e){
+			log.error(method+"系统异常，联系管理员",e);
+			return R.fail(500,"系统异常，联系管理员");
+		}
+
+	}
+
+
 	@ResponseBody
 	@PostMapping("/upShelfOrder")
 	@ApiOperationSupport(order = 1)

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsMapper.java

@@ -124,6 +124,8 @@ public interface WarehouseUpdownGoodsMapper extends BaseMapper<WarehouseUpdownGo
 
 	List<StockOrderListVO> findStockOrderDetailList(@Param("allocationId") Long allocationId, @Param("warehouseId") Long warehouseId);
 
+    List<String> orderUpshelfDetailByAllocationId(@Param("orderCode") String orderCode, @Param("allocationId") Long allocationId, @Param("warehouseId") Long warehouseId);
+
 
 //	/**
 //	 * 根据货位查询货物

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsMapper.xml

@@ -468,4 +468,16 @@
           and lwug.association_type = '4'
     </select>
 
+    <select id="orderUpshelfDetailByAllocationId" resultType="String">
+        select lwug.association_value
+        from logpm_warehouse_updown_goods lwug
+        left join logpm_distribution_parcel_list ldpl on ldpl.order_package_code = lwug.association_value
+        where lwug.warehouse_id = #{warehouseId}
+        and ldpl.warehouse_id = #{warehouseId}
+        and ldpl.order_code = #{orderCode}
+        and lwug.allocation_id = #{allocationId}
+        and lwug.association_type = '3'
+    </select>
+
+
 </mapper>

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseUpdownGoodsService.java

@@ -149,4 +149,5 @@ public interface IWarehouseUpdownGoodsService extends BaseService<WarehouseUpdow
 
 	List<StockOrderListVO> findStockOrderDetailList(Long allocationId, Long warehouseId);
 
+    List<String> orderUpshelfDetailByAllocationId(String orderCode, Long allocationId, Long warehouseId);
 }

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseUpdownTypeService.java

@@ -86,4 +86,6 @@ public interface IWarehouseUpdownTypeService extends BaseService<WarehouseUpdown
 	R downDeliveryPackage(List<UpShelfPackageDTO> upShelfPackageList, Long warehouseId);
 
     R findAllocationData(Long allocationId, Long warehouseId);
+
+    List<String> orderUpshelfDetailByAllocationId(String orderCode, Long allocationId, Long warehouseId);
 }

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

@@ -253,4 +253,9 @@ public class WarehouseUpdownGoodsServiceImpl extends BaseServiceImpl<WarehouseUp
 		return baseMapper.findStockOrderDetailList(allocationId,warehouseId);
 	}
 
+	@Override
+	public List<String> orderUpshelfDetailByAllocationId(String orderCode, Long allocationId, Long warehouseId) {
+		return baseMapper.orderUpshelfDetailByAllocationId(orderCode,allocationId,warehouseId);
+	}
+
 }

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

@@ -148,6 +148,14 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 		return R.data(map);
 	}
 
+	@Override
+	public List<String> orderUpshelfDetailByAllocationId(String orderCode, Long allocationId, Long warehouseId) {
+
+		List<String> ls = warehouseUpdownGoodsService.orderUpshelfDetailByAllocationId(orderCode,allocationId,warehouseId);
+
+		return ls;
+	}
+
 	private void packageChangeStockByAllocaton(WarehouseUpdownGoodsEntity one) {
 
 		//当前登录人选择的仓库